Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 7e43143..0e13db5 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -183,3 +183,4 @@
dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59
e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
20ff117b509075c3aec4ee3a57990ecd5db5df9c jdk8-b61
+8a3fe0ae06a8cc21347da5a18384b0aa6c2349f5 jdk8-b62
diff --git a/NewMakefile.gmk b/NewMakefile.gmk
index 252f98b..f38d739 100644
--- a/NewMakefile.gmk
+++ b/NewMakefile.gmk
@@ -31,8 +31,9 @@
CP=cp
ECHO=echo
MKDIR=mkdir
+PRINTF=printf
PWD=pwd
-SH=sh
+TAR=tar
ifeq ($(PLATFORM),windows)
ZIP=zip
else
@@ -63,10 +64,48 @@
$(ECHO) "ERROR: No configurations to build"; exit 1; \
fi
@for bdir in $(dir $(ALL_MAKEFILES)) ; do \
- $(ECHO) "$(CD) $${bdir} && $(MAKE) $(EXTRA_MAKE_ARGS) $@" ; \
- $(CD) $${bdir} && $(MAKE) $(EXTRA_MAKE_ARGS) $@ ; \
+ $(ECHO) "$(CD) $${bdir} && $(MAKE) $@" ; \
+ $(CD) $${bdir} && $(MAKE) $@ ; \
done
+# TBD: Deploy input
+$(BUILD_DIR_ROOT)/.deploy_input:
+ @if [ "$(ALL_MAKEFILES)" = "" ] ; then \
+ $(ECHO) "ERROR: No configurations to build"; exit 1; \
+ fi
+ @for bdir in $(dir $(ALL_MAKEFILES)) ; do \
+ if [ deploy/make/Makefile ] ; then \
+ echo "Attempting deploy build." ; \
+ ( \
+ $(RM) -r $${bdir}/deploy_input ; \
+ $(MKDIR) -p $${bdir}/deploy_input ; \
+ ( $(CD) $${bdir}/images && $(TAR) -cf - j2sdk-image j2re-image ) \
+ | ( $(CD) $${bdir}/deploy_input && $(TAR) -xf - ) ; \
+ ) ; \
+ fi; \
+ done
+ touch $@
+
+# TBD: Deploy images
+deploy: $(BUILD_DIR_ROOT)/.deploy_input
+ @if [ "$(ALL_MAKEFILES)" = "" ] ; then \
+ $(ECHO) "ERROR: No configurations to build"; exit 1; \
+ fi
+ @for bdir in $(dir $(ALL_MAKEFILES)) ; do \
+ if [ deploy/make/Makefile ] ; then \
+ echo "Attempting deploy build." ; \
+ ( \
+ $(CD) deploy/make && \
+ $(MAKE) \
+ ABS_OUTPUTDIR=$${bdir}/deploy_input \
+ OUTPUTDIR=$${bdir}/deploy_input \
+ ) ; \
+ fi; \
+ done
+
+# TBD: Install bundles
+install:
+
# Bundle creation
bundles:
@if [ "$(ALL_IMAGE_DIRS)" = "" ] ; then \
@@ -91,8 +130,8 @@
checks:
@$(ECHO) "No checks yet"
-# Keep track of phony targets
-PHONY_LIST += all images clean clobber checks
+# Keep track of user targets
+USER_TARGETS += all deploy install images clean clobber checks
###########################################################################
# To help in adoption of the new configure&&make build process, a bridge
@@ -102,32 +141,18 @@
bridgeBuild: bridge2configure images
# Bridge from old Makefile ALT settings to configure options
-bridge2configure: .bridge2configureOpts
- $(CD) common/makefiles && sh ../autoconf/configure $(strip $(shell $(CAT) $<))
+bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
+ bash ./configure $(strip $(shell $(CAT) $<))
# Create a file with configure options created from old Makefile mechanisms.
-.bridge2configureOpts: .bridge2configureOptsLatest
+$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
$(RM) $@
$(CP) $< $@
-# In case make was invoked from a specific path
-_MAKE_COMMAND_PATH:=$(firstword $(MAKE))
-ifneq ($(dir $(_MAKE_COMMAND_PATH)),./)
- # This could be removed someday if JPRT was fixed and we could assume that
- # the path to make was always in PATH.
- MAKE_BINDIR:=$(call UnixPath,$(dir $(_MAKE_COMMAND_PATH)))
- NEWPATH:=$(MAKE_BINDIR):${PATH}
- PATH:=$(NEWPATH)
- export PATH
- MAKE_COMMAND=$(MAKE_BINDIR)/$(notdir $(_MAKE_COMMAND_PATH))
-else
- MAKE_COMMAND=$(_MAKE_COMMAND_PATH)
-endif
-
# Use this file to only change when obvious things have changed
-.bridge2configureOptsLatest: FRC
+$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
$(RM) $@.tmp
- @$(ECHO) " MAKE=$(MAKE_COMMAND) " >> $@.tmp
+ $(MKDIR) -p $(BUILD_DIR_ROOT)
@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
ifdef ARCH_DATA_MODEL
@$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
@@ -156,20 +181,30 @@
# Clobber all the built files
clobber:: bridge2clobber
bridge2clobber::
- $(RM) .bridge2*
+ $(RM) $(BUILD_DIR_ROOT)/.bridge2*
+ $(RM) $(BUILD_DIR_ROOT)/.deploy_input
# Keep track of phony targets
PHONY_LIST += bridge2configure bridgeBuild bridge2clobber
###########################################################################
+# Sanity checks (history target)
+#
+
+sanity: checks
+
+# Keep track of user targets
+USER_TARGETS += sanity
+
+###########################################################################
# Javadocs
#
javadocs:
cd common/makefiles && $(MAKE) -f MakefileJavadoc.gmk
-# Keep track of phony targets
-PHONY_LIST += javadocs
+# Keep track of user targets
+USER_TARGETS += javadocs
###########################################################################
# JPRT targets
@@ -190,7 +225,6 @@
jprt_build_debug: BUILD_DIRNAME=*-debug
jprt_build_debug: jprt_build_generic
-jprt_build_generic: EXTRA_MAKE_ARGS=LOG=nofile,info
jprt_build_generic: $(JPRT_ARCHIVE_BUNDLE)
$(JPRT_ARCHIVE_BUNDLE): bridgeBuild bundles
@@ -203,9 +237,59 @@
jprt_build_generic
###########################################################################
+# Help target
+
+HELP_FORMAT=%12s%s\n
+
+help:
+ @$(PRINTF) "# JDK Makefile\n"
+ @$(PRINTF) "#\n"
+ @$(PRINTF) "# Usage: make [Target]\n"
+ @$(PRINTF) "#\n"
+ @$(PRINTF) "# $(HELP_FORMAT)" "Target " "Description"
+ @$(PRINTF) "# $(HELP_FORMAT)" "------ " "-----------"
+ @for i in $(USER_TARGETS) ; do \
+ $(MAKE) help_$${i} ; \
+ done
+ @$(PRINTF) "#\n"
+
+help_all:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Build the entire jdk but not the images"
+help_images:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Create the jdk images for the builds"
+help_deploy:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Create the jdk deploy images from the jdk images"
+help_install:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Create the jdk install bundles from the deploy images"
+help_clean:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Clean and prepare for a fresh build from scratch"
+help_clobber:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Clean and also purge any hidden derived data"
+help_checks:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Perform various checks to make sure we can build"
+help_sanity:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Same as 'make checks'"
+help_javadocs:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Build the javadocs"
+help_help:
+ @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
+ "Print out the help messages"
+
+# Keep track of user targets
+USER_TARGETS += help
+
+###########################################################################
# Phony targets
-.PHONY: $(PHONY_LIST)
+.PHONY: $(PHONY_LIST) $(USER_TARGETS)
# Force target
FRC:
-
diff --git a/common/autoconf/Makefile.in b/common/autoconf/Makefile.in
index 629fadf..d1f1486 100644
--- a/common/autoconf/Makefile.in
+++ b/common/autoconf/Makefile.in
@@ -21,6 +21,7 @@
# questions.
#
-# Generated Makefile @DATE_WHEN_CONFIGURED@
+# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
+# GENERATED FILE, DO NOT EDIT
SPEC:=@OUTPUT_ROOT@/spec.gmk
include @SRC_ROOT@/common/makefiles/Makefile
diff --git a/common/autoconf/autogen.sh b/common/autoconf/autogen.sh
index 1ab55f7..d4da90c 100644
--- a/common/autoconf/autogen.sh
+++ b/common/autoconf/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,14 +29,11 @@
# date +%s is not available on Solaris, use this workaround
# from http://solarisjedi.blogspot.co.uk/2006/06/solaris-date-command-and-epoch-time.html
TIMESTAMP=`/usr/bin/truss /usr/bin/date 2>&1 | nawk -F= '/^time\(\)/ {gsub(/ /,"",$2);print $2}'`
- # On Solaris /bin/sh doesn't support test -e but /usr/bin/test does.
- TEST=`which test`
else
TIMESTAMP=`date +%s`
- TEST="test"
fi
-if $TEST "$CUSTOM_CONFIG_DIR" = ""; then
+if test "x$CUSTOM_CONFIG_DIR" = "x"; then
custom_script_dir="$script_dir/../../jdk/make/closed/autoconf"
else
custom_script_dir=$CUSTOM_CONFIG_DIR
@@ -44,16 +41,22 @@
custom_hook=$custom_script_dir/custom-hook.m4
+if test "x`which autoconf 2> /dev/null`" = x; then
+ echo You need autoconf installed to be able to regenerate the configure script
+ echo Error: Cannot find autoconf 1>&2
+ exit 1
+fi
+
echo Generating generated-configure.sh
cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | autoconf -W all -I$script_dir - > $script_dir/generated-configure.sh
rm -rf autom4te.cache
-if $TEST -e $custom_hook; then
+if test -e $custom_hook; then
echo Generating custom generated-configure.sh
# We have custom sources available; also generate configure script
# with custom hooks compiled in.
cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
- sed -e "s|AC_DEFUN_ONCE(\[CUSTOM_HOOK\])|m4_include([$custom_hook])|" | autoconf -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
+ sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | autoconf -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
rm -rf autom4te.cache
else
echo No custom hook found: $custom_hook
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index e0e7cf6..cbfae39 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -34,84 +34,102 @@
fi
])
-AC_DEFUN([SET_FULL_PATH],
+# This will make sure the given variable points to a full and proper
+# path. This means:
+# 1) There will be no spaces in the path. On posix platforms,
+# spaces in the path will result in an error. On Windows,
+# the path will be rewritten using short-style to be space-free.
+# 2) The path will be absolute, and it will be in unix-style (on
+# cygwin).
+# $1: The name of the variable to fix
+AC_DEFUN([BASIC_FIXUP_PATH],
[
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="[$]$1"
- car="${tmp%% *}"
- tmp="[$]$1 EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- SET_FULL_PATH_SPACESAFE(car)
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- $1="$car ${cdr% *}"
- else
- $1="$car"
- fi
-])
-
-AC_DEFUN([SPACESAFE],
-[
- # Fail with message $2 if var $1 contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "[$]$1" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- $1=`$CYGPATH -s -m -a "[$]$1"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- $1=`$ECHO "[$]$1" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- $1=`$CYGPATH -u "[$]$1"`
- else
- AC_MSG_ERROR([You cannot have spaces in $2! "[$]$1"])
- fi
- fi
-])
-
-AC_DEFUN([SET_FULL_PATH_SPACESAFE],
-[
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="[$]$1"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ BASIC_FIXUP_PATH_CYGWIN($1)
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ BASIC_FIXUP_PATH_MSYS($1)
+ else
+ # We're on a posix platform. Hooray! :)
+ path="[$]$1"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "[$]$1"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ if test ! -f "$path" && test ! -d "$path"; then
+ AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
fi
- $1="$tmp"
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
+ AC_MSG_ERROR([Spaces are not allowed in this path.])
+ fi
+ fi
])
-AC_DEFUN([REMOVE_SYMBOLIC_LINKS],
+# This will make sure the given variable points to a executable
+# with a full and proper path. This means:
+# 1) There will be no spaces in the path. On posix platforms,
+# spaces in the path will result in an error. On Windows,
+# the path will be rewritten using short-style to be space-free.
+# 2) The path will be absolute, and it will be in unix-style (on
+# cygwin).
+# Any arguments given to the executable is preserved.
+# If the input variable does not have a directory specification, then
+# it need to be in the PATH.
+# $1: The name of the variable to fix
+AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
+[
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ BASIC_FIXUP_EXECUTABLE_MSYS($1)
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="[$]$1"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ AC_MSG_NOTICE([Resolving $1 (as $path) with 'which' failed, using $path directly.])
+ new_path="$path"
+ else
+ AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
+ fi
+ AC_MSG_ERROR([Cannot locate the the path of $1])
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ $1="$new_complete"
+ AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
+ fi
+])
+
+AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
[
if test "x$OPENJDK_BUILD_OS" != xwindows; then
# Follow a chain of symbolic links. Use readlink
# where it exists, else fall back to horribly
# complicated shell code.
- AC_PATH_PROG(READLINK, readlink)
if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink.
- ISGNU=`$READLINK --help 2>&1 | grep GNU`
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then
# A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there?
@@ -125,23 +143,25 @@
else
STARTDIR=$PWD
COUNTER=0
- DIR=`dirname [$]$1`
- FIL=`basename [$]$1`
+ sym_link_dir=`$DIRNAME [$]$1`
+ sym_link_file=`$BASENAME [$]$1`
while test $COUNTER -lt 20; do
- ISLINK=`ls -l $DIR/$FIL | grep '\->' | sed -e 's/.*-> \(.*\)/\1/'`
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done!
break
fi
# The link might be relative! We have to use cd to travel safely.
- cd $DIR
- cd `dirname $ISLINK`
- DIR=`pwd`
- FIL=`basename $ISLINK`
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1
done
cd $STARTDIR
- $1=$DIR/$FIL
+ $1=$sym_link_dir/$sym_link_file
fi
fi
])
@@ -152,6 +172,107 @@
AC_SUBST(CONFIGURE_COMMAND_LINE)
DATE_WHEN_CONFIGURED=`LANG=C date`
AC_SUBST(DATE_WHEN_CONFIGURED)
+AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
+AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
+])
+
+# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
+# $1: variable to check
+# $2: executable name to print in warning (optional)
+AC_DEFUN([BASIC_CHECK_NONEMPTY],
+[
+ if test "x[$]$1" = x; then
+ if test "x$2" = x; then
+ PROG_NAME=translit($1,A-Z,a-z)
+ else
+ PROG_NAME=$2
+ fi
+ AC_MSG_NOTICE([Could not find $PROG_NAME!])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+])
+
+# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
+# Arguments as AC_PATH_PROG:
+# $1: variable to set
+# $2: executable name to look for
+AC_DEFUN([BASIC_REQUIRE_PROG],
+[
+ AC_PATH_PROGS($1, $2)
+ BASIC_CHECK_NONEMPTY($1, $2)
+])
+
+# Setup the most fundamental tools that relies on not much else to set up,
+# but is used by much of the early bootstrap code.
+AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
+[
+
+# Start with tools that do not need have cross compilation support
+# and can be expected to be found in the default PATH. These tools are
+# used by configure. Nor are these tools expected to be found in the
+# devkit from the builddeps server either, since they are
+# needed to download the devkit.
+
+# First are all the simple required tools.
+BASIC_REQUIRE_PROG(BASENAME, basename)
+BASIC_REQUIRE_PROG(BASH, bash)
+BASIC_REQUIRE_PROG(CAT, cat)
+BASIC_REQUIRE_PROG(CHMOD, chmod)
+BASIC_REQUIRE_PROG(CMP, cmp)
+BASIC_REQUIRE_PROG(CP, cp)
+BASIC_REQUIRE_PROG(CUT, cut)
+BASIC_REQUIRE_PROG(DATE, date)
+BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
+BASIC_REQUIRE_PROG(DIRNAME, dirname)
+BASIC_REQUIRE_PROG(ECHO, echo)
+BASIC_REQUIRE_PROG(EXPR, expr)
+BASIC_REQUIRE_PROG(FILE, file)
+BASIC_REQUIRE_PROG(FIND, find)
+BASIC_REQUIRE_PROG(HEAD, head)
+BASIC_REQUIRE_PROG(LN, ln)
+BASIC_REQUIRE_PROG(LS, ls)
+BASIC_REQUIRE_PROG(MKDIR, mkdir)
+BASIC_REQUIRE_PROG(MKTEMP, mktemp)
+BASIC_REQUIRE_PROG(MV, mv)
+BASIC_REQUIRE_PROG(PRINTF, printf)
+BASIC_REQUIRE_PROG(THEPWDCMD, pwd)
+BASIC_REQUIRE_PROG(RM, rm)
+BASIC_REQUIRE_PROG(SH, sh)
+BASIC_REQUIRE_PROG(SORT, sort)
+BASIC_REQUIRE_PROG(TAIL, tail)
+BASIC_REQUIRE_PROG(TAR, tar)
+BASIC_REQUIRE_PROG(TEE, tee)
+BASIC_REQUIRE_PROG(TOUCH, touch)
+BASIC_REQUIRE_PROG(TR, tr)
+BASIC_REQUIRE_PROG(UNAME, uname)
+BASIC_REQUIRE_PROG(UNIQ, uniq)
+BASIC_REQUIRE_PROG(WC, wc)
+BASIC_REQUIRE_PROG(WHICH, which)
+BASIC_REQUIRE_PROG(XARGS, xargs)
+
+# Then required tools that require some special treatment.
+AC_PROG_AWK
+BASIC_CHECK_NONEMPTY(AWK)
+AC_PROG_GREP
+BASIC_CHECK_NONEMPTY(GREP)
+AC_PROG_EGREP
+BASIC_CHECK_NONEMPTY(EGREP)
+AC_PROG_FGREP
+BASIC_CHECK_NONEMPTY(FGREP)
+AC_PROG_SED
+BASIC_CHECK_NONEMPTY(SED)
+
+AC_PATH_PROGS(NAWK, [nawk gawk awk])
+BASIC_CHECK_NONEMPTY(NAWK)
+
+# Always force rm.
+RM="$RM -f"
+
+# These are not required on all platforms
+AC_PATH_PROG(CYGPATH, cygpath)
+AC_PATH_PROG(READLINK, readlink)
+AC_PATH_PROG(DF, df)
+AC_PATH_PROG(SETFILE, SetFile)
])
# Setup basic configuration paths, and platform-specific stuff related to PATHs.
@@ -159,46 +280,37 @@
[
# Locate the directory of this script.
SCRIPT="[$]0"
-REMOVE_SYMBOLIC_LINKS(SCRIPT)
-AUTOCONF_DIR=`dirname [$]0`
+BASIC_REMOVE_SYMBOLIC_LINKS(SCRIPT)
+AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
# Where is the source? It is located two levels above the configure script.
CURDIR="$PWD"
cd "$AUTOCONF_DIR/../.."
SRC_ROOT="`pwd`"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- SRC_ROOT_LENGTH=`pwd|wc -m`
- if test $SRC_ROOT_LENGTH -gt 100; then
- AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
- fi
+
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ PATH_SEP=";"
+ BASIC_CHECK_PATHS_WINDOWS
+else
+ PATH_SEP=":"
fi
+
AC_SUBST(SRC_ROOT)
+AC_SUBST(PATH_SEP)
cd "$CURDIR"
-SPACESAFE(SRC_ROOT,[the path to the source root])
-SPACESAFE(CURDIR,[the path to the current directory])
+BASIC_FIXUP_PATH(SRC_ROOT)
+BASIC_FIXUP_PATH(CURDIR)
if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
# Add extra search paths on solaris for utilities like ar and as etc...
PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
fi
-# For cygwin we need cygpath first, since it is used everywhere.
-AC_PATH_PROG(CYGPATH, cygpath)
-PATH_SEP=":"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- if test "x$CYGPATH" = x; then
- AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
- fi
- PATH_SEP=";"
-fi
-AC_SUBST(PATH_SEP)
-
# You can force the sys-root if the sys-root encoded into the cross compiler tools
# is not correct.
AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
- [pass this sys-root to the compilers and linker (useful if the sys-root encoded in
- the cross compiler tools is incorrect)])])
+ [pass this sys-root to the compilers and tools (for cross-compiling)])])
if test "x$with_sys_root" != x; then
SYS_ROOT=$with_sys_root
@@ -208,7 +320,7 @@
AC_SUBST(SYS_ROOT)
AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
- [search this directory for (cross-compiling) compilers and tools])], [TOOLS_DIR=$with_tools_dir])
+ [search this directory for compilers and tools (for cross-compiling)])], [TOOLS_DIR=$with_tools_dir])
AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
[use this directory as base for tools-dir and sys-root (for cross-compiling)])],
@@ -229,7 +341,7 @@
[
AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
- [use this as the name of the configuration, overriding the generated default])],
+ [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
[ CONF_NAME=${with_conf_name} ])
# Test from where we are running configure, in or outside of src root.
@@ -240,7 +352,7 @@
CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
fi
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
- mkdir -p "$OUTPUT_ROOT"
+ $MKDIR -p "$OUTPUT_ROOT"
if test ! -d "$OUTPUT_ROOT"; then
AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
fi
@@ -253,9 +365,30 @@
CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
fi
OUTPUT_ROOT="$CURDIR"
-fi
-SPACESAFE(OUTPUT_ROOT,[the path to the output root])
+ # WARNING: This might be a bad thing to do. You need to be sure you want to
+ # have a configuration in this directory. Do some sanity checks!
+
+ if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
+ # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
+ # other files
+ files_present=`$LS $OUTPUT_ROOT`
+ if test "x$files_present" != x; then
+ AC_MSG_NOTICE([Current directory is $CURDIR.])
+ AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
+ AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
+ AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
+ AC_MSG_NOTICE([seriously mess up just about everything.])
+ AC_MSG_NOTICE([Try 'cd $SRC_ROOT' and restart configure])
+ AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
+ AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
+ fi
+ fi
+fi
+AC_MSG_CHECKING([what configuration name to use])
+AC_MSG_RESULT([$CONF_NAME])
+
+BASIC_FIXUP_PATH(OUTPUT_ROOT)
AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
AC_SUBST(CONF_NAME, $CONF_NAME)
@@ -287,7 +420,7 @@
# Setup default logging of stdout and stderr to build.log in the output root.
BUILD_LOG='$(OUTPUT_ROOT)/build.log'
BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
-BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
AC_SUBST(BUILD_LOG)
AC_SUBST(BUILD_LOG_PREVIOUS)
AC_SUBST(BUILD_LOG_WRAPPER)
@@ -305,7 +438,6 @@
DESCRIPTION="$2"
if test "x$MAKE_CANDIDATE" != x; then
AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
- SET_FULL_PATH(MAKE_CANDIDATE)
MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
if test "x$IS_GNU_MAKE" = x; then
@@ -314,8 +446,27 @@
IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'`
if test "x$IS_MODERN_MAKE" = x; then
AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
- else
- FOUND_MAKE=$MAKE_CANDIDATE
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ AC_MSG_ERROR([Unknown Windows environment])
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ AC_MSG_NOTICE([Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring.])
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+ BASIC_FIXUP_EXECUTABLE(FOUND_MAKE)
+ fi
fi
fi
fi
@@ -330,7 +481,7 @@
if test ! -f "$MAKE"; then
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
fi
- BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=])
+ BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
if test "x$FOUND_MAKE" = x; then
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.])
fi
@@ -375,7 +526,7 @@
AC_MSG_CHECKING([if find supports -delete])
FIND_DELETE="-delete"
- DELETEDIR=`mktemp -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
+ DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
@@ -389,102 +540,22 @@
AC_MSG_RESULT([yes])
fi
rmdir $DELETEDIR
+ AC_SUBST(FIND_DELETE)
])
-# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
-# $1: variable to check
-# $2: executable name to print in warning (optional)
-AC_DEFUN([CHECK_NONEMPTY],
+AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
[
- if test "x[$]$1" = x; then
- if test "x$2" = x; then
- PROG_NAME=translit($1,A-Z,a-z)
- else
- PROG_NAME=$2
- fi
- AC_MSG_NOTICE([Could not find $PROG_NAME!])
- AC_MSG_ERROR([Cannot continue])
- fi
-])
-
-# Does AC_PATH_PROG followed by CHECK_NONEMPTY.
-# Arguments as AC_PATH_PROG:
-# $1: variable to set
-# $2: executable name to look for
-AC_DEFUN([BASIC_REQUIRE_PROG],
-[
- AC_PATH_PROGS($1, $2)
- CHECK_NONEMPTY($1, $2)
-])
-
-AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
-[
-# Start with tools that do not need have cross compilation support
-# and can be expected to be found in the default PATH. These tools are
-# used by configure. Nor are these tools expected to be found in the
-# devkit from the builddeps server either, since they are
-# needed to download the devkit.
-
-# First are all the simple required tools.
-BASIC_REQUIRE_PROG(BASENAME, basename)
-BASIC_REQUIRE_PROG(CAT, cat)
-BASIC_REQUIRE_PROG(CHMOD, chmod)
-BASIC_REQUIRE_PROG(CMP, cmp)
-BASIC_REQUIRE_PROG(CP, cp)
-BASIC_REQUIRE_PROG(CPIO, cpio)
-BASIC_REQUIRE_PROG(CUT, cut)
-BASIC_REQUIRE_PROG(DATE, date)
-BASIC_REQUIRE_PROG(DF, df)
-BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
-BASIC_REQUIRE_PROG(ECHO, echo)
-BASIC_REQUIRE_PROG(EXPR, expr)
-BASIC_REQUIRE_PROG(FILE, file)
-BASIC_REQUIRE_PROG(FIND, find)
-BASIC_REQUIRE_PROG(HEAD, head)
-BASIC_REQUIRE_PROG(LN, ln)
-BASIC_REQUIRE_PROG(LS, ls)
-BASIC_REQUIRE_PROG(MKDIR, mkdir)
-BASIC_REQUIRE_PROG(MV, mv)
-BASIC_REQUIRE_PROG(PRINTF, printf)
-BASIC_REQUIRE_PROG(SH, sh)
-BASIC_REQUIRE_PROG(SORT, sort)
-BASIC_REQUIRE_PROG(TAIL, tail)
-BASIC_REQUIRE_PROG(TAR, tar)
-BASIC_REQUIRE_PROG(TEE, tee)
-BASIC_REQUIRE_PROG(TOUCH, touch)
-BASIC_REQUIRE_PROG(TR, tr)
-BASIC_REQUIRE_PROG(UNIQ, uniq)
-BASIC_REQUIRE_PROG(UNZIP, unzip)
-BASIC_REQUIRE_PROG(WC, wc)
-BASIC_REQUIRE_PROG(XARGS, xargs)
-BASIC_REQUIRE_PROG(ZIP, zip)
-
-# Then required tools that require some special treatment.
-AC_PROG_AWK
-CHECK_NONEMPTY(AWK)
-AC_PROG_GREP
-CHECK_NONEMPTY(GREP)
-AC_PROG_EGREP
-CHECK_NONEMPTY(EGREP)
-AC_PROG_FGREP
-CHECK_NONEMPTY(FGREP)
-AC_PROG_SED
-CHECK_NONEMPTY(SED)
-
-AC_PATH_PROGS(NAWK, [nawk gawk awk])
-CHECK_NONEMPTY(NAWK)
-
BASIC_CHECK_GNU_MAKE
-BASIC_REQUIRE_PROG(RM, rm)
-RM="$RM -f"
-
BASIC_CHECK_FIND_DELETE
-AC_SUBST(FIND_DELETE)
+
+# These tools might not be installed by default,
+# need hint on how to install them.
+BASIC_REQUIRE_PROG(UNZIP, unzip)
+BASIC_REQUIRE_PROG(ZIP, zip)
# Non-required basic tools
-AC_PATH_PROG(THEPWDCMD, pwd)
AC_PATH_PROG(LDD, ldd)
if test "x$LDD" = "x"; then
# List shared lib dependencies is used for
@@ -497,52 +568,17 @@
OTOOL="true"
fi
AC_PATH_PROGS(READELF, [readelf greadelf])
-AC_PATH_PROGS(OBJDUMP, [objdump gobjdump])
AC_PATH_PROG(HG, hg)
-])
+AC_PATH_PROG(STAT, stat)
+AC_PATH_PROG(TIME, time)
-AC_DEFUN_ONCE([BASIC_COMPILE_UNCYGDRIVE],
-[
-# When using cygwin, we need a wrapper binary that renames
-# /cygdrive/c/ arguments into c:/ arguments and peeks into
-# @files and rewrites these too! This wrapper binary is
-# called uncygdrive.exe.
-UNCYGDRIVE=
-if test "x$OPENJDK_BUILD_OS" = xwindows; then
- AC_MSG_CHECKING([if uncygdrive can be created])
- UNCYGDRIVE_SRC=`$CYGPATH -m $SRC_ROOT/common/src/uncygdrive.c`
- rm -f $OUTPUT_ROOT/uncygdrive*
- UNCYGDRIVE=`$CYGPATH -m $OUTPUT_ROOT/uncygdrive.exe`
- cd $OUTPUT_ROOT
- $CC $UNCYGDRIVE_SRC /Fe$UNCYGDRIVE > $OUTPUT_ROOT/uncygdrive1.log 2>&1
- cd $CURDIR
-
- if test ! -x $OUTPUT_ROOT/uncygdrive.exe; then
- AC_MSG_RESULT([no])
- cat $OUTPUT_ROOT/uncygdrive1.log
- AC_MSG_ERROR([Could not create $OUTPUT_ROOT/uncygdrive.exe])
- fi
- AC_MSG_RESULT([$UNCYGDRIVE])
- AC_MSG_CHECKING([if uncygdrive.exe works])
- cd $OUTPUT_ROOT
- $UNCYGDRIVE $CC $SRC_ROOT/common/src/uncygdrive.c /Fe$OUTPUT_ROOT/uncygdrive2.exe > $OUTPUT_ROOT/uncygdrive2.log 2>&1
- cd $CURDIR
- if test ! -x $OUTPUT_ROOT/uncygdrive2.exe; then
- AC_MSG_RESULT([no])
- cat $OUTPUT_ROOT/uncygdrive2.log
- AC_MSG_ERROR([Uncygdrive did not work!])
- fi
- AC_MSG_RESULT([yes])
- rm -f $OUTPUT_ROOT/uncygdrive?.??? $OUTPUT_ROOT/uncygdrive.obj
- # The path to uncygdrive to use should be Unix-style
- UNCYGDRIVE="$OUTPUT_ROOT/uncygdrive.exe"
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ BASIC_REQUIRE_PROG(COMM, comm)
fi
-
-AC_SUBST(UNCYGDRIVE)
])
-
-# Check if build directory is on local disk.
+# Check if build directory is on local disk. If not possible to determine,
+# we prefer to claim it's local.
# Argument 1: directory to test
# Argument 2: what to do if it is on local disk
# Argument 3: what to do otherwise (remote disk or failure)
@@ -550,11 +586,26 @@
[
# df -l lists only local disks; if the given directory is not found then
# a non-zero exit code is given
- if $DF -l $1 > /dev/null 2>&1; then
- $2
- else
- $3
- fi
+ if test "x$DF" = x; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # msys does not have df; use Windows "net use" instead.
+ IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
+ if test "x$IS_NETWORK_DISK" = x; then
+ $2
+ else
+ $3
+ fi
+ else
+ # No df here, say it's local
+ $2
+ fi
+ else
+ if $DF -l $1 > /dev/null 2>&1; then
+ $2
+ else
+ $3
+ fi
+ fi
])
AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
diff --git a/common/autoconf/basics_windows.m4 b/common/autoconf/basics_windows.m4
new file mode 100644
index 0000000..548b3e4
--- /dev/null
+++ b/common/autoconf/basics_windows.m4
@@ -0,0 +1,406 @@
+#
+# Copyright (c) 2011, 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.
+#
+
+AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_UNIX_PATH],
+[
+ windows_path="[$]$1"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ $1="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ $1="$unix_path"
+ fi
+])
+
+AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH],
+[
+ unix_path="[$]$1"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ windows_path=`$CYGPATH -m "$unix_path"`
+ $1="$windows_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ windows_path=`cmd //c echo $unix_path`
+ $1="$windows_path"
+ fi
+])
+
+# Helper function which possibly converts a path using DOS-style short mode.
+# If so, the updated path is stored in $new_path.
+# $1: The path to check
+AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN],
+[
+ input_path="$1"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use @<:@ and @:>@ instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-._/a-zA-Z0-9@:>@`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $1 | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+])
+
+# Helper function which possibly converts a path using DOS-style short mode.
+# If so, the updated path is stored in $new_path.
+# $1: The path to check
+AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS],
+[
+ input_path="$1"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use @<:@ and @:>@ instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-_/:a-zA-Z0-9@:>@`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+])
+
+# FIXME: The BASIC_FIXUP_*_CYGWIN/MSYS is most likely too convoluted
+# and could probably be heavily simplified. However, all changes in this
+# area tend to need lot of testing in different scenarios, and in lack of
+# proper unit testing, cleaning this up has not been deemed worth the effort
+# at the moment.
+
+AC_DEFUN([BASIC_FIXUP_PATH_CYGWIN],
+[
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="[$]$1"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
+ AC_MSG_ERROR([Cannot locate the the path of $1])
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$new_path])
+
+ if test "x$path" != "x$new_path"; then
+ $1="$new_path"
+ AC_MSG_NOTICE([Rewriting $1 to "$new_path"])
+ fi
+])
+
+AC_DEFUN([BASIC_FIXUP_PATH_MSYS],
+[
+ path="[$]$1"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+ BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path])
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
+ if test "x$path" != "x$new_path"; then
+ $1="$new_path"
+ AC_MSG_NOTICE([Rewriting $1 to "$new_path"])
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}")
+])
+
+AC_DEFUN([BASIC_FIXUP_EXECUTABLE_CYGWIN],
+[
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="[$]$1"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.])
+ fi
+ AC_MSG_ERROR([Cannot locate the the path of $1])
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.])
+ AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found])
+ AC_MSG_ERROR([Cannot locate the the path of $1])
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+ BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$input_to_shortpath])
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+])
+
+AC_DEFUN([BASIC_FIXUP_EXECUTABLE_MSYS],
+[
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="[$]$1"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.])
+ fi
+ AC_MSG_ERROR([Cannot locate the the path of $1])
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+ BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path])
+ # Output is in $new_path
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}")
+ fi
+])
+
+# Setup basic configuration paths, and platform-specific stuff related to PATHs.
+AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS],
+[
+ SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
+ if test $SRC_ROOT_LENGTH -gt 100; then
+ AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
+ fi
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ AC_MSG_CHECKING([cygwin release])
+ CYGWIN_VERSION=`$UNAME -r`
+ AC_MSG_RESULT([$CYGWIN_VERSION])
+ WINDOWS_ENV_VENDOR='cygwin'
+ WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
+
+ CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.`
+ if test "x$CYGWIN_VERSION_OK" = x; then
+ AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ if test "x$CYGPATH" = x; then
+ AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
+ fi
+ AC_MSG_CHECKING([cygwin root directory as unix-style path])
+ # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
+ cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
+ # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
+ CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
+ AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
+ WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
+ test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.])
+ fi
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ AC_MSG_CHECKING([msys release])
+ MSYS_VERSION=`$UNAME -r`
+ AC_MSG_RESULT([$MSYS_VERSION])
+
+ WINDOWS_ENV_VENDOR='msys'
+ WINDOWS_ENV_VERSION="$MSYS_VERSION"
+
+ AC_MSG_CHECKING([msys root directory as unix-style path])
+ # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
+ MSYS_ROOT_PATH=`cd / ; cmd /c cd | grep ".*"`
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(MSYS_ROOT_PATH)
+ AC_MSG_RESULT([$MSYS_ROOT_PATH])
+ WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
+ else
+ AC_MSG_ERROR([Unknown Windows environment. Neither cygwin nor msys was detected.])
+ fi
+
+ # Test if windows or unix (cygwin/msys) find is first in path.
+ AC_MSG_CHECKING([what kind of 'find' is first on the PATH])
+ FIND_BINARY_OUTPUT=`find --version 2>&1`
+ if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then
+ AC_MSG_RESULT([unix style])
+ elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then
+ AC_MSG_RESULT([Windows])
+ AC_MSG_NOTICE([Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools.])
+ AC_MSG_NOTICE([This will not work. Please correct and make sure /usr/bin (or similar) is first in path.])
+ AC_MSG_ERROR([Cannot continue])
+ else
+ AC_MSG_RESULT([unknown])
+ AC_MSG_WARN([It seems that your find utility is non-standard.])
+ fi
+])
+
+AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
+[
+# When using cygwin or msys, we need a wrapper binary that renames
+# /cygdrive/c/ arguments into c:/ arguments and peeks into
+# @files and rewrites these too! This wrapper binary is
+# called fixpath.
+FIXPATH=
+if test "x$OPENJDK_BUILD_OS" = xwindows; then
+ AC_MSG_CHECKING([if fixpath can be created])
+ FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+ FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+ if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
+ FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
+ # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
+ FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+ FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
+ FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
+
+ # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
+ # @ was chosen as separator to minimize risk of other tools messing around with it
+ all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+ fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
+
+ FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
+ fi
+ rm -f $OUTPUT_ROOT/fixpath*
+ cd $OUTPUT_ROOT
+ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+ cd $CURDIR
+
+ if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+ AC_MSG_RESULT([no])
+ cat $OUTPUT_ROOT/fixpath1.log
+ AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
+ fi
+ AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([if fixpath.exe works])
+ cd $OUTPUT_ROOT
+ $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+ cd $CURDIR
+ if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+ AC_MSG_RESULT([no])
+ cat $OUTPUT_ROOT/fixpath2.log
+ AC_MSG_ERROR([fixpath did not work!])
+ fi
+ AC_MSG_RESULT([yes])
+ rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
+fi
+
+AC_SUBST(FIXPATH)
+])
diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
index c4ce883..4a4ea36 100644
--- a/common/autoconf/boot-jdk.m4
+++ b/common/autoconf/boot-jdk.m4
@@ -62,9 +62,12 @@
else
# We're done! :-)
BOOT_JDK_FOUND=yes
- SPACESAFE(BOOT_JDK,[the path to the Boot JDK])
+ BASIC_FIXUP_PATH(BOOT_JDK)
AC_MSG_CHECKING([for Boot JDK])
- AC_MSG_RESULT([$BOOT_JDK ($BOOT_JDK_VERSION)])
+ AC_MSG_RESULT([$BOOT_JDK])
+ AC_MSG_CHECKING([Boot JDK version])
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ AC_MSG_RESULT([$BOOT_JDK_VERSION])
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -93,12 +96,8 @@
AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
[
if test "x$JAVA_HOME" != x; then
- if test "x$OPENJDK_TARGET_OS" = xwindows; then
- # On Windows, JAVA_HOME is likely in DOS-style
- JAVA_HOME_PROCESSED="`$CYGPATH -u "$JAVA_HOME"`"
- else
- JAVA_HOME_PROCESSED="$JAVA_HOME"
- fi
+ JAVA_HOME_PROCESSED="$JAVA_HOME"
+ BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED)
if test ! -d "$JAVA_HOME_PROCESSED"; then
AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!])
else
@@ -125,8 +124,7 @@
# Lets find the JDK/JRE directory by following symbolic links.
# Linux/GNU systems often have links from /usr/bin/java to
# /etc/alternatives/java to the real JDK binary.
- SET_FULL_PATH_SPACESAFE(BINARY)
- REMOVE_SYMBOLIC_LINKS(BINARY)
+ BASIC_REMOVE_SYMBOLIC_LINKS(BINARY)
BOOT_JDK=`dirname "$BINARY"`
BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
@@ -155,13 +153,17 @@
[
BOOT_JDK_PREFIX="$1"
BOOT_JDK_SUFFIX="$2"
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- AC_MSG_NOTICE([Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)])
- fi
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+ BOOTJDK_DO_CHECK([
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ AC_MSG_NOTICE([Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)])
+ fi
+ ])
+ done
fi
])
@@ -171,7 +173,9 @@
AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY],
[
if test "x[$]$1" != x; then
- BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([`$CYGPATH -u "[$]$1"`/Java])
+ VIRTUAL_DIR="[$]$1/Java"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VIRTUAL_DIR)
+ BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY($VIRTUAL_DIR)
fi
])
@@ -187,6 +191,8 @@
elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/Library/Java/JavaVirtualMachines],[/Contents/Home])])
BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/System/Library/Java/JavaVirtualMachines],[/Contents/Home])])
+ elif test "x$OPENJDK_TARGET_OS" = xlinux; then
+ BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/usr/lib/jvm])])
fi
])
diff --git a/common/autoconf/build-aux/config.guess b/common/autoconf/build-aux/config.guess
index 9d9d29b..572ed2b 100644
--- a/common/autoconf/build-aux/config.guess
+++ b/common/autoconf/build-aux/config.guess
@@ -48,6 +48,9 @@
# Test and fix cygwin on x86_64
echo $OUT | grep 86-pc-cygwin > /dev/null 2> /dev/null
+if test $? != 0; then
+ echo $OUT | grep 86-pc-mingw > /dev/null 2> /dev/null
+fi
if test $? = 0; then
case `echo $PROCESSOR_IDENTIFIER | cut -f1 -d' '` in
intel64|Intel64|INTEL64|em64t|EM64T|amd64|AMD64|8664|x86_64)
diff --git a/common/autoconf/build-performance.m4 b/common/autoconf/build-performance.m4
index 5ad5837..0838e86 100644
--- a/common/autoconf/build-performance.m4
+++ b/common/autoconf/build-performance.m4
@@ -41,6 +41,10 @@
# Looks like a MacOSX system
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'`
FOUND_CORES=yes
+ elif test -n "$NUMBER_OF_PROCESSORS"; then
+ # On windows, look in the env
+ NUM_CORES=$NUMBER_OF_PROCESSORS
+ FOUND_CORES=yes
fi
# For c/c++ code we run twice as many concurrent build
@@ -50,7 +54,8 @@
if test "x$FOUND_CORES" = xyes; then
AC_MSG_RESULT([$NUM_CORES])
else
- AC_MSG_RESULT([could not detect number of cores, defaulting to 1!])
+ AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
+ AC_MSG_WARN([This will disable all parallelism from build!])
fi
])
@@ -76,16 +81,18 @@
MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'`
MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
FOUND_MEM=yes
- elif test "x$build_os" = xwindows; then
+ elif test "x$OPENJDK_BUILD_OS" = xwindows; then
# Windows, but without cygwin
- MEMORY_SIZE=`systeminfo | grep 'Total Physical Memory:' | awk '{ print [$]4 }' | sed 's/,//'`
+ MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
FOUND_MEM=yes
fi
if test "x$FOUND_MEM" = xyes; then
AC_MSG_RESULT([$MEMORY_SIZE MB])
else
- AC_MSG_RESULT([could not detect memory size defaulting to 1024 MB!])
+ AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB])
+ AC_MSG_WARN([This might seriously impact build performance!])
fi
])
@@ -123,7 +130,7 @@
[
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--disable-ccache],
- [use ccache to speed up recompilations @<:@enabled@:>@])],
+ [disable using ccache to speed up recompilations @<:@enabled@:>@])],
[ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes])
if test "x$ENABLE_CCACHE" = xyes; then
AC_PATH_PROG(CCACHE, ccache)
@@ -196,7 +203,7 @@
# Can the C/C++ compiler use precompiled headers?
#
AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
- [use precompiled headers when compiling C++ @<:@enabled@:>@])],
+ [disable using precompiled headers when compiling C++ @<:@enabled@:>@])],
[ENABLE_PRECOMPH=${enable_precompiled-headers}], [ENABLE_PRECOMPH=yes])
USE_PRECOMPILED_HEADER=1
@@ -228,8 +235,7 @@
AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
[
AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
- [use this java binary for running the sjavac background server and other long running java tasks in the build process,
- e.g. ---with-sjavac-server-java="/opt/jrockit/bin/java -server"])])
+ [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
if test "x$with_sjavac_server_java" != x; then
SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
diff --git a/common/autoconf/builddeps.m4 b/common/autoconf/builddeps.m4
index 661001d..207be33 100644
--- a/common/autoconf/builddeps.m4
+++ b/common/autoconf/builddeps.m4
@@ -235,26 +235,13 @@
[use this configuration file for the builddeps])])
AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
- [download and use build dependencies from this server url, e.g. --with-builddeps-server=ftp://example.com/dir])])
+ [download and use build dependencies from this server url])])
AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
- [store downloaded build dependencies here @<:@d/localhome/builddeps@:>@])],
+ [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])],
[],
[with_builddeps_dir=/localhome/builddeps])
AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
[chgrp the downloaded build dependencies to this group])])
-
-AC_ARG_ENABLE([list-builddeps], [AS_HELP_STRING([--enable-list-builddeps],
- [list all build dependencies known to the configure script])],
- [LIST_BUILDDEPS="${enableval}"], [LIST_BUILDDEPS='no'])
-
-if test "x$LIST_BUILDDEPS" = xyes; then
- echo
- echo List of build dependencies known to the configure script,
- echo that can be used in builddeps.conf files:
- cat $AUTOCONF_DIR/*.ac $AUTOCONF_DIR/*.m4 | grep BDEPS_CHECK_MODUL[E]\( | cut -f 2 -d ',' | tr -d ' ' | sort
- echo
- exit 1
-fi
])
diff --git a/common/autoconf/closed.version.numbers b/common/autoconf/closed.version.numbers
index b119cd9..b22ad97 100644
--- a/common/autoconf/closed.version.numbers
+++ b/common/autoconf/closed.version.numbers
@@ -26,3 +26,7 @@
PRODUCT_SUFFIX="SE Runtime Environment"
JDK_RC_PLATFORM_NAME="Platform SE"
COMPANY_NAME="Oracle Corporation"
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="Java SE"
+MACOSX_BUNDLE_ID_BASE="com.oracle.java"
diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in
index 25c8c7e..53d60b7 100644
--- a/common/autoconf/compare.sh.in
+++ b/common/autoconf/compare.sh.in
@@ -40,12 +40,12 @@
CP="@CP@"
CUT="@CUT@"
DIFF="@DIFF@"
-DUMPBIN="@UNCYGDRIVE@ @DUMPBIN@"
+DUMPBIN="@FIXPATH@ @DUMPBIN@"
EXPR="@EXPR@"
FILE="@FILE@"
FIND="@FIND@"
GREP="@GREP@"
-JAVAP="@UNCYGDRIVE@ @BOOT_JDK@/bin/javap"
+JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
LDD="@LDD@"
MKDIR="@MKDIR@"
NM="@NM@"
@@ -56,6 +56,7 @@
RM="@RM@"
SED="@SED@"
SORT="@SORT@"
+STAT="@STAT@"
STRIP="@POST_STRIP_CMD@"
TEE="@TEE@"
UNIQ="@UNIQ@"
@@ -63,1607 +64,15 @@
SRC_ROOT="@SRC_ROOT@"
-if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
- READELF_CMD="otool -v -V -h -X -t -d"
-elif [ -n "$READELF" ] && [ "$OPENJDK_TARGET_OS" != "windows" ]; then
- READELF_CMD="$READELF -a"
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
- LDD_CMD="$OTOOL -L"
-elif [ -n "$LDD" ]; then
- LDD_CMD="$LDD"
-fi
-
-##########################################################################################
-# Diff exceptions
-
-if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-STRIP_BEFORE_COMPARE="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-"
-
-KNOWN_BIN_DIFF="
-"
-
-ACCEPTED_BIN_DIFF="
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/amd64/libattach.so
-./jre/lib/amd64/libdt_socket.so
-./jre/lib/amd64/libhprof.so
-./jre/lib/amd64/libinstrument.so
-./jre/lib/amd64/libjava_crw_demo.so
-./jre/lib/amd64/libjsdt.so
-./jre/lib/amd64/libjsig.so
-./jre/lib/amd64/libmanagement.so
-./jre/lib/amd64/libnpt.so
-./jre/lib/amd64/libsaproc.so
-./jre/lib/amd64/libverify.so
-./jre/lib/amd64/server/libjsig.so
-./jre/lib/amd64/server/libjvm.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-"
-
-KNOWN_SIZE_DIFF="
-"
-
-KNOWN_SYM_DIFF="
-"
-
-KNOWN_ELF_DIFF="
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/waiters/lib/libwaiters.so
-"
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/i386/jexec
-"
-
-SORT_SYMBOLS="
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/server/libjvm.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/libgctest.so
-./demo/jvmti/heapTracker/lib/libheapTracker.so
-./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
-./demo/jvmti/minst/lib/libminst.so
-./demo/jvmti/mtrace/lib/libmtrace.so
-./demo/jvmti/versionCheck/lib/libversionCheck.so
-./demo/jvmti/waiters/lib/libwaiters.so
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/jli/libjli.so
-./jre/lib/i386/libJdbcOdbc.so
-./jre/lib/i386/libattach.so
-./jre/lib/i386/libawt.so
-./jre/lib/i386/libawt_headless.so
-./jre/lib/i386/libawt_xawt.so
-./jre/lib/i386/libdcpr.so
-./jre/lib/i386/libdt_socket.so
-./jre/lib/i386/libfontmanager.so
-./jre/lib/i386/libhprof.so
-./jre/lib/i386/libinstrument.so
-./jre/lib/i386/libj2gss.so
-./jre/lib/i386/libj2pcsc.so
-./jre/lib/i386/libj2pkcs11.so
-./jre/lib/i386/libj2ucrypto.so
-./jre/lib/i386/libjaas_unix.so
-./jre/lib/i386/libjava.so
-./jre/lib/i386/libjava_crw_demo.so
-./jre/lib/i386/libjawt.so
-./jre/lib/i386/libjdwp.so
-./jre/lib/i386/libjfr.so
-./jre/lib/i386/libjpeg.so
-./jre/lib/i386/libjsdt.so
-./jre/lib/i386/libjsound.so
-./jre/lib/i386/libkcms.so
-./jre/lib/i386/libmanagement.so
-./jre/lib/i386/libmlib_image.so
-./jre/lib/i386/libnet.so
-./jre/lib/i386/libnio.so
-./jre/lib/i386/libnpt.so
-./jre/lib/i386/libsctp.so
-./jre/lib/i386/libsplashscreen.so
-./jre/lib/i386/libsunec.so
-./jre/lib/i386/libsunwjdga.so
-./jre/lib/i386/libt2k.so
-./jre/lib/i386/libunpack.so
-./jre/lib/i386/libverify.so
-./jre/lib/i386/libzip.so
-./jre/lib/i386/server/libjvm.so
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/unpack200
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-./jre/bin/unpack200
-./jre/lib/i386/jexec
-"
-
-SKIP_ELF_DIFF="true"
-
-# libjvm.so differs in the random 15 char prefix on some symbols.
-ACCEPTED_DIS_DIFF="
-./jre/lib/i386/client/libjvm.so
-./jre/lib/i386/server/libjvm.so
-"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-
-STRIP_BEFORE_COMPARE="
-./demo/jni/Poller/lib/amd64/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/amd64/libgctest.so
-./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
-./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
-./demo/jvmti/hprof/lib/amd64/libhprof.so
-./demo/jvmti/minst/lib/amd64/libminst.so
-./demo/jvmti/mtrace/lib/amd64/libmtrace.so
-./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
-./demo/jvmti/waiters/lib/amd64/libwaiters.so
-"
-
-SORT_SYMBOLS="
-./jre/lib/amd64/server/libjvm.so
-"
-
-SKIP_BIN_DIFF="true"
-
-ACCEPTED_SMALL_SIZE_DIFF="
-./demo/jni/Poller/lib/amd64/libPoller.so
-./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
-./demo/jvmti/gctest/lib/amd64/libgctest.so
-./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
-./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
-./demo/jvmti/hprof/lib/amd64/libhprof.so
-./demo/jvmti/minst/lib/amd64/libminst.so
-./demo/jvmti/mtrace/lib/amd64/libmtrace.so
-./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
-./demo/jvmti/waiters/lib/amd64/libwaiters.so
-./jre/lib/amd64/jli/libjli.so
-./jre/lib/amd64/libJdbcOdbc.so
-./jre/lib/amd64/libattach.so
-./jre/lib/amd64/libawt.so
-./jre/lib/amd64/libawt_headless.so
-./jre/lib/amd64/libawt_xawt.so
-./jre/lib/amd64/libdcpr.so
-./jre/lib/amd64/libdt_socket.so
-./jre/lib/amd64/libfontmanager.so
-./jre/lib/amd64/libhprof.so
-./jre/lib/amd64/libinstrument.so
-./jre/lib/amd64/libj2gss.so
-./jre/lib/amd64/libj2pcsc.so
-./jre/lib/amd64/libj2pkcs11.so
-./jre/lib/amd64/libj2ucrypto.so
-./jre/lib/amd64/libjaas_unix.so
-./jre/lib/amd64/libjava.so
-./jre/lib/amd64/libjava_crw_demo.so
-./jre/lib/amd64/libjawt.so
-./jre/lib/amd64/libjdwp.so
-./jre/lib/amd64/libjfr.so
-./jre/lib/amd64/libjpeg.so
-./jre/lib/amd64/libjsdt.so
-./jre/lib/amd64/libjsound.so
-./jre/lib/amd64/libkcms.so
-./jre/lib/amd64/libmanagement.so
-./jre/lib/amd64/libmlib_image.so
-./jre/lib/amd64/libnet.so
-./jre/lib/amd64/libnio.so
-./jre/lib/amd64/libnpt.so
-./jre/lib/amd64/libsctp.so
-./jre/lib/amd64/libsplashscreen.so
-./jre/lib/amd64/libsunec.so
-./jre/lib/amd64/libsunwjdga.so
-./jre/lib/amd64/libt2k.so
-./jre/lib/amd64/libunpack.so
-./jre/lib/amd64/libverify.so
-./jre/lib/amd64/libzip.so
-./jre/lib/amd64/server/64/libjvm_db.so
-./jre/lib/amd64/server/64/libjvm_dtrace.so
-./bin/amd64/appletviewer
-./bin/amd64/extcheck
-./bin/amd64/idlj
-./bin/amd64/jar
-./bin/amd64/jarsigner
-./bin/amd64/java
-./bin/amd64/javac
-./bin/amd64/javadoc
-./bin/amd64/javah
-./bin/amd64/javap
-./bin/amd64/jcmd
-./bin/amd64/jconsole
-./bin/amd64/jdb
-./bin/amd64/jhat
-./bin/amd64/jinfo
-./bin/amd64/jmap
-./bin/amd64/jps
-./bin/amd64/jrunscript
-./bin/amd64/jsadebugd
-./bin/amd64/jstack
-./bin/amd64/jstat
-./bin/amd64/jstatd
-./bin/amd64/keytool
-./bin/amd64/native2ascii
-./bin/amd64/orbd
-./bin/amd64/pack200
-./bin/amd64/policytool
-./bin/amd64/rmic
-./bin/amd64/rmid
-./bin/amd64/rmiregistry
-./bin/amd64/schemagen
-./bin/amd64/serialver
-./bin/amd64/servertool
-./bin/amd64/tnameserv
-./bin/amd64/unpack200
-./bin/amd64/wsgen
-./bin/amd64/wsimport
-./bin/amd64/xjc
-./jre/bin/amd64/java
-./jre/bin/amd64/keytool
-./jre/bin/amd64/orbd
-./jre/bin/amd64/pack200
-./jre/bin/amd64/policytool
-./jre/bin/amd64/rmid
-./jre/bin/amd64/rmiregistry
-./jre/bin/amd64/servertool
-./jre/bin/amd64/tnameserv
-./jre/bin/amd64/unpack200
-./jre/lib/amd64/jexec
-"
-
-SKIP_ELF_DIFF="true"
-
-# Can't find an explaination for the diff in libmlib_image.so.
-KNOWN_DIS_DIFF="
-./jre/lib/amd64/libmlib_image.so
-"
-# libjvm.so differs in the random 15 char prefix on some symbols.
-ACCEPTED_DIS_DIFF="
-./jre/lib/amd64/server/libjvm.so
-"
-
-fi
-
-if [ "$OPENJDK_TARGET_OS" = "windows" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-
-ACCEPTED_BIN_DIFF="
-./bin/jli.dll
-./demo/jvmti/compiledMethodLoad/lib/compiledMethodLoad.dll
-./demo/jvmti/gctest/lib/gctest.dll
-./demo/jvmti/heapTracker/lib/heapTracker.dll
-./demo/jvmti/heapViewer/lib/heapViewer.dll
-./demo/jvmti/hprof/lib/hprof.dll
-./demo/jvmti/minst/lib/minst.dll
-./demo/jvmti/mtrace/lib/mtrace.dll
-./demo/jvmti/versionCheck/lib/versionCheck.dll
-./demo/jvmti/waiters/lib/waiters.dll
-./jre/bin/attach.dll
-./jre/bin/awt.dll
-./jre/bin/dcpr.dll
-./jre/bin/dt_shmem.dll
-./jre/bin/dt_socket.dll
-./jre/bin/fontmanager.dll
-./jre/bin/hprof.dll
-./jre/bin/instrument.dll
-./jre/bin/j2pcsc.dll
-./jre/bin/j2pkcs11.dll
-./jre/bin/jaas_nt.dll
-./jre/bin/java.dll
-./jre/bin/java_crw_demo.dll
-./jre/bin/jawt.dll
-./jre/bin/JdbcOdbc.dll
-./jre/bin/jdwp.dll
-./jre/bin/jfr.dll
-./jre/bin/jli.dll
-./jre/bin/jpeg.dll
-./jre/bin/jsdt.dll
-./jre/bin/jsound.dll
-./jre/bin/jsoundds.dll
-./jre/bin/kcms.dll
-./jre/bin/management.dll
-./jre/bin/mlib_image.dll
-./jre/bin/net.dll
-./jre/bin/nio.dll
-./jre/bin/npt.dll
-./jre/bin/sawindbg.dll
-./jre/bin/server/jvm.dll
-./jre/bin/splashscreen.dll
-./jre/bin/sunec.dll
-./jre/bin/sunmscapi.dll
-./jre/bin/t2k.dll
-./jre/bin/unpack.dll
-./jre/bin/verify.dll
-./jre/bin/w2k_lsa_auth.dll
-./jre/bin/zip.dll
-./bin/appletviewer.exe
-./bin/extcheck.exe
-./bin/idlj.exe
-./bin/jar.exe
-./bin/jarsigner.exe
-./bin/java.exe
-./bin/javac.exe
-./bin/javadoc.exe
-./bin/javah.exe
-./bin/javap.exe
-./bin/java-rmi.exe
-./bin/javaw.exe
-./bin/jcmd.exe
-./bin/jconsole.exe
-./bin/jdb.exe
-./bin/jhat.exe
-./bin/jinfo.exe
-./bin/jmap.exe
-./bin/jps.exe
-./bin/jrunscript.exe
-./bin/jsadebugd.exe
-./bin/jstack.exe
-./bin/jstat.exe
-./bin/jstatd.exe
-./bin/keytool.exe
-./bin/kinit.exe
-./bin/klist.exe
-./bin/ktab.exe
-./bin/native2ascii.exe
-./bin/orbd.exe
-./bin/pack200.exe
-./bin/policytool.exe
-./bin/rmic.exe
-./bin/rmid.exe
-./bin/rmiregistry.exe
-./bin/schemagen.exe
-./bin/serialver.exe
-./bin/servertool.exe
-./bin/tnameserv.exe
-./bin/unpack200.exe
-./bin/wsgen.exe
-./bin/wsimport.exe
-./bin/xjc.exe
-./jre/bin/java.exe
-./jre/bin/java-rmi.exe
-./jre/bin/javaw.exe
-./jre/bin/keytool.exe
-./jre/bin/kinit.exe
-./jre/bin/klist.exe
-./jre/bin/ktab.exe
-./jre/bin/orbd.exe
-./jre/bin/pack200.exe
-./jre/bin/policytool.exe
-./jre/bin/rmid.exe
-./jre/bin/rmiregistry.exe
-./jre/bin/servertool.exe
-./jre/bin/tnameserv.exe
-./jre/bin/unpack200.exe
-"
-
-KNOWN_SIZE_DIFF="
-./demo/jvmti/heapTracker/lib/heapTracker.dll
-./demo/jvmti/minst/lib/minst.dll
-./jre/bin/awt.dll
-./jre/bin/java_crw_demo.dll
-./bin/java.exe
-./bin/javaw.exe
-./bin/unpack200.exe
-./jre/bin/java.exe
-./jre/bin/javaw.exe
-./jre/bin/unpack200.exe
-"
-
-KNOWN_SYM_DIFF="
-./jre/bin/awt.dll
-./jre/bin/java_crw_demo.dll
-"
-fi
-
-
-
-if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
-ACCEPTED_JARZIP_CONTENTS="
-/META-INF/INDEX.LIST
-"
-
-KNOWN_BIN_DIFF="
-./jre/lib/libJObjC.dylib
-./jre/lib/libsaproc.dylib
-./jre/lib/server/libjvm.dylib
-"
-
-ACCEPTED_BIN_DIFF="
-./bin/appletviewer
-./bin/extcheck
-./bin/idlj
-./bin/jar
-./bin/jarsigner
-./bin/java
-./bin/javac
-./bin/javadoc
-./bin/javah
-./bin/javap
-./bin/jcmd
-./bin/jconsole
-./bin/jdb
-./bin/jhat
-./bin/jinfo
-./bin/jmap
-./bin/jps
-./bin/jrunscript
-./bin/jsadebugd
-./bin/jstack
-./bin/jstat
-./bin/jstatd
-./bin/keytool
-./bin/native2ascii
-./bin/orbd
-./bin/pack200
-./bin/policytool
-./bin/rmic
-./bin/rmid
-./bin/rmiregistry
-./bin/schemagen
-./bin/serialver
-./bin/servertool
-./bin/tnameserv
-./bin/wsgen
-./bin/wsimport
-./bin/xjc
-./jre/bin/java
-./jre/bin/keytool
-./jre/bin/orbd
-./jre/bin/pack200
-./jre/bin/policytool
-./jre/bin/rmid
-./jre/bin/rmiregistry
-./jre/bin/servertool
-./jre/bin/tnameserv
-"
-
-KNOWN_SIZE_DIFF="
-./jre/lib/libJObjC.dylib
-./jre/lib/server/libjvm.dylib
-"
-
-KNOWN_SYM_DIFF="
-./jre/lib/libJObjC.dylib
-./jre/lib/server/libjvm.dylib
-"
-
-KNOWN_ELF_DIFF="
-./jre/lib/libJObjC.dylib
-./jre/lib/server/libjvm.dylib
-"
-
-SKIP_DIS_DIFF="true"
-
-fi
-
-##########################################################################################
-# Compare text files and ignore specific differences:
-#
-# * Timestamps in Java sources generated by idl2java
-# * Sorting order and cleanup style in .properties files
-
-diff_text() {
- OTHER_FILE=$1
- THIS_FILE=$2
-
- SUFFIX="${THIS_FILE##*.}"
-
- TMP=1
-
- if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
- TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
- $GREP '^[<>]' | \
- $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
- -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
- fi
- if test "x$SUFFIX" = "xjava"; then
- TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
- $GREP '^[<>]' | \
- $SED -e '/[<>] \* from.*\.idl/d' \
- -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
- -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
- -e '/\/\/ Generated from input file.*/d' \
- -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
- -e '/\/\/ java GenerateCharacter.*/d')
- fi
- # Ignore date strings in class files.
- # On Macosx the system sources for generated java classes produce different output on
- # consequtive invokations seemingly randomly.
- # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
- if test "x$SUFFIX" = "xclass"; then
- $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
- $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
- TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
- $GREP '^[<>]' | \
- $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
- -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
- -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
- -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
- fi
- if test "x$SUFFIX" = "xproperties"; then
- $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
- | $SED -f "$SRC_ROOT/common/bin/unicode2x.sed" \
- | $SED -e '/^#/d' -e '/^$/d' \
- -e :a -e '/\\$/N; s/\\\n//; ta' \
- -e 's/^[ \t]*//;s/[ \t]*$//' \
- -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
- TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
- fi
- if test -n "$TMP"; then
- echo Files $OTHER_FILE and $THIS_FILE differ
- return 1
- fi
-
- return 0
-}
-
-##########################################################################################
-# Compare directory structure
-
-compare_dirs() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- mkdir -p $WORK_DIR
-
- (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/other_dirs)
- (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/this_dirs)
-
- echo -n Directory structure...
- if $DIFF $WORK_DIR/other_dirs $WORK_DIR/this_dirs > /dev/null; then
- echo Identical!
- else
- echo Differences found.
- REGRESSIONS=true
- # Differences in directories found.
- ONLY_OTHER=$($DIFF $WORK_DIR/other_dirs $WORK_DIR/this_dirs | $GREP '<')
- if [ "$ONLY_OTHER" ]; then
- echo Only in $OTHER
- echo $ONLY_OTHER | $SED 's|< ./|\t|g' | $SED 's/ /\n/g'
- fi
- # Differences in directories found.
- ONLY_THIS=$($DIFF $WORK_DIR/other_dirs $WORK_DIR/this_dirs | $GREP '>')
- if [ "$ONLY_THIS" ]; then
- echo Only in $THIS
- echo $ONLY_THIS | $SED 's|> ./|\t|g' | $SED 's/ /\n/g'
- fi
- fi
-}
-
-
-##########################################################################################
-# Compare file structure
-
-compare_files() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- mkdir -p $WORK_DIR
-
- (cd $OTHER_DIR && $FIND . -type f | $SORT > $WORK_DIR/other_files)
- (cd $THIS_DIR && $FIND . -type f | $SORT > $WORK_DIR/this_files)
-
- echo -n File names...
- if diff $WORK_DIR/other_files $WORK_DIR/this_files > /dev/null; then
- echo Identical!
- else
- echo Differences found.
- REGRESSIONS=true
- # Differences in directories found.
- ONLY_OTHER=$(diff $WORK_DIR/other_files $WORK_DIR/this_files | $GREP '<')
- if [ "$ONLY_OTHER" ]; then
- echo Only in $OTHER
- echo "$ONLY_OTHER" | sed 's|< ./| |g'
- fi
- # Differences in directories found.
- ONLY_THIS=$(diff $WORK_DIR/other_files $WORK_DIR/this_files | $GREP '>')
- if [ "$ONLY_THIS" ]; then
- echo Only in $THIS
- echo "$ONLY_THIS" | sed 's|> ./| |g'
- fi
- fi
-}
-
-
-##########################################################################################
-# Compare permissions
-
-compare_permissions() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- mkdir -p $WORK_DIR
-
- echo -n Permissions...
- found=""
- for f in `cd $OTHER_DIR && $FIND . -type f`
- do
- if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
- if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
- OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
- TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
- if [ "$OP" != "$TP" ]
- then
- if [ -z "$found" ]; then echo ; found="yes"; fi
- $PRINTF "\told: ${OP} new: ${TP}\t$f\n"
- fi
- done
- if [ -z "$found" ]; then
- echo "Identical!"
- else
- REGRESSIONS=true
- fi
-}
-
-##########################################################################################
-# Compare file command output
-
-compare_file_types() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- $MKDIR -p $WORK_DIR
-
- echo -n File types...
- found=""
- for f in `cd $OTHER_DIR && $FIND . -type f`
- do
- if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
- if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
- OF=`cd ${OTHER_DIR} && $FILE $f`
- TF=`cd ${THIS_DIR} && $FILE $f`
- if [ "$f" = "./src.zip" ] || [ "$f" = "./jre/lib/JObjC.jar" ] || [ "$f" = "./lib/JObjC.jar" ]
- then
- if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
- then
- # the way we produces zip-files make it so that directories are stored in old file
- # but not in new (only files with full-path)
- # this makes file-5.09 report them as different
- continue;
- fi
- fi
-
- if [ "$OF" != "$TF" ]
- then
- if [ -z "$found" ]; then echo ; found="yes"; fi
- $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
- fi
- done
- if [ -z "$found" ]; then
- echo "Identical!"
- else
- REGRESSIONS=true
- fi
-}
-
-##########################################################################################
-# Compare the rest of the files
-
-compare_general_files() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
- ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
- ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
- ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
- ! -name "*.lib" \
- | $GREP -v "./bin/" | $SORT | $FILTER)
-
- echo General files...
- for f in $GENERAL_FILES
- do
- if [ -e $OTHER_DIR/$f ]; then
- DIFF_OUT=$($DIFF $OTHER_DIR/$f $THIS_DIR/$f 2>&1)
- if [ -n "$DIFF_OUT" ]; then
- echo $f
- REGRESSIONS=true
- if [ "$SHOW_DIFFS" = "true" ]; then
- echo "$DIFF_OUT"
- fi
- fi
- fi
- done
-
-
-}
-
-##########################################################################################
-# Compare zip file
-
-compare_zip_file() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
- ZIP_FILE=$4
-
- THIS_ZIP=$THIS_DIR/$ZIP_FILE
- OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
-
- THIS_SUFFIX="${THIS_ZIP##*.}"
- OTHER_SUFFIX="${OTHER_ZIP##*.}"
- if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
- echo The files do not have the same suffix type!
- return 2
- fi
-
- UNARCHIVE="$UNZIP -q"
-
- TYPE="$THIS_SUFFIX"
-
- if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
- then
- return 0
- fi
- # Not quite identical, the might still contain the same data.
- # Unpack the jar/zip files in temp dirs
-
- THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
- OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
- $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
- $MKDIR -p $THIS_UNZIPDIR
- $MKDIR -p $OTHER_UNZIPDIR
- (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
- (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
-
- CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
- LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
-
- ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
- ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
-
- return_value=0
-
- if [ -n "$ONLY_OTHER" ]; then
- echo " Only OTHER $ZIP_FILE contains:"
- echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g'
- return_value=1
- fi
-
- if [ -n "$ONLY_THIS" ]; then
- echo " Only THIS $ZIP_FILE contains:"
- echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g'
- return_value=1
- fi
-
- DIFFING_FILES=$($GREP differ $CONTENTS_DIFF_FILE | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
-
- $RM -f $WORK_DIR/$ZIP_FILE.diffs
- for file in $DIFFING_FILES; do
- if [[ "$ACCEPTED_JARZIP_CONTENTS" != *"$file"* ]]; then
- diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
- fi
- done
-
- if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
- return_value=1
- echo " Differing files in $ZIP_FILE"
- $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \
- $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist
- $CAT $WORK_DIR/$ZIP_FILE.difflist
-
- if [ -n "$SHOW_DIFFS" ]; then
- for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
- if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
- LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
- elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
- LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
- else
- LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
- fi
- done
- fi
- fi
-
- return $return_value
-}
-
-
-##########################################################################################
-# Compare all zip files
-
-compare_all_zip_files() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
-
- if [ -n "$ZIPS" ]; then
- echo Zip files...
-
- return_value=0
- for f in $ZIPS; do
- if [ -f "$OTHER_DIR/$f" ]; then
- compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
- if [ "$?" != "0" ]; then
- return_value=1
- REGRESSIONS=true
- fi
- fi
- done
- fi
-
- return $return_value
-}
-
-##########################################################################################
-# Compare all jar files
-
-compare_all_jar_files() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- # TODO filter?
- ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" | $SORT | $FILTER)
-
- if [ -n "$ZIPS" ]; then
- echo Jar files...
-
- return_value=0
- for f in $ZIPS; do
- if [ -f "$OTHER_DIR/$f" ]; then
- compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
- if [ "$?" != "0" ]; then
- return_value=1
- REGRESSIONS=true
- fi
- fi
- done
- fi
-
- return $return_value
-}
-
-##########################################################################################
-# Compare binary (executable/library) file
-
-compare_bin_file() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
- BIN_FILE=$4
-
- THIS_FILE=$THIS_DIR/$BIN_FILE
- OTHER_FILE=$OTHER_DIR/$BIN_FILE
- NAME=$(basename $BIN_FILE)
- WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
- FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
-
- $MKDIR -p $FILE_WORK_DIR
-
- ORIG_THIS_FILE="$THIS_FILE"
- ORIG_OTHER_FILE="$OTHER_FILE"
-
- if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
- THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
- OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
- $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
- $CP $THIS_FILE $THIS_STRIPPED_FILE
- $CP $OTHER_FILE $OTHER_STRIPPED_FILE
- $STRIP $THIS_STRIPPED_FILE
- $STRIP $OTHER_STRIPPED_FILE
- THIS_FILE="$THIS_STRIPPED_FILE"
- OTHER_FILE="$OTHER_STRIPPED_FILE"
- fi
-
- if [ -z "$SKIP_BIN_DIFF" ]; then
- if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
- # The files were bytewise identical.
- if [ -n "$VERBOSE" ]; then
- echo " : : : : : $BIN_FILE"
- fi
- return 0
- fi
- BIN_MSG=" diff "
- if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_BIN=true
- if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
- BIN_MSG="*$BIN_MSG*"
- REGRESSIONS=true
- else
- BIN_MSG=" $BIN_MSG "
- fi
- else
- BIN_MSG="($BIN_MSG)"
- DIFF_BIN=
- fi
- fi
-
- THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
- OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
- if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
- DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
- DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
- SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
- if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then
- SIZE_MSG="($SIZE_MSG)"
- DIFF_SIZE=
- else
- if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_SIZE=true
- if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
- SIZE_MSG="*$SIZE_MSG*"
- REGRESSIONS=true
- else
- SIZE_MSG=" $SIZE_MSG "
- fi
- else
- SIZE_MSG="($SIZE_MSG)"
- DIFF_SIZE=
- fi
- fi
- else
- SIZE_MSG=" "
- DIFF_SIZE=
- if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
- SIZE_MSG=" ! "
- fi
- fi
-
- if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
- SYM_SORT_CMD="sort"
- else
- SYM_SORT_CMD="cat"
- fi
-
- # Check symbols
- if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
- $DUMPBIN -exports $OTHER_FILE | $GREP " = " | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
- $DUMPBIN -exports $THIS_FILE | $GREP " = " | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
- elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
- # Some symbols get seemingly random 15 character prefixes. Filter them out.
- $NM -a $ORIG_OTHER_FILE | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] \.\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
- $NM -a $ORIG_THIS_FILE | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] \.\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
- else
- $NM -a $ORIG_OTHER_FILE | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
- $NM -a $ORIG_THIS_FILE | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
- fi
-
- LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
- if [ -s $WORK_FILE_BASE.symbols.diff ]; then
- SYM_MSG=" diff "
- if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_SYM=true
- if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
- SYM_MSG="*$SYM_MSG*"
- REGRESSIONS=true
- else
- SYM_MSG=" $SYM_MSG "
- fi
- else
- SYM_MSG="($SYM_MSG)"
- DIFF_SYM=
- fi
- else
- SYM_MSG=" "
- DIFF_SYM=
- if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
- SYM_MSG=" ! "
- fi
- fi
-
- # Check dependencies
- if [ -n "$LDD_CMD" ];then
- (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
- (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
- (cd $FILE_WORK_DIR && $RM -f $NAME)
-
- LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
- LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
-
- if [ -s $WORK_FILE_BASE.deps.diff ]; then
- if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
- DEP_MSG=" diff "
- else
- DEP_MSG=" redun "
- fi
- if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_DEP=true
- if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
- DEP_MSG="*$DEP_MSG*"
- REGRESSIONS=true
- else
- DEP_MSG=" $DEP_MSG "
- fi
- else
- DEP_MSG="($DEP_MSG)"
- DIFF_DEP=
- fi
- else
- DEP_MSG=" "
- DIFF_DEP=
- if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
- DEP_MSG=" ! "
- fi
- fi
- fi
-
- # Compare readelf output
- if [ -n "$READELF_CMD" ] && [ -z "$SKIP_ELF_DIFF" ]; then
- $READELF_CMD $OTHER_FILE > $WORK_FILE_BASE.readelf.other 2>&1
- $READELF_CMD $THIS_FILE > $WORK_FILE_BASE.readelf.this 2>&1
-
- LANG=C $DIFF $WORK_FILE_BASE.readelf.other $WORK_FILE_BASE.readelf.this > $WORK_FILE_BASE.readelf.diff
-
- if [ -s $WORK_FILE_BASE.readelf.diff ]; then
- ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.readelf.diff | awk '{print $5}')
- ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
- if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_ELF=true
- if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
- ELF_MSG="*$ELF_MSG*"
- REGRESSIONS=true
- else
- ELF_MSG=" $ELF_MSG "
- fi
- else
- ELF_MSG="($ELF_MSG)"
- DIFF_ELF=
- fi
- else
- ELF_MSG=" "
- DIFF_ELF=
- if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
- ELF_MSG=" ! "
- fi
- fi
- fi
-
- # Compare disassemble output
- if [ -f "$OBJDUMP" ] && [ -z "$SKIP_DIS_DIFF" ]; then
- $OBJDUMP -d $OTHER_FILE | $GREP -v $NAME > $WORK_FILE_BASE.dis.other 2>&1
- $OBJDUMP -d $THIS_FILE | $GREP -v $NAME > $WORK_FILE_BASE.dis.this 2>&1
-
- LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
-
- if [ -s $WORK_FILE_BASE.dis.diff ]; then
- DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
- DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
- if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
- DIFF_DIS=true
- if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
- DIS_MSG="*$DIS_MSG*"
- REGRESSIONS=true
- else
- DIS_MSG=" $DIS_MSG "
- fi
- else
- DIS_MSG="($DIS_MSG)"
- DIFF_DIS=
- fi
- else
- DIS_MSG=" "
- DIFF_DIS=
- if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
- DIS_MSG=" ! "
- fi
- fi
- fi
-
-
- if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
- if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
- if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
- if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
- if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
- if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi
- if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
- echo " $BIN_FILE"
- if [ "$SHOW_DIFFS" = "true" ]; then
- if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
- echo "Symbols diff:"
- $CAT $WORK_FILE_BASE.symbols.diff
- fi
- if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
- echo "Deps diff:"
- $CAT $WORK_FILE_BASE.deps.diff
- fi
- if [ -s "$WORK_FILE_BASE.readelf.diff" ]; then
- echo "Readelf diff:"
- $CAT $WORK_FILE_BASE.readelf.diff
- fi
- if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
- echo "Disassembly diff:"
- $CAT $WORK_FILE_BASE.dis.diff
- fi
- fi
- return 1
- fi
- return 0
-}
-
-##########################################################################################
-# Print binary diff header
-
-print_binary_diff_header() {
- if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
- if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi
- if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
- if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi
- if [ -z "$SKIP_ELF_DIFF" ]; then echo -n " Readelf :"; fi
- if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi
- echo
-}
-
-##########################################################################################
-# Compare all libraries
-
-compare_all_libs() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- LIBS=$(cd $THIS_DIR && $FIND . -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' | $SORT | $FILTER)
-
- if [ -n "$LIBS" ]; then
- echo Libraries...
- print_binary_diff_header
- for l in $LIBS; do
- if [ -f "$OTHER_DIR/$l" ]; then
- compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
- if [ "$?" != "0" ]; then
- return_value=1
- fi
- fi
- done
- fi
-
- return $return_value
-}
-
-##########################################################################################
-# Compare all executables
-
-compare_all_execs() {
- THIS_DIR=$1
- OTHER_DIR=$2
- WORK_DIR=$3
-
- if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
- EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
- else
- EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \) | $SORT | $FILTER)
- fi
-
- if [ -n "$EXECS" ]; then
- echo Executables...
- print_binary_diff_header
- for e in $EXECS; do
- if [ -f "$OTHER_DIR/$e" ]; then
- compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
- if [ "$?" != "0" ]; then
- return_value=1
- fi
- fi
- done
- fi
-
- return $return_value
-}
-
-##########################################################################################
-# Initiate configuration
-
-COMPARE_ROOT=/tmp/cimages.$USER
-$MKDIR -p $COMPARE_ROOT
if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
- if [ "$(uname -o)" = "Cygwin" ]; then
- COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
- fi
+ PATH="@VS_PATH@"
fi
-THIS="$( cd "$( dirname "$0" )" && pwd )"
-echo "$THIS"
-THIS_SCRIPT="$0"
-
-if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
- echo "bash ./compare.sh [OPTIONS] [FILTER]"
- echo ""
- echo "-all Compare all files in all known ways"
- echo "-names Compare the file names and directory structure"
- echo "-perms Compare the permission bits on all files and directories"
- echo "-types Compare the output of the file command on all files"
- echo "-general Compare the files not convered by the specialized comparisons"
- echo "-zips Compare the contents of all zip files"
- echo "-jars Compare the contents of all jar files"
- echo "-libs Compare all native libraries"
- echo "-execs Compare all executables"
- echo "-v Verbose output, does not hide known differences"
- echo "-vv More verbose output, shows diff output of all comparisons"
- echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory"
- echo ""
- echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
- echo "Example:"
- echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
- exit 10
-fi
-
-CMP_NAMES=false
-CMP_PERMS=false
-CMP_TYPES=false
-CMP_GENERAL=false
-CMP_ZIPS=false
-CMP_JARS=false
-CMP_LIBS=false
-CMP_EXECS=false
-
-while [ -n "$1" ]; do
- case "$1" in
- -v)
- VERBOSE=true
- ;;
- -vv)
- VERBOSE=true
- SHOW_DIFFS=true
- ;;
- -o)
- OTHER=$2
- shift
- ;;
- -all)
- CMP_NAMES=true
- if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
- CMP_PERMS=true
- fi
- CMP_TYPES=true
- CMP_GENERAL=true
- CMP_ZIPS=true
- CMP_JARS=true
- CMP_LIBS=true
- CMP_EXECS=true
- ;;
- -names)
- CMP_NAMES=true
- ;;
- -perms)
- CMP_PERMS=true
- ;;
- -types)
- CMP_TYPES=true
- ;;
- -general)
- CMP_GENERAL=true
- ;;
- -zips)
- CMP_ZIPS=true
- ;;
- -jars)
- CMP_JARS=true
- ;;
- -libs)
- CMP_LIBS=true
- ;;
- -execs)
- CMP_EXECS=true
- ;;
- *)
- CMP_NAMES=false
- CMP_PERMS=false
- CMP_TYPES=false
- CMP_ZIPS=true
- CMP_JARS=true
- CMP_LIBS=true
- CMP_EXECS=true
-
- if [ -z "$FILTER" ]; then
- FILTER="$GREP"
- fi
- FILTER="$FILTER -e $1"
- ;;
- esac
- shift
-done
-
-if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
- CMP_NAMES=true
- CMP_PERMS=true
- CMP_TYPES=true
- CMP_GENERAL=true
- CMP_ZIPS=true
- CMP_JARS=true
- CMP_LIBS=true
- CMP_EXECS=true
-fi
-
-if [ -z "$FILTER" ]; then
- FILTER="$CAT"
-fi
-
-if [ -z "$OTHER" ]; then
- OTHER="$THIS/../$LEGACY_BUILD_DIR"
- if [ -d "$OTHER" ]; then
- OTHER="$( cd "$OTHER" && pwd )"
- else
- echo "Default old build directory does not exist:"
- echo "$OTHER"
- fi
- echo "Comparing to default old build:"
- echo "$OTHER"
- echo
-else
- echo "Comparing to:"
- echo "$OTHER"
- echo
-fi
-
-if [ ! -d "$OTHER" ]; then
- echo "Other build directory does not exist:"
- echo "$OTHER"
- exit 1;
-fi
-
-# Figure out the layout of the new build. Which kinds of images have been produced
-if [ -d "$THIS/images/j2sdk-image" ]; then
- THIS_J2SDK="$THIS/images/j2sdk-image"
- THIS_J2RE="$THIS/images/j2re-image"
-fi
-if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
- THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
- THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
-fi
-
-# Figure out the layout of the other build (old or new, normal or overlay image)
-if [ -d "$OTHER/j2sdk-image" ]; then
- if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
- OTHER_J2SDK="$OTHER/j2sdk-image"
- OTHER_J2RE="$OTHER/j2re-image"
- else
- OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
- OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
- fi
-
-fi
-
-if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
- echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
+# Now locate the main script and run it.
+REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh"
+if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
+ echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
exit 1
fi
-
-##########################################################################################
-# Do the work
-
-if [ "$CMP_NAMES" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- echo -n "J2SDK "
- compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- echo -n "J2RE "
- compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
-
- echo -n "J2SDK "
- compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- echo -n "J2RE "
- compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "J2SDK Overlay "
- compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- echo -n "J2RE Overlay "
- compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
-
- echo -n "J2SDK Overlay "
- compare_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- echo -n "J2RE Overlay "
- compare_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
- fi
-fi
-
-if [ "$CMP_PERMS" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- echo -n "J2SDK "
- compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- echo -n "J2RE "
- compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "J2SDK Overlay "
- compare_permissions $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- echo -n "J2RE Overlay "
- compare_permissions $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
- fi
-fi
-
-if [ "$CMP_TYPES" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- echo -n "J2SDK "
- compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- echo -n "J2RE "
- compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "J2SDK Overlay "
- compare_file_types $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- echo -n "J2RE Overlay "
- compare_file_types $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
- fi
-fi
-
-if [ "$CMP_GENERAL" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- echo -n "J2SDK "
- compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- echo -n "J2RE "
- compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "J2SDK Overlay "
- compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- echo -n "J2RE Overlay "
- compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
- fi
-fi
-
-if [ "$CMP_ZIPS" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- fi
-fi
-
-if [ "$CMP_JARS" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- fi
-fi
-
-if [ "$CMP_LIBS" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "Overlay "
- compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- fi
-fi
-
-if [ "$CMP_EXECS" = "true" ]; then
- if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
- compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
- fi
- if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
- echo -n "Overlay "
- compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
- fi
-fi
-
-echo
-
-if [ -n "$REGRESSIONS" ]; then
- echo "REGRESSIONS FOUND!"
- echo
- exit 1
-else
- echo "No regressions found"
- echo
- exit 0
-fi
+. "$REAL_COMPARE_SCRIPT" "$@"
diff --git a/common/autoconf/configure b/common/autoconf/configure
index 5007a61..8e4560d 100644
--- a/common/autoconf/configure
+++ b/common/autoconf/configure
@@ -1,4 +1,32 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Copyright (c) 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.
+#
+# 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.
+#
+
+if test "x$BASH_VERSION" = x; then
+ echo This script needs bash to run.
+ echo It is recommended to use the configure script in the source tree root instead.
+ exit 1
+fi
CONFIGURE_COMMAND_LINE="$@"
conf_script_dir=`dirname $0`
@@ -13,58 +41,81 @@
### Test that the generated configure is up-to-date
###
-# On Solaris /bin/sh doesn't support test -nt but /usr/bin/test does.
-TEST=`which test`
-
-print_error_not_up_to_date() {
- echo "Error: The configure source files is newer than the generated files."
- echo "Please run 'sh autogen.sh' to update the generated files."
- echo "Note that this test might trigger incorrectly sometimes due to hg timestamps".
+run_autogen_or_fail() {
+ if test "x`which autoconf 2> /dev/null`" = x; then
+ echo "Cannot locate autoconf, unable to correct situation."
+ echo "Please install autoconf and run 'bash autogen.sh' to update the generated files."
+ echo "Error: Cannot continue" 1>&2
+ exit 1
+ else
+ echo "Running autogen.sh to correct the situation"
+ bash $conf_script_dir/autogen.sh
+ fi
}
-# NOTE: This test can occasionally go wrong due to the way mercurial handles
-# timestamps. It it supposed to aid during development of build-infra, but should
-# go away before making this the default build system.
-for file in configure.ac *.m4 ; do
- if $TEST $file -nt generated-configure.sh; then
- print_error_not_up_to_date
- exit 1
- fi
-done
-
-if $TEST -e $conf_custom_script_dir/generated-configure.sh; then
- # If custom source configure is available, make sure it is up-to-date as well.
- for file in configure.ac *.m4 $conf_custom_script_dir/*.m4; do
- if $TEST $file -nt $conf_custom_script_dir/generated-configure.sh; then
- print_error_not_up_to_date
- exit 1
+check_autoconf_timestamps() {
+ for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 ; do
+ if test $file -nt $conf_script_dir/generated-configure.sh; then
+ echo "Warning: The configure source files is newer than the generated files."
+ run_autogen_or_fail
fi
done
+ if test -e $conf_custom_script_dir/generated-configure.sh; then
+ # If custom source configure is available, make sure it is up-to-date as well.
+ for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 $conf_custom_script_dir/*.m4; do
+ if test $file -nt $conf_custom_script_dir/generated-configure.sh; then
+ echo "Warning: The configure source files is newer than the custom generated files."
+ run_autogen_or_fail
+ fi
+ done
+ fi
+}
+
+check_hg_updates() {
+ if test "x`which hg 2> /dev/null`" != x; then
+ conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf`
+ if test "x$conf_updated_autoconf_files" != x; then
+ echo "Configure source code has been updated, checking time stamps"
+ check_autoconf_timestamps
+ fi
+
+ if test -e $conf_custom_script_dir; then
+ # If custom source configure is available, make sure it is up-to-date as well.
+ conf_custom_updated_autoconf_files=`cd $conf_custom_script_dir && hg status -mard 2> /dev/null | grep autoconf`
+ if test "x$conf_custom_updated_autoconf_files" != x; then
+ echo "Configure custom source code has been updated, checking time stamps"
+ check_autoconf_timestamps
+ fi
+ fi
+
+ fi
+}
+
+# Check for local changes
+check_hg_updates
+
+if test -e $conf_custom_script_dir/generated-configure.sh; then
# Test if open configure is newer than custom configure, if so, custom needs to
# be regenerated. This test is required to ensure consistency with custom source.
- conf_open_configure_timestamp=`grep DATE_WHEN_GENERATED: $conf_script_dir/generated-configure.sh | cut -d" " -f 3`
- conf_custom_configure_timestamp=`grep DATE_WHEN_GENERATED: $conf_custom_script_dir/generated-configure.sh | cut -d" " -f 3`
- if $TEST $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then
- echo "Error: The generated configure file contains changes not present in the custom generated file."
- echo "Please run 'sh autogen.sh' to update the generated files."
- exit 1
+ conf_open_configure_timestamp=`grep DATE_WHEN_GENERATED= $conf_script_dir/generated-configure.sh | cut -d"=" -f 2`
+ conf_custom_configure_timestamp=`grep DATE_WHEN_GENERATED= $conf_custom_script_dir/generated-configure.sh | cut -d"=" -f 2`
+ if test $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then
+ echo "Warning: The generated configure file contains changes not present in the custom generated file."
+ run_autogen_or_fail
fi
-
fi
# Autoconf calls the configure script recursively sometimes.
# Don't start logging twice in that case
-if $TEST "x$conf_debug_configure" = xtrue; then
+if test "x$conf_debug_configure" = xtrue; then
conf_debug_configure=recursive
fi
###
### Process command-line arguments
###
-conf_processed_arguments=
+conf_processed_arguments=()
conf_openjdk_target=
-conf_extra_cflags=
-conf_extra_cxxflags=
for conf_option
do
@@ -72,20 +123,14 @@
--openjdk-target=*)
conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
continue ;;
- --with-extra-cflags=*)
- conf_extra_cflags=`expr "X$conf_option" : '[^=]*=\(.*\)'`
- continue ;;
- --with-extra-cxxflags=*)
- conf_extra_cxxflags=`expr "X$conf_option" : '[^=]*=\(.*\)'`
- continue ;;
--debug-configure)
- if $TEST "x$conf_debug_configure" != xrecursive; then
+ if test "x$conf_debug_configure" != xrecursive; then
conf_debug_configure=true
export conf_debug_configure
fi
continue ;;
*)
- conf_processed_arguments="$conf_processed_arguments $conf_option" ;;
+ conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
esac
case $conf_option in
@@ -95,11 +140,13 @@
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
-host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
+ -help | --help | --hel | --he | -h)
+ conf_print_help=true ;;
esac
done
-if $TEST "x$conf_legacy_crosscompile" != "x"; then
- if $TEST "x$conf_openjdk_target" != "x"; then
+if test "x$conf_legacy_crosscompile" != "x"; then
+ if test "x$conf_openjdk_target" != "x"; then
echo "Error: Specifying --openjdk-target together with autoconf"
echo "legacy cross-compilation flags is not supported."
echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile."
@@ -112,20 +159,20 @@
fi
fi
-if $TEST "x$conf_openjdk_target" != "x"; then
+if test "x$conf_openjdk_target" != "x"; then
conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
- conf_processed_arguments="--build=$conf_build_platform --host=$conf_openjdk_target --target=$conf_openjdk_target $conf_processed_arguments"
+ conf_processed_arguments=("--build=$conf_build_platform" "--host=$conf_openjdk_target" "--target=$conf_openjdk_target" "${conf_processed_arguments[@]}")
fi
# Make configure exit with error on invalid options as default.
# Can be overridden by --disable-option-checking, since we prepend our argument
# and later options override earlier.
-conf_processed_arguments="--enable-option-checking=fatal $conf_processed_arguments"
+conf_processed_arguments=("--enable-option-checking=fatal" "${conf_processed_arguments[@]}")
###
### Call the configure script
###
-if $TEST -e $conf_custom_script_dir/generated-configure.sh; then
+if test -e $conf_custom_script_dir/generated-configure.sh; then
# Custom source configure available; run that instead
echo Running custom generated-configure.sh
conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
@@ -134,17 +181,17 @@
conf_script_to_run=$conf_script_dir/generated-configure.sh
fi
-if $TEST "x$conf_debug_configure" != x; then
+if test "x$conf_debug_configure" != x; then
# Turn on shell debug output if requested (initial or recursive)
set -x
fi
-if $TEST "x$conf_debug_configure" = xtrue; then
+if test "x$conf_debug_configure" = xtrue; then
# Turn on logging, but don't turn on twice when called recursive
conf_debug_logfile=./debug-configure.log
- (exec 3>&1 ; (. $conf_script_to_run $conf_processed_arguments --with-extra-cflags="$conf_extra_cflags" --with-extra-cxxflags="$conf_extra_cxxflags" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
+ (exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
else
- . $conf_script_to_run $conf_processed_arguments --with-extra-cflags="$conf_extra_cflags" --with-extra-cxxflags="$conf_extra_cxxflags"
+ ( . $conf_script_to_run "${conf_processed_arguments[@]}" )
fi
conf_result_code=$?
@@ -152,8 +199,28 @@
### Post-processing
###
+if test $conf_result_code -eq 0; then
+ if test "x$conf_print_help" = xtrue; then
+ cat <<EOT
+
+Additional (non-autoconf) OpenJDK Options:
+ --openjdk-target=TARGET cross-compile with TARGET as target platform
+ (i.e. the one you will run the resulting binary on).
+ Equivalent to --host=TARGET --target=TARGET
+ --build=<current platform>
+ --debug-configure Run the configure script with additional debug
+ logging enabled.
+
+Please be aware that, when cross-compiling, the OpenJDK configure script will
+generally use 'target' where autoconf traditionally uses 'host'.
+EOT
+ fi
+else
+ echo configure exiting with result code $conf_result_code
+fi
+
# Move the log file to the output root, if this was successfully created
-if $TEST -d "$OUTPUT_ROOT"; then
+if test -d "$OUTPUT_ROOT"; then
mv -f config.log "$OUTPUT_ROOT" 2> /dev/null
fi
diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
index d9b1f6b..0dc2355 100644
--- a/common/autoconf/configure.ac
+++ b/common/autoconf/configure.ac
@@ -31,16 +31,14 @@
AC_PREREQ([2.61])
-AC_INIT(openjdk, jdk8, build-dev@openjdk.java.net)
-
-# Do not change or remove the following line, it is needed for consistency checks:
-# DATE_WHEN_GENERATED: @DATE_WHEN_GENERATED@
+AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
AC_CONFIG_AUX_DIR([build-aux])
m4_include([build-aux/pkg.m4])
# Include these first...
m4_include([basics.m4])
+m4_include([basics_windows.m4])
m4_include([builddeps.m4])
# ... then the rest
m4_include([boot-jdk.m4])
@@ -51,35 +49,57 @@
m4_include([platform.m4])
m4_include([source-dirs.m4])
m4_include([toolchain.m4])
+m4_include([toolchain_windows.m4])
-# This line needs to be here, verbatim, after all includes.
-# It is replaced with custom functionality when building
+AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK])
+AC_DEFUN_ONCE([CUSTOM_LATE_HOOK])
+
+# This line needs to be here, verbatim, after all includes and the dummy hook
+# definitions. It is replaced with custom functionality when building
# custom sources.
-AC_DEFUN_ONCE([CUSTOM_HOOK])
+#CUSTOM_AUTOCONF_INCLUDE
+
+# Do not change or remove the following line, it is needed for consistency checks:
+DATE_WHEN_GENERATED=@DATE_WHEN_GENERATED@
###############################################################################
#
-# Initialization
+# Initialization / Boot-strapping
+#
+# The bootstrapping process needs to solve the "chicken or the egg" problem,
+# thus it jumps back and forth, each time gaining something needed later on.
#
###############################################################################
# Basic initialization that must happen first of all
BASIC_INIT
+BASIC_SETUP_FUNDAMENTAL_TOOLS
# Now we can determine OpenJDK build and target platforms. This is required to
# have early on.
PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
-# Continue setting up basic stuff.
+# Continue setting up basic stuff. Most remaining code require fundamental tools.
BASIC_SETUP_PATHS
BASIC_SETUP_LOGGING
+# These are needed to be able to create a configuration name (and thus the output directory)
+JDKOPT_SETUP_JDK_VARIANT
+JDKOPT_SETUP_JVM_VARIANTS
+JDKOPT_SETUP_DEBUG_LEVEL
+
+# With basic setup done, call the custom early hook.
+CUSTOM_EARLY_HOOK
+
+# To properly create a configuration name, we need to have the OpenJDK target
+# and options (variants and debug level) parsed.
+BASIC_SETUP_OUTPUT_DIR
+
# Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
HELP_SETUP_DEPENDENCY_HELP
-# Setup simple tools, that do not need have cross compilation support.
-# Without these, we can't properly run the rest of the configure script.
-BASIC_SETUP_TOOLS
+# Setup tools that requires more complex handling, or that is not needed by the configure script.
+BASIC_SETUP_COMPLEX_TOOLS
# Check if pkg-config is available.
PKG_PROG_PKG_CONFIG
@@ -100,16 +120,9 @@
###############################################################################
# We need build & target for this.
-JDKOPT_SETUP_JDK_VARIANT
-JDKOPT_SETUP_JVM_VARIANTS
-JDKOPT_SETUP_DEBUG_LEVEL
JDKOPT_SETUP_JDK_OPTIONS
JDKOPT_SETUP_JDK_VERSION_NUMBERS
-# To properly create a configuration name, we need to have the OpenJDK target
-# and options (variants and debug level) parsed.
-BASIC_SETUP_OUTPUT_DIR
-
###############################################################################
#
# Setup BootJDK, used to bootstrap the build.
@@ -137,7 +150,6 @@
###############################################################################
TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS
-TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
# Locate the actual tools
TOOLCHAIN_SETUP_PATHS
@@ -152,10 +164,6 @@
TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK
-# After we have toolchain, we can compile the uncygdrive helper
-BASIC_COMPILE_UNCYGDRIVE
-
-
# Setup debug symbols (need objcopy from the toolchain for that)
JDKOPT_SETUP_DEBUG_SYMBOLS
@@ -173,6 +181,9 @@
LIB_SETUP_MISC_LIBS
LIB_SETUP_STATIC_LINK_LIBSTDCPP
+# After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
+BASIC_COMPILE_FIXPATH
+
###############################################################################
#
# We need to do some final tweaking, when everything else is done.
@@ -210,7 +221,7 @@
BASIC_TEST_USABILITY_ISSUES
# At the end, call the custom hook. (Dummy macro if no custom sources available)
-CUSTOM_HOOK
+CUSTOM_LATE_HOOK
# We're messing a bit with internal autoconf variables to put the config.status
# in the output directory instead of the current directory.
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 9dc4561..9427b79 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for openjdk jdk8.
+# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
#
# Report bugs to <build-dev@openjdk.java.net>.
#
@@ -550,12 +550,12 @@
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='openjdk'
+PACKAGE_NAME='OpenJDK'
PACKAGE_TARNAME='openjdk'
PACKAGE_VERSION='jdk8'
-PACKAGE_STRING='openjdk jdk8'
+PACKAGE_STRING='OpenJDK jdk8'
PACKAGE_BUGREPORT='build-dev@openjdk.java.net'
-PACKAGE_URL=''
+PACKAGE_URL='http://openjdk.java.net'
# Factoring default headers for most tests.
ac_includes_default="\
@@ -606,7 +606,9 @@
NUM_CORES
SALIB_NAME
HOTSPOT_MAKE_ARGS
+FIXPATH
LIBCXX
+STATIC_CXX_SETTING
LIBDL
LIBM
LIBZIP_CAN_USE_MMAP
@@ -619,7 +621,6 @@
USING_SYSTEM_FT_LIB
FREETYPE2_LIBS
FREETYPE2_CFLAGS
-CUPS_LIBS
CUPS_CFLAGS
OPENWIN_HOME
X_EXTRA_LIBS
@@ -631,7 +632,6 @@
CFLAGS_DEBUG_SYMBOLS
ZIP_DEBUGINFO_FILES
ENABLE_DEBUG_SYMBOLS
-UNCYGDRIVE
LDFLAGS_CXX_JDK
LDFLAGS_JDKEXE_SUFFIX
LDFLAGS_JDKLIB_SUFFIX
@@ -672,6 +672,9 @@
SHARED_LIBRARY
OBJ_SUFFIX
LIPO
+ac_ct_OBJDUMP
+OBJDUMP
+ac_ct_OBJCOPY
OBJCOPY
MCS
STRIP
@@ -683,9 +686,13 @@
RC_FLAGS
DUMPBIN
WINAR
+HOTSPOT_RC
+HOTSPOT_MT
RC
MT
WINLD
+HOTSPOT_LD
+HOTSPOT_CXX
ARFLAGS
AR
LDEXECXX
@@ -698,6 +705,9 @@
ac_ct_CXX
CXXFLAGS
CXX
+ac_ct_PROPER_COMPILER_CXX
+PROPER_COMPILER_CXX
+POTENTIAL_CXX
OBJEXT
EXEEXT
ac_ct_CC
@@ -705,12 +715,16 @@
LDFLAGS
CFLAGS
CC
+ac_ct_PROPER_COMPILER_CC
+PROPER_COMPILER_CC
+POTENTIAL_CC
BUILD_LD
BUILD_CXX
BUILD_CC
-MSVCR100DLL
-CHECK_FOR_VCINSTALLDIR
-SETUPDEVENV
+MSVCR_DLL
+VS_PATH
+VS_LIB
+VS_INCLUDE
CYGWIN_LINK
AR_OUT_OPTION
LD_OUT_OPTION
@@ -733,15 +747,14 @@
BOOT_RTJAR
JAVA_CHECK
JAVAC_CHECK
-OUTPUT_ROOT
-CONF_NAME
-SPEC
COOKED_BUILD_NUMBER
FULL_VERSION
RELEASE
JDK_VERSION
RUNTIME_NAME
COPYRIGHT_YEAR
+MACOSX_BUNDLE_ID_BASE
+MACOSX_BUNDLE_NAME_BASE
COMPANY_NAME
JDK_RC_PLATFORM_NAME
PRODUCT_SUFFIX
@@ -753,16 +766,39 @@
JDK_MICRO_VERSION
JDK_MINOR_VERSION
JDK_MAJOR_VERSION
-ENABLE_JFR
COMPRESS_JARS
+UNLIMITED_CRYPTO
CACERTS_FILE
TEST_IN_BUILD
-DISABLE_NIMBUS
BUILD_HEADLESS
SUPPORT_HEADFUL
SUPPORT_HEADLESS
-JIGSAW
SET_OPENJDK
+BDEPS_FTP
+BDEPS_UNZIP
+OS_VERSION_MICRO
+OS_VERSION_MINOR
+OS_VERSION_MAJOR
+PKG_CONFIG
+COMM
+TIME
+STAT
+HG
+READELF
+OTOOL
+LDD
+ZIP
+UNZIP
+FIND_DELETE
+MAKE
+CHECK_TOOLSDIR_MAKE
+CHECK_TOOLSDIR_GMAKE
+CHECK_MAKE
+CHECK_GMAKE
+PKGHANDLER
+OUTPUT_ROOT
+CONF_NAME
+SPEC
BUILD_VARIANT_RELEASE
DEBUG_CLASSFILES
FASTDEBUG
@@ -776,72 +812,12 @@
JVM_VARIANT_SERVER
JVM_VARIANTS
JDK_VARIANT
-BDEPS_FTP
-BDEPS_UNZIP
-OS_VERSION_MICRO
-OS_VERSION_MINOR
-OS_VERSION_MAJOR
-PKG_CONFIG
-HG
-OBJDUMP
-READELF
-OTOOL
-LDD
-THEPWDCMD
-FIND_DELETE
-RM
-MAKE
-CHECK_TOOLSDIR_MAKE
-CHECK_TOOLSDIR_GMAKE
-CHECK_MAKE
-CHECK_GMAKE
-NAWK
-SED
-FGREP
-EGREP
-GREP
-AWK
-ZIP
-XARGS
-WC
-UNZIP
-UNIQ
-TR
-TOUCH
-TEE
-TAR
-TAIL
-SORT
-SH
-PRINTF
-MV
-MKDIR
-LS
-LN
-HEAD
-FIND
-FILE
-EXPR
-ECHO
-DIFF
-DF
-DATE
-CUT
-CPIO
-CP
-CMP
-CHMOD
-CAT
-BASENAME
-PKGHANDLER
BUILD_LOG_WRAPPER
BUILD_LOG_PREVIOUS
BUILD_LOG
SYS_ROOT
PATH_SEP
-CYGPATH
SRC_ROOT
-READLINK
DEFINE_CROSS_COMPILE_ARCH
LP64
OPENJDK_TARGET_OS_API_DIR
@@ -854,18 +830,18 @@
REQUIRED_OS_VERSION
REQUIRED_OS_NAME
COMPILE_TYPE
-OPENJDK_BUILD_CPU_ENDIAN
-OPENJDK_BUILD_CPU_BITS
-OPENJDK_BUILD_CPU_ARCH
-OPENJDK_BUILD_CPU
-OPENJDK_BUILD_OS_API
-OPENJDK_BUILD_OS
OPENJDK_TARGET_CPU_ENDIAN
OPENJDK_TARGET_CPU_BITS
OPENJDK_TARGET_CPU_ARCH
OPENJDK_TARGET_CPU
OPENJDK_TARGET_OS_API
OPENJDK_TARGET_OS
+OPENJDK_BUILD_CPU_ENDIAN
+OPENJDK_BUILD_CPU_BITS
+OPENJDK_BUILD_CPU_ARCH
+OPENJDK_BUILD_CPU
+OPENJDK_BUILD_OS_API
+OPENJDK_BUILD_OS
OPENJDK_BUILD_AUTOCONF_NAME
OPENJDK_TARGET_AUTOCONF_NAME
target_os
@@ -880,6 +856,51 @@
build_vendor
build_cpu
build
+SETFILE
+DF
+READLINK
+CYGPATH
+NAWK
+SED
+FGREP
+EGREP
+GREP
+AWK
+XARGS
+WHICH
+WC
+UNIQ
+UNAME
+TR
+TOUCH
+TEE
+TAR
+TAIL
+SORT
+SH
+RM
+THEPWDCMD
+PRINTF
+MV
+MKTEMP
+MKDIR
+LS
+LN
+HEAD
+FIND
+FILE
+EXPR
+ECHO
+DIRNAME
+DIFF
+DATE
+CUT
+CP
+CMP
+CHMOD
+CAT
+BASH
+BASENAME
DATE_WHEN_CONFIGURED
CONFIGURE_COMMAND_LINE
CUSTOM_MAKE_DIR
@@ -929,23 +950,20 @@
with_sys_root
with_tools_dir
with_devkit
-with_builddeps_conf
-with_builddeps_server
-with_builddeps_dir
-with_builddeps_group
-enable_list_builddeps
with_jdk_variant
with_jvm_variants
enable_debug
with_debug_level
+with_conf_name
+with_builddeps_conf
+with_builddeps_server
+with_builddeps_dir
+with_builddeps_group
enable_openjdk_only
-enable_jigsaw
enable_headful
-enable_nimbus
enable_hotspot_test_in_build
with_cacerts_file
-enable_jfr
-with_conf_name
+enable_unlimited_crypto
with_boot_jdk
with_boot_jdk_jvmargs
with_add_source_root
@@ -957,7 +975,7 @@
with_override_jaxws
with_override_hotspot
with_override_jdk
-with_msvcr100dll
+with_msvcr_dll
with_extra_cflags
with_extra_cxxflags
with_extra_ldflags
@@ -967,7 +985,6 @@
with_x
with_cups
with_cups_include
-with_cups_lib
with_freetype
with_alsa
with_alsa_include
@@ -1546,7 +1563,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures openjdk jdk8 to adapt to many kinds of systems.
+\`configure' configures OpenJDK jdk8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1616,7 +1633,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of openjdk jdk8:";;
+ short | recursive ) echo "Configuration of OpenJDK jdk8:";;
esac
cat <<\_ACEOF
@@ -1624,24 +1641,19 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-list-builddeps list all build dependencies known to the configure
- script
--enable-debug set the debug level to fastdebug (shorthand for
--with-debug-level=fastdebug) [disabled]
- --enable-openjdk-only build OpenJDK regardless of the presence of closed
- repositories [disabled]
- --enable-jigsaw build Jigsaw images (not yet available) [disabled]
- --disable-headful build headful support (graphical UI support)
- [enabled]
- --disable-nimbus disable Nimbus L&F [enabled]
+ --enable-openjdk-only supress building closed source even if present
+ [disabled]
+ --disable-headful disable building headful support (graphical UI
+ support) [enabled]
--enable-hotspot-test-in-build
- enable running of Queens test after Hotspot build
- (not yet available) [disabled]
- --enable-jfr enable jfr (default is no)
- ENABLE_JFR="${enableval}"
- --disable-debug-symbols disable generation of debug symbols ([enabled])
+ run the Queens test after Hotspot build [disabled]
+ --enable-unlimited-crypto
+ Enable unlimited crypto policy [disabled]
+ --disable-debug-symbols disable generation of debug symbols [enabled]
--disable-zip-debug-info
- don't zip debug-info files ([enabled@:@)
+ disable zipping of debug-info files [enabled]
--disable-macosx-runtime-support
disable the use of MacOSX Java runtime support
framework [enabled]
@@ -1651,38 +1663,38 @@
--enable-sjavac use sjavac to do fast incremental compiles
[disabled]
--disable-precompiled-headers
- use precompiled headers when compiling C++ [enabled]
- --disable-ccache use ccache to speed up recompilations [enabled]
+ disable using precompiled headers when compiling C++
+ [enabled]
+ --disable-ccache disable using ccache to speed up recompilations
+ [enabled]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-custom-make-dir directory containing custom build/make files
+ --with-custom-make-dir use this directory for custom build/make files
--with-target-bits build 32-bit or 64-bit binaries (for platforms that
support it), e.g. --with-target-bits=32 [guessed]
- --with-sys-root pass this sys-root to the compilers and linker
- (useful if the sys-root encoded in the cross
- compiler tools is incorrect)
- --with-tools-dir search this directory for (cross-compiling)
- compilers and tools
+ --with-sys-root pass this sys-root to the compilers and tools (for
+ cross-compiling)
+ --with-tools-dir search this directory for compilers and tools (for
+ cross-compiling)
--with-devkit use this directory as base for tools-dir and
sys-root (for cross-compiling)
- --with-builddeps-conf use this configuration file for the builddeps
- --with-builddeps-server download and use build dependencies from this server
- url, e.g.
- --with-builddeps-server=ftp://example.com/dir
- --with-builddeps-dir store downloaded build dependencies here
- [d/localhome/builddeps]
- --with-builddeps-group chgrp the downloaded build dependencies to this
- group
--with-jdk-variant JDK variant to build (normal) [normal]
--with-jvm-variants JVM variants (separated by commas) to build (server,
client, kernel, zero, zeroshark) [server]
--with-debug-level set the debug level (release, fastdebug, slowdebug)
[release]
+ --with-conf-name use this as the name of the configuration [generated
+ from important configuration options]
+ --with-builddeps-conf use this configuration file for the builddeps
+ --with-builddeps-server download and use build dependencies from this server
+ url
+ --with-builddeps-dir store downloaded build dependencies here
+ [/localhome/builddeps]
+ --with-builddeps-group chgrp the downloaded build dependencies to this
+ group
--with-cacerts-file specify alternative cacerts file
- --with-conf-name use this as the name of the configuration,
- overriding the generated default
--with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
--with-boot-jdk-jvmargs specify JVM arguments to be passed to all
invocations of the Boot JDK, overriding the default
@@ -1707,16 +1719,15 @@
--with-override-jaxws use this jaxws dir for the build
--with-override-hotspot use this hotspot dir for the build
--with-override-jdk use this jdk dir for the build
- --with-msvcr100dll copy this msvcr100.dll into the built JDK
+ --with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows
+ only) [probed]
--with-extra-cflags extra flags to be used when compiling jdk c-files
--with-extra-cxxflags extra flags to be used when compiling jdk c++-files
--with-extra-ldflags extra flags to be used when linking jdk
--with-x use the X Window System
--with-cups specify prefix directory for the cups package
- (expecting the libraries under PATH/lib and the
- headers under PATH/include)
+ (expecting the headers under PATH/include)
--with-cups-include specify directory for the cups include files
- --with-cups-lib specify directory for the cups library
--with-freetype specify prefix directory for the freetype2 package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
@@ -1733,10 +1744,7 @@
--with-memory-size=1024 [probed]
--with-sjavac-server-java
use this java binary for running the sjavac
- background server and other long running java tasks
- in the build process, e.g.
- ---with-sjavac-server-java="/opt/jrockit/bin/java
- -server"
+ background server [Boot JDK java]
--with-sjavac-server-cores
use at most this number of concurrent threads on the
sjavac server [probed]
@@ -1769,6 +1777,7 @@
it to find libraries and programs with nonstandard names/locations.
Report bugs to <build-dev@openjdk.java.net>.
+OpenJDK home page: <http://openjdk.java.net>.
_ACEOF
ac_status=$?
fi
@@ -1831,7 +1840,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-openjdk configure jdk8
+OpenJDK configure jdk8
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2488,101 +2497,41 @@
} # ac_fn_cxx_check_func
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
+ eval "$3=yes"
else
- ac_header_compiler=no
+ eval "$3=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------- ##
-## Report this to build-dev@openjdk.java.net ##
-## ----------------------------------------- ##"
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by openjdk $as_me jdk8, which was
+It was created by OpenJDK $as_me jdk8, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2931,9 +2880,6 @@
-# Do not change or remove the following line, it is needed for consistency checks:
-# DATE_WHEN_GENERATED: 1347963060
-
ac_aux_dir=
for ac_dir in build-aux "$srcdir"/build-aux; do
if test -f "$ac_dir/install-sh"; then
@@ -3053,14 +2999,46 @@
+# This will make sure the given variable points to a full and proper
+# path. This means:
+# 1) There will be no spaces in the path. On posix platforms,
+# spaces in the path will result in an error. On Windows,
+# the path will be rewritten using short-style to be space-free.
+# 2) The path will be absolute, and it will be in unix-style (on
+# cygwin).
+# $1: The name of the variable to fix
+
+
+# This will make sure the given variable points to a executable
+# with a full and proper path. This means:
+# 1) There will be no spaces in the path. On posix platforms,
+# spaces in the path will result in an error. On Windows,
+# the path will be rewritten using short-style to be space-free.
+# 2) The path will be absolute, and it will be in unix-style (on
+# cygwin).
+# Any arguments given to the executable is preserved.
+# If the input variable does not have a directory specification, then
+# it need to be in the PATH.
+# $1: The name of the variable to fix
+# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
+# $1: variable to check
+# $2: executable name to print in warning (optional)
+# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
+# Arguments as AC_PATH_PROG:
+# $1: variable to set
+# $2: executable name to look for
+
+
+# Setup the most fundamental tools that relies on not much else to set up,
+# but is used by much of the early bootstrap code.
# Setup basic configuration paths, and platform-specific stuff related to PATHs.
@@ -3083,23 +3061,10 @@
-# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
-# $1: variable to check
-# $2: executable name to print in warning (optional)
-# Does AC_PATH_PROG followed by CHECK_NONEMPTY.
-# Arguments as AC_PATH_PROG:
-# $1: variable to set
-# $2: executable name to look for
-
-
-
-
-
-
-
-# Check if build directory is on local disk.
+# Check if build directory is on local disk. If not possible to determine,
+# we prefer to claim it's local.
# Argument 1: directory to test
# Argument 2: what to do if it is on local disk
# Argument 3: what to do otherwise (remote disk or failure)
@@ -3136,6 +3101,64 @@
+# Helper function which possibly converts a path using DOS-style short mode.
+# If so, the updated path is stored in $new_path.
+# $1: The path to check
+
+
+# Helper function which possibly converts a path using DOS-style short mode.
+# If so, the updated path is stored in $new_path.
+# $1: The path to check
+
+
+# FIXME: The BASIC_FIXUP_*_CYGWIN/MSYS is most likely too convoluted
+# and could probably be heavily simplified. However, all changes in this
+# area tend to need lot of testing in different scenarios, and in lack of
+# proper unit testing, cleaning this up has not been deemed worth the effort
+# at the moment.
+
+
+
+
+
+
+
+
+
+# Setup basic configuration paths, and platform-specific stuff related to PATHs.
+
+
+
+
+#
+# Copyright (c) 2011, 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.
+#
+
+
+
+
+
@@ -3287,6 +3310,19 @@
+cygwin_help() {
+ case $1 in
+ unzip)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
+ zip)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
+ make)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
+ * )
+ break ;;
+ esac
+}
+
apt_help() {
case $1 in
devkit)
@@ -3561,6 +3597,16 @@
# questions.
#
+# $1 = compiler to test (CC or CXX)
+# $2 = human readable name of compiler (C or C++)
+
+
+
+
+
+# $1 = compiler to test (CC or CXX)
+# $2 = human readable name of compiler (C or C++)
+# $3 = list of compiler names to search for
@@ -3573,16 +3619,60 @@
+#
+# Copyright (c) 2011, 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.
+#
-# This line needs to be here, verbatim, after all includes.
-# It is replaced with custom functionality when building
+
+
+
+
+
+# Check if the VS env variables were setup prior to running configure.
+# If not, then find vcvarsall.bat and run it automatically, and integrate
+# the set env variables into the spec file.
+
+
+
+
+
+
+# This line needs to be here, verbatim, after all includes and the dummy hook
+# definitions. It is replaced with custom functionality when building
# custom sources.
+#CUSTOM_AUTOCONF_INCLUDE
+# Do not change or remove the following line, it is needed for consistency checks:
+DATE_WHEN_GENERATED=1351539315
###############################################################################
#
-# Initialization
+# Initialization / Boot-strapping
+#
+# The bootstrapping process needs to solve the "chicken or the egg" problem,
+# thus it jumps back and forth, each time gaining something needed later on.
#
###############################################################################
@@ -3592,789 +3682,12 @@
DATE_WHEN_CONFIGURED=`LANG=C date`
-
-
-# Now we can determine OpenJDK build and target platforms. This is required to
-# have early on.
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
-# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
-# is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the
-# product you're building. The target of this build is called "host". Since this is confusing to most people, we
-# have not adopted that system, but use "target" as the platform we are building for. In some places though we need
-# to use the configure naming style.
-
-
-
-
-
- # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
- # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
- # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
- # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
- OPENJDK_TARGET_AUTOCONF_NAME="$host"
- OPENJDK_BUILD_AUTOCONF_NAME="$build"
-
-
-
- # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
-
- case "$host_os" in
- *linux*)
- VAR_OS=linux
- VAR_OS_API=posix
- ;;
- *solaris*)
- VAR_OS=solaris
- VAR_OS_API=posix
- ;;
- *darwin*)
- VAR_OS=macosx
- VAR_OS_API=posix
- ;;
- *bsd*)
- VAR_OS=bsd
- VAR_OS_API=posix
- ;;
- *cygwin*|*windows*)
- VAR_OS=windows
- VAR_OS_API=winapi
- ;;
- *)
- as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
- ;;
- esac
-
-
- # First argument is the cpu name from the trip/quad
- case "$host_cpu" in
- x86_64)
- VAR_CPU=x86_64
- VAR_CPU_ARCH=x86
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
- ;;
- i?86)
- VAR_CPU=x86
- VAR_CPU_ARCH=x86
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=little
- ;;
- arm*)
- VAR_CPU=arm
- VAR_CPU_ARCH=arm
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=little
- ;;
- powerpc)
- VAR_CPU=ppc
- VAR_CPU_ARCH=ppc
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=big
- ;;
- powerpc64)
- VAR_CPU=ppc64
- VAR_CPU_ARCH=ppc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=big
- ;;
- sparc)
- VAR_CPU=sparc
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=big
- ;;
- sparcv9)
- VAR_CPU=sparcv9
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=big
- ;;
- *)
- as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
- ;;
- esac
-
- # ... and setup our own variables. (Do this explicitely to facilitate searching)
- OPENJDK_TARGET_OS="$VAR_OS"
- OPENJDK_TARGET_OS_API="$VAR_OS_API"
- OPENJDK_TARGET_CPU="$VAR_CPU"
- OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
- OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
- OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-
-
-
-
-
-
-
- # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
-
- case "$build_os" in
- *linux*)
- VAR_OS=linux
- VAR_OS_API=posix
- ;;
- *solaris*)
- VAR_OS=solaris
- VAR_OS_API=posix
- ;;
- *darwin*)
- VAR_OS=macosx
- VAR_OS_API=posix
- ;;
- *bsd*)
- VAR_OS=bsd
- VAR_OS_API=posix
- ;;
- *cygwin*|*windows*)
- VAR_OS=windows
- VAR_OS_API=winapi
- ;;
- *)
- as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
- ;;
- esac
-
-
- # First argument is the cpu name from the trip/quad
- case "$build_cpu" in
- x86_64)
- VAR_CPU=x86_64
- VAR_CPU_ARCH=x86
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=little
- ;;
- i?86)
- VAR_CPU=x86
- VAR_CPU_ARCH=x86
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=little
- ;;
- arm*)
- VAR_CPU=arm
- VAR_CPU_ARCH=arm
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=little
- ;;
- powerpc)
- VAR_CPU=ppc
- VAR_CPU_ARCH=ppc
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=big
- ;;
- powerpc64)
- VAR_CPU=ppc64
- VAR_CPU_ARCH=ppc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=big
- ;;
- sparc)
- VAR_CPU=sparc
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=32
- VAR_CPU_ENDIAN=big
- ;;
- sparcv9)
- VAR_CPU=sparcv9
- VAR_CPU_ARCH=sparc
- VAR_CPU_BITS=64
- VAR_CPU_ENDIAN=big
- ;;
- *)
- as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
- ;;
- esac
-
- # ..and setup our own variables. (Do this explicitely to facilitate searching)
- OPENJDK_BUILD_OS="$VAR_OS"
- OPENJDK_BUILD_OS_API="$VAR_OS_API"
- OPENJDK_BUILD_CPU="$VAR_CPU"
- OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
- OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
- OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
-
-
-
-
-
-
-
-
-
-# Check whether --with-target-bits was given.
-if test "${with_target_bits+set}" = set; then :
- withval=$with_target_bits;
-fi
-
-
- # We have three types of compiles:
- # native == normal compilation, target system == build system
- # cross == traditional cross compilation, target system != build system; special toolchain needed
- # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
- #
- if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
- # We're doing a proper cross-compilation
- COMPILE_TYPE="cross"
- else
- COMPILE_TYPE="native"
- fi
-
- if test "x$with_target_bits" != x; then
- if test "x$COMPILE_TYPE" = "xcross"; then
- as_fn_error $? "It is not possible to combine --with-target-bits=X and proper cross-compilation. Choose either." "$LINENO" 5
- fi
-
- if test "x$with_target_bits" = x32 && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- # A reduced build is requested
- COMPILE_TYPE="reduced"
- OPENJDK_TARGET_CPU_BITS=32
- if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
- OPENJDK_TARGET_CPU=x86
- elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
- OPENJDK_TARGET_CPU=sparc
- else
- as_fn_error $? "Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9" "$LINENO" 5
- fi
- elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- as_fn_error $? "It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead." "$LINENO" 5
- elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: --with-target-bits are set to build platform address size; argument has no meaning" >&5
-$as_echo "$as_me: --with-target-bits are set to build platform address size; argument has no meaning" >&6;}
- else
- as_fn_error $? "--with-target-bits can only be 32 or 64, you specified $with_target_bits!" "$LINENO" 5
- fi
- fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compilation type" >&5
-$as_echo_n "checking for compilation type... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
-$as_echo "$COMPILE_TYPE" >&6; }
-
-
- if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
- REQUIRED_OS_NAME=SunOS
- REQUIRED_OS_VERSION=5.10
- fi
- if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
- REQUIRED_OS_NAME=Linux
- REQUIRED_OS_VERSION=2.6
- fi
- if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
- REQUIRED_OS_NAME=Windows
- if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
- REQUIRED_OS_VERSION=5.2
- else
- REQUIRED_OS_VERSION=5.1
- fi
- fi
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
- REQUIRED_OS_NAME=Darwin
- REQUIRED_OS_VERSION=11.2
- fi
-
-
-
-
-
- # Also store the legacy naming of the cpu.
- # Ie i586 and amd64 instead of x86 and x86_64
- OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
- if test "x$OPENJDK_TARGET_CPU" = xx86; then
- OPENJDK_TARGET_CPU_LEGACY="i586"
- elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- # On all platforms except MacOSX replace x86_64 with amd64.
- OPENJDK_TARGET_CPU_LEGACY="amd64"
- fi
-
-
- # And the second legacy naming of the cpu.
- # Ie i386 and amd64 instead of x86 and x86_64.
- OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
- if test "x$OPENJDK_TARGET_CPU" = xx86; then
- OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
- elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
- fi
-
-
- # This is the name of the cpu (but using i386 and amd64 instead of
- # x86 and x86_64, respectively), preceeded by a /, to be used when
- # locating libraries. On macosx, it's empty, though.
- OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
- if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- OPENJDK_TARGET_CPU_LIBDIR=""
- fi
-
-
- # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
- # /amd64 or /sparcv9. This string is appended to some library paths, like this:
- # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
- OPENJDK_TARGET_CPU_ISADIR=""
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then
- if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- OPENJDK_TARGET_CPU_ISADIR="/amd64"
- elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
- OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
- fi
- fi
-
-
- # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
- OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
- if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
- # On linux only, we replace x86 with i386.
- OPENJDK_TARGET_CPU_OSARCH="i386"
- elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- # On all platforms except macosx, we replace x86_64 with amd64.
- OPENJDK_TARGET_CPU_OSARCH="amd64"
- fi
-
-
- OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
- if test "x$OPENJDK_TARGET_CPU" = xx86; then
- OPENJDK_TARGET_CPU_JLI="i386"
- elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- # On all platforms except macosx, we replace x86_64 with amd64.
- OPENJDK_TARGET_CPU_JLI="amd64"
- fi
- # Now setup the -D flags for building libjli.
- OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then
- if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
- OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
- elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
- OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
- fi
- fi
-
-
- # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
- if test "x$OPENJDK_TARGET_OS_API" = xposix; then
- OPENJDK_TARGET_OS_API_DIR="solaris"
- fi
- if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
- OPENJDK_TARGET_OS_API_DIR="windows"
- fi
-
-
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- A_LP64="LP64:="
- ADD_LP64="-D_LP64=1"
- fi
- LP64=$A_LP64
-
-
- if test "x$COMPILE_TYPE" = "xcross"; then
- # FIXME: ... or should this include reduced builds..?
- DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
- else
- DEFINE_CROSS_COMPILE_ARCH=""
- fi
-
-
-
-
-# Continue setting up basic stuff.
-
-# Locate the directory of this script.
-SCRIPT="$0"
-
- if test "x$OPENJDK_BUILD_OS" != xwindows; then
- # Follow a chain of symbolic links. Use readlink
- # where it exists, else fall back to horribly
- # complicated shell code.
- # Extract the first word of "readlink", so it can be a program name with args.
-set dummy readlink; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_READLINK+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $READLINK in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-READLINK=$ac_cv_path_READLINK
-if test -n "$READLINK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
-$as_echo "$READLINK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "x$READLINK_TESTED" != yes; then
- # On MacOSX there is a readlink tool with a different
- # purpose than the GNU readlink tool. Check the found readlink.
- ISGNU=`$READLINK --help 2>&1 | grep GNU`
- if test "x$ISGNU" = x; then
- # A readlink that we do not know how to use.
- # Are there other non-GNU readlinks out there?
- READLINK_TESTED=yes
- READLINK=
- fi
- fi
-
- if test "x$READLINK" != x; then
- SCRIPT=`$READLINK -f $SCRIPT`
- else
- STARTDIR=$PWD
- COUNTER=0
- DIR=`dirname $SCRIPT`
- FIL=`basename $SCRIPT`
- while test $COUNTER -lt 20; do
- ISLINK=`ls -l $DIR/$FIL | grep '\->' | sed -e 's/.*-> \(.*\)/\1/'`
- if test "x$ISLINK" == x; then
- # This is not a symbolic link! We are done!
- break
- fi
- # The link might be relative! We have to use cd to travel safely.
- cd $DIR
- cd `dirname $ISLINK`
- DIR=`pwd`
- FIL=`basename $ISLINK`
- let COUNTER=COUNTER+1
- done
- cd $STARTDIR
- SCRIPT=$DIR/$FIL
- fi
- fi
-
-AUTOCONF_DIR=`dirname $0`
-
-# Where is the source? It is located two levels above the configure script.
-CURDIR="$PWD"
-cd "$AUTOCONF_DIR/../.."
-SRC_ROOT="`pwd`"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- SRC_ROOT_LENGTH=`pwd|wc -m`
- if test $SRC_ROOT_LENGTH -gt 100; then
- as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
- fi
-fi
-
-cd "$CURDIR"
-
-
- # Fail with message the path to the source root if var SRC_ROOT contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$SRC_ROOT" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- SRC_ROOT=`$CYGPATH -s -m -a "$SRC_ROOT"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- SRC_ROOT=`$ECHO "$SRC_ROOT" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- SRC_ROOT=`$CYGPATH -u "$SRC_ROOT"`
- else
- as_fn_error $? "You cannot have spaces in the path to the source root! \"$SRC_ROOT\"" "$LINENO" 5
- fi
- fi
-
-
- # Fail with message the path to the current directory if var CURDIR contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$CURDIR" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- CURDIR=`$CYGPATH -s -m -a "$CURDIR"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- CURDIR=`$ECHO "$CURDIR" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- CURDIR=`$CYGPATH -u "$CURDIR"`
- else
- as_fn_error $? "You cannot have spaces in the path to the current directory! \"$CURDIR\"" "$LINENO" 5
- fi
- fi
-
-
-if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
- # Add extra search paths on solaris for utilities like ar and as etc...
- PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
-fi
-
-# For cygwin we need cygpath first, since it is used everywhere.
-# Extract the first word of "cygpath", so it can be a program name with args.
-set dummy cygpath; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CYGPATH+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CYGPATH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CYGPATH="$CYGPATH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CYGPATH=$ac_cv_path_CYGPATH
-if test -n "$CYGPATH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
-$as_echo "$CYGPATH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-PATH_SEP=":"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- if test "x$CYGPATH" = x; then
- as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
- fi
- PATH_SEP=";"
-fi
-
-
-# You can force the sys-root if the sys-root encoded into the cross compiler tools
-# is not correct.
-
-# Check whether --with-sys-root was given.
-if test "${with_sys_root+set}" = set; then :
- withval=$with_sys_root;
-fi
-
-
-if test "x$with_sys_root" != x; then
- SYS_ROOT=$with_sys_root
-else
- SYS_ROOT=/
-fi
-
-
-
-# Check whether --with-tools-dir was given.
-if test "${with_tools_dir+set}" = set; then :
- withval=$with_tools_dir; TOOLS_DIR=$with_tools_dir
-fi
-
-
-
-# Check whether --with-devkit was given.
-if test "${with_devkit+set}" = set; then :
- withval=$with_devkit;
- if test "x$with_sys_root" != x; then
- as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
- fi
- if test "x$with_tools_dir" != x; then
- as_fn_error $? "Cannot specify both --with-devkit and --with-tools-dir at the same time" "$LINENO" 5
- fi
- TOOLS_DIR=$with_devkit/bin
- SYS_ROOT=$with_devkit/$host_alias/libc
-
-fi
-
-
-
-
-# Setup default logging of stdout and stderr to build.log in the output root.
-BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
-BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
-
-
-
-
-
-# Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
-
- for ac_prog in apt-get yum port pkgutil pkgadd
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$PKGHANDLER"; then
- ac_cv_prog_PKGHANDLER="$PKGHANDLER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PKGHANDLER="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-PKGHANDLER=$ac_cv_prog_PKGHANDLER
-if test -n "$PKGHANDLER"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGHANDLER" >&5
-$as_echo "$PKGHANDLER" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$PKGHANDLER" && break
-done
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
+$as_echo "$as_me: Configuration created at $DATE_WHEN_CONFIGURED." >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
+$as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
-# Setup simple tools, that do not need have cross compilation support.
-# Without these, we can't properly run the rest of the configure script.
# Start with tools that do not need have cross compilation support
# and can be expected to be found in the default PATH. These tools are
@@ -4443,6 +3756,65 @@
+ for ac_prog in bash
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_BASH+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $BASH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+BASH=$ac_cv_path_BASH
+if test -n "$BASH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
+$as_echo "$BASH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$BASH" && break
+done
+
+
+ if test "x$BASH" = x; then
+ if test "xbash" = x; then
+ PROG_NAME=bash
+ else
+ PROG_NAME=bash
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in cat
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -4679,65 +4051,6 @@
- for ac_prog in cpio
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CPIO+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CPIO in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CPIO=$ac_cv_path_CPIO
-if test -n "$CPIO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
-$as_echo "$CPIO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CPIO" && break
-done
-
-
- if test "x$CPIO" = x; then
- if test "xcpio" = x; then
- PROG_NAME=cpio
- else
- PROG_NAME=cpio
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
- as_fn_error $? "Cannot continue" "$LINENO" 5
- fi
-
-
-
for ac_prog in cut
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -4856,65 +4169,6 @@
- for ac_prog in df
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DF+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $DF in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_DF="$DF" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-DF=$ac_cv_path_DF
-if test -n "$DF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DF" >&5
-$as_echo "$DF" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$DF" && break
-done
-
-
- if test "x$DF" = x; then
- if test "xdf" = x; then
- PROG_NAME=df
- else
- PROG_NAME=df
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
- as_fn_error $? "Cannot continue" "$LINENO" 5
- fi
-
-
-
for ac_prog in gdiff diff
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -4974,6 +4228,65 @@
+ for ac_prog in dirname
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DIRNAME+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $DIRNAME in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+DIRNAME=$ac_cv_path_DIRNAME
+if test -n "$DIRNAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
+$as_echo "$DIRNAME" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$DIRNAME" && break
+done
+
+
+ if test "x$DIRNAME" = x; then
+ if test "xdirname" = x; then
+ PROG_NAME=dirname
+ else
+ PROG_NAME=dirname
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in echo
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5446,6 +4759,65 @@
+ for ac_prog in mktemp
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MKTEMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MKTEMP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MKTEMP=$ac_cv_path_MKTEMP
+if test -n "$MKTEMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
+$as_echo "$MKTEMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$MKTEMP" && break
+done
+
+
+ if test "x$MKTEMP" = x; then
+ if test "xmktemp" = x; then
+ PROG_NAME=mktemp
+ else
+ PROG_NAME=mktemp
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in mv
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5564,6 +4936,124 @@
+ for ac_prog in pwd
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $THEPWDCMD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+THEPWDCMD=$ac_cv_path_THEPWDCMD
+if test -n "$THEPWDCMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
+$as_echo "$THEPWDCMD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$THEPWDCMD" && break
+done
+
+
+ if test "x$THEPWDCMD" = x; then
+ if test "xpwd" = x; then
+ PROG_NAME=thepwdcmd
+ else
+ PROG_NAME=pwd
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
+ for ac_prog in rm
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_RM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $RM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RM="$RM" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+RM=$ac_cv_path_RM
+if test -n "$RM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+$as_echo "$RM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$RM" && break
+done
+
+
+ if test "x$RM" = x; then
+ if test "xrm" = x; then
+ PROG_NAME=rm
+ else
+ PROG_NAME=rm
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in sh
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5977,6 +5467,65 @@
+ for ac_prog in uname
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_UNAME+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $UNAME in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+UNAME=$ac_cv_path_UNAME
+if test -n "$UNAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
+$as_echo "$UNAME" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$UNAME" && break
+done
+
+
+ if test "x$UNAME" = x; then
+ if test "xuname" = x; then
+ PROG_NAME=uname
+ else
+ PROG_NAME=uname
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in uniq
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -6036,65 +5585,6 @@
- for ac_prog in unzip
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_UNZIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $UNZIP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-UNZIP=$ac_cv_path_UNZIP
-if test -n "$UNZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
-$as_echo "$UNZIP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$UNZIP" && break
-done
-
-
- if test "x$UNZIP" = x; then
- if test "xunzip" = x; then
- PROG_NAME=unzip
- else
- PROG_NAME=unzip
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
- as_fn_error $? "Cannot continue" "$LINENO" 5
- fi
-
-
-
for ac_prog in wc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -6154,6 +5644,65 @@
+ for ac_prog in which
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_WHICH+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $WHICH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WHICH="$WHICH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+WHICH=$ac_cv_path_WHICH
+if test -n "$WHICH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WHICH" >&5
+$as_echo "$WHICH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$WHICH" && break
+done
+
+
+ if test "x$WHICH" = x; then
+ if test "xwhich" = x; then
+ PROG_NAME=which
+ else
+ PROG_NAME=which
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in xargs
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -6213,65 +5762,6 @@
- for ac_prog in zip
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ZIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $ZIP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ZIP=$ac_cv_path_ZIP
-if test -n "$ZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
-$as_echo "$ZIP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ZIP" && break
-done
-
-
- if test "x$ZIP" = x; then
- if test "xzip" = x; then
- PROG_NAME=zip
- else
- PROG_NAME=zip
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
- as_fn_error $? "Cannot continue" "$LINENO" 5
- fi
-
-
-
# Then required tools that require some special treatment.
for ac_prog in gawk mawk nawk awk
do
@@ -6700,647 +6190,20 @@
fi
-
- # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
- if test "x$MAKE" != x; then
- # User has supplied a make, test it.
- if test ! -f "$MAKE"; then
- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
- fi
-
- MAKE_CANDIDATE=""$MAKE""
- DESCRIPTION="user supplied MAKE="
- if test "x$MAKE_CANDIDATE" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MAKE_CANDIDATE"
- car="${tmp%% *}"
- tmp="$MAKE_CANDIDATE EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MAKE_CANDIDATE="$car ${cdr% *}"
- else
- MAKE_CANDIDATE="$car"
- fi
-
- MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
- IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
- if test "x$IS_GNU_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
- else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
- if test "x$IS_MODERN_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
- else
- FOUND_MAKE=$MAKE_CANDIDATE
- fi
- fi
- fi
-
- if test "x$FOUND_MAKE" = x; then
- as_fn_error $? "The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer." "$LINENO" 5
- fi
- else
- # Try our hardest to locate a correct version of GNU make
- for ac_prog in gmake
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CHECK_GMAKE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CHECK_GMAKE="$CHECK_GMAKE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CHECK_GMAKE=$ac_cv_path_CHECK_GMAKE
-if test -n "$CHECK_GMAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_GMAKE" >&5
-$as_echo "$CHECK_GMAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CHECK_GMAKE" && break
-done
-
-
- MAKE_CANDIDATE=""$CHECK_GMAKE""
- DESCRIPTION="gmake in PATH"
- if test "x$MAKE_CANDIDATE" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MAKE_CANDIDATE"
- car="${tmp%% *}"
- tmp="$MAKE_CANDIDATE EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MAKE_CANDIDATE="$car ${cdr% *}"
- else
- MAKE_CANDIDATE="$car"
- fi
-
- MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
- IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
- if test "x$IS_GNU_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
- else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
- if test "x$IS_MODERN_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
- else
- FOUND_MAKE=$MAKE_CANDIDATE
- fi
- fi
- fi
-
-
- if test "x$FOUND_MAKE" = x; then
- for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CHECK_MAKE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CHECK_MAKE="$CHECK_MAKE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CHECK_MAKE=$ac_cv_path_CHECK_MAKE
-if test -n "$CHECK_MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_MAKE" >&5
-$as_echo "$CHECK_MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CHECK_MAKE" && break
-done
-
-
- MAKE_CANDIDATE=""$CHECK_MAKE""
- DESCRIPTION="make in PATH"
- if test "x$MAKE_CANDIDATE" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MAKE_CANDIDATE"
- car="${tmp%% *}"
- tmp="$MAKE_CANDIDATE EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MAKE_CANDIDATE="$car ${cdr% *}"
- else
- MAKE_CANDIDATE="$car"
- fi
-
- MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
- IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
- if test "x$IS_GNU_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
- else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
- if test "x$IS_MODERN_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
- else
- FOUND_MAKE=$MAKE_CANDIDATE
- fi
- fi
- fi
-
- fi
-
- if test "x$FOUND_MAKE" = x; then
- if test "x$TOOLS_DIR" != x; then
- # We have a tools-dir, check that as well before giving up.
- OLD_PATH=$PATH
- PATH=$TOOLS_DIR:$PATH
- for ac_prog in gmake
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CHECK_TOOLSDIR_GMAKE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CHECK_TOOLSDIR_GMAKE="$CHECK_TOOLSDIR_GMAKE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CHECK_TOOLSDIR_GMAKE=$ac_cv_path_CHECK_TOOLSDIR_GMAKE
-if test -n "$CHECK_TOOLSDIR_GMAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_GMAKE" >&5
-$as_echo "$CHECK_TOOLSDIR_GMAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CHECK_TOOLSDIR_GMAKE" && break
-done
-
-
- MAKE_CANDIDATE=""$CHECK_TOOLSDIR_GMAKE""
- DESCRIPTION="gmake in tools-dir"
- if test "x$MAKE_CANDIDATE" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MAKE_CANDIDATE"
- car="${tmp%% *}"
- tmp="$MAKE_CANDIDATE EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MAKE_CANDIDATE="$car ${cdr% *}"
- else
- MAKE_CANDIDATE="$car"
- fi
-
- MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
- IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
- if test "x$IS_GNU_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
- else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
- if test "x$IS_MODERN_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
- else
- FOUND_MAKE=$MAKE_CANDIDATE
- fi
- fi
- fi
-
- if test "x$FOUND_MAKE" = x; then
- for ac_prog in make
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $CHECK_TOOLSDIR_MAKE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CHECK_TOOLSDIR_MAKE="$CHECK_TOOLSDIR_MAKE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CHECK_TOOLSDIR_MAKE=$ac_cv_path_CHECK_TOOLSDIR_MAKE
-if test -n "$CHECK_TOOLSDIR_MAKE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_MAKE" >&5
-$as_echo "$CHECK_TOOLSDIR_MAKE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CHECK_TOOLSDIR_MAKE" && break
-done
-
-
- MAKE_CANDIDATE=""$CHECK_TOOLSDIR_MAKE""
- DESCRIPTION="make in tools-dir"
- if test "x$MAKE_CANDIDATE" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
-$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
-
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MAKE_CANDIDATE"
- car="${tmp%% *}"
- tmp="$MAKE_CANDIDATE EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MAKE_CANDIDATE="$car ${cdr% *}"
- else
- MAKE_CANDIDATE="$car"
- fi
-
- MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
- IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
- if test "x$IS_GNU_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
-$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
- else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
- if test "x$IS_MODERN_MAKE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
-$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
- else
- FOUND_MAKE=$MAKE_CANDIDATE
- fi
- fi
- fi
-
- fi
- PATH=$OLD_PATH
- fi
- fi
-
- if test "x$FOUND_MAKE" = x; then
- as_fn_error $? "Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure." "$LINENO" 5
- fi
- fi
-
- MAKE=$FOUND_MAKE
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&5
-$as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
-
-
-
- for ac_prog in rm
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RM+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $RM in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_RM="$RM" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$RM" && break
-done
-
-
- if test "x$RM" = x; then
- if test "xrm" = x; then
- PROG_NAME=rm
- else
- PROG_NAME=rm
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
-$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
- as_fn_error $? "Cannot continue" "$LINENO" 5
- fi
-
-
+# Always force rm.
RM="$RM -f"
-
- # Test if find supports -delete
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
-$as_echo_n "checking if find supports -delete... " >&6; }
- FIND_DELETE="-delete"
-
- DELETEDIR=`mktemp -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
-
- echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
-
- TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
- if test -f $DELETEDIR/TestIfFindSupportsDelete; then
- # No, it does not.
- rm $DELETEDIR/TestIfFindSupportsDelete
- FIND_DELETE="-exec rm \{\} \+"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- fi
- rmdir $DELETEDIR
-
-
-
-# Non-required basic tools
-
-# Extract the first word of "pwd", so it can be a program name with args.
-set dummy pwd; ac_word=$2
+# These are not required on all platforms
+# Extract the first word of "cygpath", so it can be a program name with args.
+set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
+if test "${ac_cv_path_CYGPATH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $THEPWDCMD in
+ case $CYGPATH in
[\\/]* | ?:[\\/]*)
- ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
+ ac_cv_path_CYGPATH="$CYGPATH" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7350,7 +6213,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7361,26 +6224,26 @@
;;
esac
fi
-THEPWDCMD=$ac_cv_path_THEPWDCMD
-if test -n "$THEPWDCMD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
-$as_echo "$THEPWDCMD" >&6; }
+CYGPATH=$ac_cv_path_CYGPATH
+if test -n "$CYGPATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
+$as_echo "$CYGPATH" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-# Extract the first word of "ldd", so it can be a program name with args.
-set dummy ldd; ac_word=$2
+# Extract the first word of "readlink", so it can be a program name with args.
+set dummy readlink; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LDD+set}" = set; then :
+if test "${ac_cv_path_READLINK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $LDD in
+ case $READLINK in
[\\/]* | ?:[\\/]*)
- ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
+ ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7390,7 +6253,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7401,32 +6264,26 @@
;;
esac
fi
-LDD=$ac_cv_path_LDD
-if test -n "$LDD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
-$as_echo "$LDD" >&6; }
+READLINK=$ac_cv_path_READLINK
+if test -n "$READLINK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
+$as_echo "$READLINK" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-if test "x$LDD" = "x"; then
- # List shared lib dependencies is used for
- # debug output and checking for forbidden dependencies.
- # We can build without it.
- LDD="true"
-fi
-# Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
+# Extract the first word of "df", so it can be a program name with args.
+set dummy df; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OTOOL+set}" = set; then :
+if test "${ac_cv_path_DF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $OTOOL in
+ case $DF in
[\\/]* | ?:[\\/]*)
- ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
+ ac_cv_path_DF="$DF" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7436,7 +6293,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7447,31 +6304,26 @@
;;
esac
fi
-OTOOL=$ac_cv_path_OTOOL
-if test -n "$OTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
+DF=$ac_cv_path_DF
+if test -n "$DF"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DF" >&5
+$as_echo "$DF" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-if test "x$OTOOL" = "x"; then
- OTOOL="true"
-fi
-for ac_prog in readelf greadelf
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "SetFile", so it can be a program name with args.
+set dummy SetFile; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_READELF+set}" = set; then :
+if test "${ac_cv_path_SETFILE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $READELF in
+ case $SETFILE in
[\\/]* | ?:[\\/]*)
- ac_cv_path_READELF="$READELF" # Let the user override the test with a path.
+ ac_cv_path_SETFILE="$SETFILE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7481,7 +6333,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7492,439 +6344,996 @@
;;
esac
fi
-READELF=$ac_cv_path_READELF
-if test -n "$READELF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
+SETFILE=$ac_cv_path_SETFILE
+if test -n "$SETFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
+$as_echo "$SETFILE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$READELF" && break
-done
-for ac_prog in objdump gobjdump
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OBJDUMP+set}" = set; then :
+
+# Now we can determine OpenJDK build and target platforms. This is required to
+# have early on.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $OBJDUMP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
-fi
-OBJDUMP=$ac_cv_path_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- test -n "$OBJDUMP" && break
-done
-
-# Extract the first word of "hg", so it can be a program name with args.
-set dummy hg; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HG+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $HG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_HG="$HG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-HG=$ac_cv_path_HG
-if test -n "$HG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5
-$as_echo "$HG" >&6; }
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-# Check if pkg-config is available.
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
+ if test "x$target_alias" = x; then
+ ac_cv_target=$ac_cv_host
+else
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
- ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+ test "$program_prefix$program_suffix$program_transform_name" = \
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
+# is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the
+# product you're building. The target of this build is called "host". Since this is confusing to most people, we
+# have not adopted that system, but use "target" as the platform we are building for. In some places though we need
+# to use the configure naming style.
+
+
+
+
+
+ # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
+ # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
+ # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
+ # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
+ OPENJDK_TARGET_AUTOCONF_NAME="$host"
+ OPENJDK_BUILD_AUTOCONF_NAME="$build"
+
+
+
+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
+
+ case "$build_os" in
+ *linux*)
+ VAR_OS=linux
+ VAR_OS_API=posix
+ VAR_OS_ENV=linux
+ ;;
+ *solaris*)
+ VAR_OS=solaris
+ VAR_OS_API=posix
+ VAR_OS_ENV=solaris
+ ;;
+ *darwin*)
+ VAR_OS=macosx
+ VAR_OS_API=posix
+ VAR_OS_ENV=macosx
+ ;;
+ *bsd*)
+ VAR_OS=bsd
+ VAR_OS_API=posix
+ VAR_OS_ENV=bsd
+ ;;
+ *cygwin*)
+ VAR_OS=windows
+ VAR_OS_API=winapi
+ VAR_OS_ENV=windows.cygwin
+ ;;
+ *mingw*)
+ VAR_OS=windows
+ VAR_OS_API=winapi
+ VAR_OS_ENV=windows.msys
+ ;;
+ *)
+ as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
+ ;;
+ esac
+
+
+ # First argument is the cpu name from the trip/quad
+ case "$build_cpu" in
+ x86_64)
+ VAR_CPU=x86_64
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
+ i?86)
+ VAR_CPU=x86
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
+ arm*)
+ VAR_CPU=arm
+ VAR_CPU_ARCH=arm
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
+ powerpc)
+ VAR_CPU=ppc
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ powerpc64)
+ VAR_CPU=ppc64
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
+ sparc)
+ VAR_CPU=sparc
+ VAR_CPU_ARCH=sparc
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ sparcv9)
+ VAR_CPU=sparcv9
+ VAR_CPU_ARCH=sparc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
+ *)
+ as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
+ ;;
+ esac
+
+ # ..and setup our own variables. (Do this explicitely to facilitate searching)
+ OPENJDK_BUILD_OS="$VAR_OS"
+ OPENJDK_BUILD_OS_API="$VAR_OS_API"
+ OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
+ OPENJDK_BUILD_CPU="$VAR_CPU"
+ OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
+ OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
+ OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
+$as_echo_n "checking openjdk-build os-cpu... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
+$as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
+
+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
+
+ case "$host_os" in
+ *linux*)
+ VAR_OS=linux
+ VAR_OS_API=posix
+ VAR_OS_ENV=linux
+ ;;
+ *solaris*)
+ VAR_OS=solaris
+ VAR_OS_API=posix
+ VAR_OS_ENV=solaris
+ ;;
+ *darwin*)
+ VAR_OS=macosx
+ VAR_OS_API=posix
+ VAR_OS_ENV=macosx
+ ;;
+ *bsd*)
+ VAR_OS=bsd
+ VAR_OS_API=posix
+ VAR_OS_ENV=bsd
+ ;;
+ *cygwin*)
+ VAR_OS=windows
+ VAR_OS_API=winapi
+ VAR_OS_ENV=windows.cygwin
+ ;;
+ *mingw*)
+ VAR_OS=windows
+ VAR_OS_API=winapi
+ VAR_OS_ENV=windows.msys
+ ;;
+ *)
+ as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
+ ;;
+ esac
+
+
+ # First argument is the cpu name from the trip/quad
+ case "$host_cpu" in
+ x86_64)
+ VAR_CPU=x86_64
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
+ i?86)
+ VAR_CPU=x86
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
+ arm*)
+ VAR_CPU=arm
+ VAR_CPU_ARCH=arm
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
+ powerpc)
+ VAR_CPU=ppc
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ powerpc64)
+ VAR_CPU=ppc64
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
+ sparc)
+ VAR_CPU=sparc
+ VAR_CPU_ARCH=sparc
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=big
+ ;;
+ sparcv9)
+ VAR_CPU=sparcv9
+ VAR_CPU_ARCH=sparc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
+ *)
+ as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
+ ;;
+ esac
+
+ # ... and setup our own variables. (Do this explicitely to facilitate searching)
+ OPENJDK_TARGET_OS="$VAR_OS"
+ OPENJDK_TARGET_OS_API="$VAR_OS_API"
+ OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
+ OPENJDK_TARGET_CPU="$VAR_CPU"
+ OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
+ OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
+ OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
+$as_echo_n "checking openjdk-target os-cpu... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
+$as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
+
+
+
+# Check whether --with-target-bits was given.
+if test "${with_target_bits+set}" = set; then :
+ withval=$with_target_bits;
fi
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
+ # We have three types of compiles:
+ # native == normal compilation, target system == build system
+ # cross == traditional cross compilation, target system != build system; special toolchain needed
+ # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
+ #
+ if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
+ # We're doing a proper cross-compilation
+ COMPILE_TYPE="cross"
else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ COMPILE_TYPE="native"
fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-
-fi
-
-# After basic tools have been setup, we can check build os specific details.
-
-###############################################################################
-
-# Note that this is the build platform OS version!
-
-OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
-OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
-OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
-OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
-
-
-
-
-
-# Setup builddeps, for automatic downloading of tools we need.
-# This is needed before we can call BDEPS_CHECK_MODULE, which is done in
-# boot-jdk setup, but we need to have basic tools setup first.
-
-
-# Check whether --with-builddeps-conf was given.
-if test "${with_builddeps_conf+set}" = set; then :
- withval=$with_builddeps_conf;
-fi
-
-
-
-# Check whether --with-builddeps-server was given.
-if test "${with_builddeps_server+set}" = set; then :
- withval=$with_builddeps_server;
-fi
-
-
-
-# Check whether --with-builddeps-dir was given.
-if test "${with_builddeps_dir+set}" = set; then :
- withval=$with_builddeps_dir;
-else
- with_builddeps_dir=/localhome/builddeps
-fi
-
-
-
-# Check whether --with-builddeps-group was given.
-if test "${with_builddeps_group+set}" = set; then :
- withval=$with_builddeps_group;
-fi
-
-
-# Check whether --enable-list-builddeps was given.
-if test "${enable_list_builddeps+set}" = set; then :
- enableval=$enable_list_builddeps; LIST_BUILDDEPS="${enableval}"
-else
- LIST_BUILDDEPS='no'
-fi
-
-
-if test "x$LIST_BUILDDEPS" = xyes; then
- echo
- echo List of build dependencies known to the configure script,
- echo that can be used in builddeps.conf files:
- cat $AUTOCONF_DIR/*.ac $AUTOCONF_DIR/*.m4 | grep BDEPS_CHECK_MODULE\( | cut -f 2 -d ',' | tr -d ' ' | sort
- echo
- exit 1
-fi
-
-
-
- if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
- if test "x$with_builddeps_conf" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
-$as_echo_n "checking for supplied builddeps configuration file... " >&6; }
- builddepsfile=$with_builddeps_conf
- if test -s $builddepsfile; then
- . $builddepsfile
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
-$as_echo "loaded!" >&6; }
- else
- as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
-$as_echo_n "checking for builddeps.conf files in sources...... " >&6; }
- builddepsfile=`mktemp`
- touch $builddepsfile
- # Put all found confs into a single file.
- find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
- # Source the file to acquire the variables
- if test -s $builddepsfile; then
- . $builddepsfile
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
-$as_echo "found at least one!" >&6; }
- else
- as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
- fi
- fi
- # Create build and target names that use _ instead of "-" and ".".
- # This is necessary to use them in variable names.
- build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
- target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
- # Extract rewrite information for build and target
- eval rewritten_build=\${REWRITE_${build_var}}
- if test "x$rewritten_build" = x; then
- rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
- echo Build stays the same $rewritten_build
- else
- echo Rewriting build for builddeps into $rewritten_build
- fi
- eval rewritten_target=\${REWRITE_${target_var}}
- if test "x$rewritten_target" = x; then
- rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
- echo Target stays the same $rewritten_target
- else
- echo Rewriting target for builddeps into $rewritten_target
- fi
- rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
- rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
- fi
- for ac_prog in 7z unzip
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$BDEPS_UNZIP"; then
- ac_cv_prog_BDEPS_UNZIP="$BDEPS_UNZIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_BDEPS_UNZIP="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-BDEPS_UNZIP=$ac_cv_prog_BDEPS_UNZIP
-if test -n "$BDEPS_UNZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_UNZIP" >&5
-$as_echo "$BDEPS_UNZIP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$BDEPS_UNZIP" && break
-done
-
- if test "x$BDEPS_UNZIP" = x7z; then
- BDEPS_UNZIP="7z x"
+ if test "x$with_target_bits" != x; then
+ if test "x$COMPILE_TYPE" = "xcross"; then
+ as_fn_error $? "It is not possible to combine --with-target-bits=X and proper cross-compilation. Choose either." "$LINENO" 5
fi
- for ac_prog in wget lftp ftp
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$BDEPS_FTP"; then
- ac_cv_prog_BDEPS_FTP="$BDEPS_FTP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_BDEPS_FTP="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ if test "x$with_target_bits" = x32 && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ # A reduced build is requested
+ COMPILE_TYPE="reduced"
+ OPENJDK_TARGET_CPU_BITS=32
+ if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
+ OPENJDK_TARGET_CPU=x86
+ elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
+ OPENJDK_TARGET_CPU=sparc
+ else
+ as_fn_error $? "Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9" "$LINENO" 5
+ fi
+ elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ as_fn_error $? "It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead." "$LINENO" 5
+ elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: --with-target-bits are set to build platform address size; argument has no meaning" >&5
+$as_echo "$as_me: --with-target-bits are set to build platform address size; argument has no meaning" >&6;}
+ else
+ as_fn_error $? "--with-target-bits can only be 32 or 64, you specified $with_target_bits!" "$LINENO" 5
+ fi
fi
-done
- done
-IFS=$as_save_IFS
-fi
-fi
-BDEPS_FTP=$ac_cv_prog_BDEPS_FTP
-if test -n "$BDEPS_FTP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_FTP" >&5
-$as_echo "$BDEPS_FTP" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
+$as_echo_n "checking compilation type... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
+$as_echo "$COMPILE_TYPE" >&6; }
+
+
+ if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ REQUIRED_OS_NAME=SunOS
+ REQUIRED_OS_VERSION=5.10
+ fi
+ if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+ REQUIRED_OS_NAME=Linux
+ REQUIRED_OS_VERSION=2.6
+ fi
+ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ REQUIRED_OS_NAME=Windows
+ if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
+ REQUIRED_OS_VERSION=5.2
+ else
+ REQUIRED_OS_VERSION=5.1
+ fi
+ fi
+ if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ REQUIRED_OS_NAME=Darwin
+ REQUIRED_OS_VERSION=11.2
+ fi
+
+
+
+
+
+ # Also store the legacy naming of the cpu.
+ # Ie i586 and amd64 instead of x86 and x86_64
+ OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
+ if test "x$OPENJDK_TARGET_CPU" = xx86; then
+ OPENJDK_TARGET_CPU_LEGACY="i586"
+ elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ # On all platforms except MacOSX replace x86_64 with amd64.
+ OPENJDK_TARGET_CPU_LEGACY="amd64"
+ fi
+
+
+ # And the second legacy naming of the cpu.
+ # Ie i386 and amd64 instead of x86 and x86_64.
+ OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
+ if test "x$OPENJDK_TARGET_CPU" = xx86; then
+ OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
+ elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
+ fi
+
+
+ # This is the name of the cpu (but using i386 and amd64 instead of
+ # x86 and x86_64, respectively), preceeded by a /, to be used when
+ # locating libraries. On macosx, it's empty, though.
+ OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ OPENJDK_TARGET_CPU_LIBDIR=""
+ fi
+
+
+ # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
+ # /amd64 or /sparcv9. This string is appended to some library paths, like this:
+ # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
+ OPENJDK_TARGET_CPU_ISADIR=""
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ OPENJDK_TARGET_CPU_ISADIR="/amd64"
+ elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
+ OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
+ fi
+ fi
+
+
+ # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
+ OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
+ if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
+ # On linux only, we replace x86 with i386.
+ OPENJDK_TARGET_CPU_OSARCH="i386"
+ elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ # On all platforms except macosx, we replace x86_64 with amd64.
+ OPENJDK_TARGET_CPU_OSARCH="amd64"
+ fi
+
+
+ OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
+ if test "x$OPENJDK_TARGET_CPU" = xx86; then
+ OPENJDK_TARGET_CPU_JLI="i386"
+ elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ # On all platforms except macosx, we replace x86_64 with amd64.
+ OPENJDK_TARGET_CPU_JLI="amd64"
+ fi
+ # Now setup the -D flags for building libjli.
+ OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
+ OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
+ elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
+ OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
+ fi
+ fi
+
+
+ # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
+ if test "x$OPENJDK_TARGET_OS_API" = xposix; then
+ OPENJDK_TARGET_OS_API_DIR="solaris"
+ fi
+ if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
+ OPENJDK_TARGET_OS_API_DIR="windows"
+ fi
+
+
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ A_LP64="LP64:="
+ # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
+ # unpack200.exe
+ if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ ADD_LP64="-D_LP64=1"
+ fi
+ fi
+ LP64=$A_LP64
+
+
+ if test "x$COMPILE_TYPE" = "xcross"; then
+ # FIXME: ... or should this include reduced builds..?
+ DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
+ else
+ DEFINE_CROSS_COMPILE_ARCH=""
+ fi
+
+
+
+
+# Continue setting up basic stuff. Most remaining code require fundamental tools.
+
+# Locate the directory of this script.
+SCRIPT="$0"
+
+ if test "x$OPENJDK_BUILD_OS" != xwindows; then
+ # Follow a chain of symbolic links. Use readlink
+ # where it exists, else fall back to horribly
+ # complicated shell code.
+ if test "x$READLINK_TESTED" != yes; then
+ # On MacOSX there is a readlink tool with a different
+ # purpose than the GNU readlink tool. Check the found readlink.
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
+ if test "x$ISGNU" = x; then
+ # A readlink that we do not know how to use.
+ # Are there other non-GNU readlinks out there?
+ READLINK_TESTED=yes
+ READLINK=
+ fi
+ fi
+
+ if test "x$READLINK" != x; then
+ SCRIPT=`$READLINK -f $SCRIPT`
+ else
+ STARTDIR=$PWD
+ COUNTER=0
+ sym_link_dir=`$DIRNAME $SCRIPT`
+ sym_link_file=`$BASENAME $SCRIPT`
+ while test $COUNTER -lt 20; do
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ if test "x$ISLINK" == x; then
+ # This is not a symbolic link! We are done!
+ break
+ fi
+ # The link might be relative! We have to use cd to travel safely.
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
+ let COUNTER=COUNTER+1
+ done
+ cd $STARTDIR
+ SCRIPT=$sym_link_dir/$sym_link_file
+ fi
+ fi
+
+AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
+
+# Where is the source? It is located two levels above the configure script.
+CURDIR="$PWD"
+cd "$AUTOCONF_DIR/../.."
+SRC_ROOT="`pwd`"
+
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ PATH_SEP=";"
+
+ SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
+ if test $SRC_ROOT_LENGTH -gt 100; then
+ as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
+ fi
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin release" >&5
+$as_echo_n "checking cygwin release... " >&6; }
+ CYGWIN_VERSION=`$UNAME -r`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_VERSION" >&5
+$as_echo "$CYGWIN_VERSION" >&6; }
+ WINDOWS_ENV_VENDOR='cygwin'
+ WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
+
+ CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.`
+ if test "x$CYGWIN_VERSION_OK" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5
+$as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+ if test "x$CYGPATH" = x; then
+ as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
+$as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
+ # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
+ cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
+ # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
+ CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_ROOT_PATH" >&5
+$as_echo "$CYGWIN_ROOT_PATH" >&6; }
+ WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
+ test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
+ fi
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys release" >&5
+$as_echo_n "checking msys release... " >&6; }
+ MSYS_VERSION=`$UNAME -r`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_VERSION" >&5
+$as_echo "$MSYS_VERSION" >&6; }
+
+ WINDOWS_ENV_VENDOR='msys'
+ WINDOWS_ENV_VERSION="$MSYS_VERSION"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys root directory as unix-style path" >&5
+$as_echo_n "checking msys root directory as unix-style path... " >&6; }
+ # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
+ MSYS_ROOT_PATH=`cd / ; cmd /c cd | grep ".*"`
+
+ windows_path="$MSYS_ROOT_PATH"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ MSYS_ROOT_PATH="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ MSYS_ROOT_PATH="$unix_path"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_ROOT_PATH" >&5
+$as_echo "$MSYS_ROOT_PATH" >&6; }
+ WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
+ else
+ as_fn_error $? "Unknown Windows environment. Neither cygwin nor msys was detected." "$LINENO" 5
+ fi
+
+ # Test if windows or unix (cygwin/msys) find is first in path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what kind of 'find' is first on the PATH" >&5
+$as_echo_n "checking what kind of 'find' is first on the PATH... " >&6; }
+ FIND_BINARY_OUTPUT=`find --version 2>&1`
+ if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unix style" >&5
+$as_echo "unix style" >&6; }
+ elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
+$as_echo "Windows" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools." >&5
+$as_echo "$as_me: Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This will not work. Please correct and make sure /usr/bin (or similar) is first in path." >&5
+$as_echo "$as_me: This will not work. Please correct and make sure /usr/bin (or similar) is first in path." >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: It seems that your find utility is non-standard." >&5
+$as_echo "$as_me: WARNING: It seems that your find utility is non-standard." >&2;}
+ fi
+
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ PATH_SEP=":"
fi
- test -n "$BDEPS_FTP" && break
-done
+
+cd "$CURDIR"
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$SRC_ROOT"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of SRC_ROOT" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ SRC_ROOT="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting SRC_ROOT to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting SRC_ROOT to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$SRC_ROOT"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ SRC_ROOT="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting SRC_ROOT to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting SRC_ROOT to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$SRC_ROOT"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$CURDIR"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of CURDIR" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ CURDIR="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$CURDIR"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ CURDIR="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$CURDIR"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+
+if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
+ # Add extra search paths on solaris for utilities like ar and as etc...
+ PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
+fi
+
+# You can force the sys-root if the sys-root encoded into the cross compiler tools
+# is not correct.
+
+# Check whether --with-sys-root was given.
+if test "${with_sys_root+set}" = set; then :
+ withval=$with_sys_root;
+fi
+
+
+if test "x$with_sys_root" != x; then
+ SYS_ROOT=$with_sys_root
+else
+ SYS_ROOT=/
+fi
-###############################################################################
-#
-# Determine OpenJDK variants, options and version numbers.
-#
-###############################################################################
+# Check whether --with-tools-dir was given.
+if test "${with_tools_dir+set}" = set; then :
+ withval=$with_tools_dir; TOOLS_DIR=$with_tools_dir
+fi
-# We need build & target for this.
+
+
+# Check whether --with-devkit was given.
+if test "${with_devkit+set}" = set; then :
+ withval=$with_devkit;
+ if test "x$with_sys_root" != x; then
+ as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
+ fi
+ if test "x$with_tools_dir" != x; then
+ as_fn_error $? "Cannot specify both --with-devkit and --with-tools-dir at the same time" "$LINENO" 5
+ fi
+ TOOLS_DIR=$with_devkit/bin
+ SYS_ROOT=$with_devkit/$host_alias/libc
+
+fi
+
+
+
+
+# Setup default logging of stdout and stderr to build.log in the output root.
+BUILD_LOG='$(OUTPUT_ROOT)/build.log'
+BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
+BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+
+
+
+
+
+# These are needed to be able to create a configuration name (and thus the output directory)
###############################################################################
#
@@ -7969,8 +7378,8 @@
# ie normal interpreter and C1, only the serial GC, kernel jvmti etc
# zero: no machine code interpreter, no compiler
# zeroshark: zero interpreter and shark/llvm compiler backend
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM that should be built" >&5
-$as_echo_n "checking which variants of the JVM that should be built... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
+$as_echo_n "checking which variants of the JVM to build... " >&6; }
# Check whether --with-jvm-variants was given.
if test "${with_jvm_variants+set}" = set; then :
@@ -8151,6 +7560,2687 @@
+# With basic setup done, call the custom early hook.
+
+
+# To properly create a configuration name, we need to have the OpenJDK target
+# and options (variants and debug level) parsed.
+
+
+
+# Check whether --with-conf-name was given.
+if test "${with_conf_name+set}" = set; then :
+ withval=$with_conf_name; CONF_NAME=${with_conf_name}
+fi
+
+
+# Test from where we are running configure, in or outside of src root.
+if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+ # We are running configure from the src root.
+ # Create a default ./build/target-variant-debuglevel output root.
+ if test "x${CONF_NAME}" = x; then
+ CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
+ fi
+ OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
+ $MKDIR -p "$OUTPUT_ROOT"
+ if test ! -d "$OUTPUT_ROOT"; then
+ as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
+ fi
+else
+ # We are running configure from outside of the src dir.
+ # Then use the current directory as output dir!
+ # If configuration is situated in normal build directory, just use the build
+ # directory name as configuration name, otherwise use the complete path.
+ if test "x${CONF_NAME}" = x; then
+ CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
+ fi
+ OUTPUT_ROOT="$CURDIR"
+
+ # WARNING: This might be a bad thing to do. You need to be sure you want to
+ # have a configuration in this directory. Do some sanity checks!
+
+ if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
+ # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
+ # other files
+ files_present=`$LS $OUTPUT_ROOT`
+ if test "x$files_present" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
+$as_echo "$as_me: Current directory is $CURDIR." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Since this is not the source root, configure will output the configuration here" >&5
+$as_echo "$as_me: Since this is not the source root, configure will output the configuration here" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&5
+$as_echo "$as_me: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: However, this directory is not empty. This is not allowed, since it could" >&5
+$as_echo "$as_me: However, this directory is not empty. This is not allowed, since it could" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: seriously mess up just about everything." >&5
+$as_echo "$as_me: seriously mess up just about everything." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Try 'cd $SRC_ROOT' and restart configure" >&5
+$as_echo "$as_me: Try 'cd $SRC_ROOT' and restart configure" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (or create a new empty directory and cd to it)." >&5
+$as_echo "$as_me: (or create a new empty directory and cd to it)." >&6;}
+ as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
+$as_echo_n "checking what configuration name to use... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
+$as_echo "$CONF_NAME" >&6; }
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$OUTPUT_ROOT"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of OUTPUT_ROOT" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ OUTPUT_ROOT="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OUTPUT_ROOT to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting OUTPUT_ROOT to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$OUTPUT_ROOT"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ OUTPUT_ROOT="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OUTPUT_ROOT to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting OUTPUT_ROOT to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$OUTPUT_ROOT"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+
+SPEC=$OUTPUT_ROOT/spec.gmk
+
+CONF_NAME=$CONF_NAME
+
+OUTPUT_ROOT=$OUTPUT_ROOT
+
+
+# Most of the probed defines are put into config.h
+ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
+
+# The spec.gmk file contains all variables for the make system.
+ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
+
+# The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
+ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
+
+# The bootcycle-spec.gmk file contains support for boot cycle builds.
+ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
+
+# The compare.sh is used to compare the build output to other builds.
+ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
+
+# Spec.sh is currently used by compare-objects.sh
+ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
+
+# The generated Makefile knows where the spec.gmk is and where the source is.
+# You can run make from the OUTPUT_ROOT, or from the top-level Makefile
+# which will look for generated configurations
+ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
+
+
+# Save the arguments given to us
+echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
+
+
+# Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
+
+ for ac_prog in apt-get yum port pkgutil pkgadd
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKGHANDLER"; then
+ ac_cv_prog_PKGHANDLER="$PKGHANDLER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKGHANDLER="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKGHANDLER=$ac_cv_prog_PKGHANDLER
+if test -n "$PKGHANDLER"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGHANDLER" >&5
+$as_echo "$PKGHANDLER" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$PKGHANDLER" && break
+done
+
+
+
+# Setup tools that requires more complex handling, or that is not needed by the configure script.
+
+
+ # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
+ if test "x$MAKE" != x; then
+ # User has supplied a make, test it.
+ if test ! -f "$MAKE"; then
+ as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
+ fi
+
+ MAKE_CANDIDATE=""$MAKE""
+ DESCRIPTION="user supplied MAKE=$MAKE"
+ if test "x$MAKE_CANDIDATE" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
+$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
+ MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+ IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+ if test "x$IS_GNU_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
+$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
+ else
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ if test "x$IS_MODERN_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
+$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ as_fn_error $? "Unknown Windows environment" "$LINENO" 5
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
+$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ FOUND_MAKE="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
+ fi
+
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_MAKE" = x; then
+ as_fn_error $? "The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer." "$LINENO" 5
+ fi
+ else
+ # Try our hardest to locate a correct version of GNU make
+ for ac_prog in gmake
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CHECK_GMAKE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CHECK_GMAKE="$CHECK_GMAKE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CHECK_GMAKE=$ac_cv_path_CHECK_GMAKE
+if test -n "$CHECK_GMAKE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_GMAKE" >&5
+$as_echo "$CHECK_GMAKE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CHECK_GMAKE" && break
+done
+
+
+ MAKE_CANDIDATE=""$CHECK_GMAKE""
+ DESCRIPTION="gmake in PATH"
+ if test "x$MAKE_CANDIDATE" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
+$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
+ MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+ IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+ if test "x$IS_GNU_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
+$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
+ else
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ if test "x$IS_MODERN_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
+$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ as_fn_error $? "Unknown Windows environment" "$LINENO" 5
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
+$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ FOUND_MAKE="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
+ fi
+
+ fi
+ fi
+ fi
+ fi
+
+
+ if test "x$FOUND_MAKE" = x; then
+ for ac_prog in make
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CHECK_MAKE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CHECK_MAKE="$CHECK_MAKE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CHECK_MAKE=$ac_cv_path_CHECK_MAKE
+if test -n "$CHECK_MAKE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_MAKE" >&5
+$as_echo "$CHECK_MAKE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CHECK_MAKE" && break
+done
+
+
+ MAKE_CANDIDATE=""$CHECK_MAKE""
+ DESCRIPTION="make in PATH"
+ if test "x$MAKE_CANDIDATE" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
+$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
+ MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+ IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+ if test "x$IS_GNU_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
+$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
+ else
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ if test "x$IS_MODERN_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
+$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ as_fn_error $? "Unknown Windows environment" "$LINENO" 5
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
+$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ FOUND_MAKE="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
+ fi
+
+ fi
+ fi
+ fi
+ fi
+
+ fi
+
+ if test "x$FOUND_MAKE" = x; then
+ if test "x$TOOLS_DIR" != x; then
+ # We have a tools-dir, check that as well before giving up.
+ OLD_PATH=$PATH
+ PATH=$TOOLS_DIR:$PATH
+ for ac_prog in gmake
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CHECK_TOOLSDIR_GMAKE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CHECK_TOOLSDIR_GMAKE="$CHECK_TOOLSDIR_GMAKE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CHECK_TOOLSDIR_GMAKE=$ac_cv_path_CHECK_TOOLSDIR_GMAKE
+if test -n "$CHECK_TOOLSDIR_GMAKE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_GMAKE" >&5
+$as_echo "$CHECK_TOOLSDIR_GMAKE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CHECK_TOOLSDIR_GMAKE" && break
+done
+
+
+ MAKE_CANDIDATE=""$CHECK_TOOLSDIR_GMAKE""
+ DESCRIPTION="gmake in tools-dir"
+ if test "x$MAKE_CANDIDATE" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
+$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
+ MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+ IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+ if test "x$IS_GNU_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
+$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
+ else
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ if test "x$IS_MODERN_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
+$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ as_fn_error $? "Unknown Windows environment" "$LINENO" 5
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
+$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ FOUND_MAKE="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
+ fi
+
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_MAKE" = x; then
+ for ac_prog in make
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CHECK_TOOLSDIR_MAKE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CHECK_TOOLSDIR_MAKE="$CHECK_TOOLSDIR_MAKE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CHECK_TOOLSDIR_MAKE=$ac_cv_path_CHECK_TOOLSDIR_MAKE
+if test -n "$CHECK_TOOLSDIR_MAKE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_TOOLSDIR_MAKE" >&5
+$as_echo "$CHECK_TOOLSDIR_MAKE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CHECK_TOOLSDIR_MAKE" && break
+done
+
+
+ MAKE_CANDIDATE=""$CHECK_TOOLSDIR_MAKE""
+ DESCRIPTION="make in tools-dir"
+ if test "x$MAKE_CANDIDATE" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&5
+$as_echo "$as_me: Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION" >&6;}
+ MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+ IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+ if test "x$IS_GNU_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
+$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
+ else
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ if test "x$IS_MODERN_MAKE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
+$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
+ else
+ if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ MAKE_EXPECTED_ENV='cygwin'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ MAKE_EXPECTED_ENV='msys'
+ else
+ as_fn_error $? "Unknown Windows environment" "$LINENO" 5
+ fi
+ MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+ IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+ else
+ # Not relevant for non-Windows
+ IS_MAKE_CORRECT_ENV=true
+ fi
+ if test "x$IS_MAKE_CORRECT_ENV" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&5
+$as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring." >&6;}
+ else
+ FOUND_MAKE=$MAKE_CANDIDATE
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$FOUND_MAKE"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ FOUND_MAKE="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
+ fi
+
+ fi
+ fi
+ fi
+ fi
+
+ fi
+ PATH=$OLD_PATH
+ fi
+ fi
+
+ if test "x$FOUND_MAKE" = x; then
+ as_fn_error $? "Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure." "$LINENO" 5
+ fi
+ fi
+
+ MAKE=$FOUND_MAKE
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&5
+$as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
+
+
+
+ # Test if find supports -delete
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
+$as_echo_n "checking if find supports -delete... " >&6; }
+ FIND_DELETE="-delete"
+
+ DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
+
+ echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
+
+ TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
+ if test -f $DELETEDIR/TestIfFindSupportsDelete; then
+ # No, it does not.
+ rm $DELETEDIR/TestIfFindSupportsDelete
+ FIND_DELETE="-exec rm \{\} \+"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+ rmdir $DELETEDIR
+
+
+
+# These tools might not be installed by default,
+# need hint on how to install them.
+
+ for ac_prog in unzip
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_UNZIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $UNZIP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+UNZIP=$ac_cv_path_UNZIP
+if test -n "$UNZIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
+$as_echo "$UNZIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$UNZIP" && break
+done
+
+
+ if test "x$UNZIP" = x; then
+ if test "xunzip" = x; then
+ PROG_NAME=unzip
+ else
+ PROG_NAME=unzip
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
+ for ac_prog in zip
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ZIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ZIP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ZIP=$ac_cv_path_ZIP
+if test -n "$ZIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
+$as_echo "$ZIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ZIP" && break
+done
+
+
+ if test "x$ZIP" = x; then
+ if test "xzip" = x; then
+ PROG_NAME=zip
+ else
+ PROG_NAME=zip
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
+# Non-required basic tools
+
+# Extract the first word of "ldd", so it can be a program name with args.
+set dummy ldd; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LDD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $LDD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+LDD=$ac_cv_path_LDD
+if test -n "$LDD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
+$as_echo "$LDD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$LDD" = "x"; then
+ # List shared lib dependencies is used for
+ # debug output and checking for forbidden dependencies.
+ # We can build without it.
+ LDD="true"
+fi
+# Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_OTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $OTOOL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+OTOOL=$ac_cv_path_OTOOL
+if test -n "$OTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$OTOOL" = "x"; then
+ OTOOL="true"
+fi
+for ac_prog in readelf greadelf
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_READELF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $READELF in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_READELF="$READELF" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+READELF=$ac_cv_path_READELF
+if test -n "$READELF"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
+$as_echo "$READELF" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$READELF" && break
+done
+
+# Extract the first word of "hg", so it can be a program name with args.
+set dummy hg; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_HG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $HG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_HG="$HG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+HG=$ac_cv_path_HG
+if test -n "$HG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5
+$as_echo "$HG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "stat", so it can be a program name with args.
+set dummy stat; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_STAT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $STAT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_STAT="$STAT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+STAT=$ac_cv_path_STAT
+if test -n "$STAT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5
+$as_echo "$STAT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "time", so it can be a program name with args.
+set dummy time; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_TIME+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $TIME in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_TIME="$TIME" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+TIME=$ac_cv_path_TIME
+if test -n "$TIME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5
+$as_echo "$TIME" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+
+ for ac_prog in comm
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_COMM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $COMM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+COMM=$ac_cv_path_COMM
+if test -n "$COMM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
+$as_echo "$COMM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$COMM" && break
+done
+
+
+ if test "x$COMM" = x; then
+ if test "xcomm" = x; then
+ PROG_NAME=comm
+ else
+ PROG_NAME=comm
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+fi
+
+
+# Check if pkg-config is available.
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
+# After basic tools have been setup, we can check build os specific details.
+
+###############################################################################
+
+# Note that this is the build platform OS version!
+
+OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
+OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
+OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
+OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
+
+
+
+
+
+# Setup builddeps, for automatic downloading of tools we need.
+# This is needed before we can call BDEPS_CHECK_MODULE, which is done in
+# boot-jdk setup, but we need to have basic tools setup first.
+
+
+# Check whether --with-builddeps-conf was given.
+if test "${with_builddeps_conf+set}" = set; then :
+ withval=$with_builddeps_conf;
+fi
+
+
+
+# Check whether --with-builddeps-server was given.
+if test "${with_builddeps_server+set}" = set; then :
+ withval=$with_builddeps_server;
+fi
+
+
+
+# Check whether --with-builddeps-dir was given.
+if test "${with_builddeps_dir+set}" = set; then :
+ withval=$with_builddeps_dir;
+else
+ with_builddeps_dir=/localhome/builddeps
+fi
+
+
+
+# Check whether --with-builddeps-group was given.
+if test "${with_builddeps_group+set}" = set; then :
+ withval=$with_builddeps_group;
+fi
+
+
+
+
+ if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
+ if test "x$with_builddeps_conf" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
+$as_echo_n "checking for supplied builddeps configuration file... " >&6; }
+ builddepsfile=$with_builddeps_conf
+ if test -s $builddepsfile; then
+ . $builddepsfile
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
+$as_echo "loaded!" >&6; }
+ else
+ as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
+$as_echo_n "checking for builddeps.conf files in sources...... " >&6; }
+ builddepsfile=`mktemp`
+ touch $builddepsfile
+ # Put all found confs into a single file.
+ find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
+ # Source the file to acquire the variables
+ if test -s $builddepsfile; then
+ . $builddepsfile
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
+$as_echo "found at least one!" >&6; }
+ else
+ as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
+ fi
+ fi
+ # Create build and target names that use _ instead of "-" and ".".
+ # This is necessary to use them in variable names.
+ build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
+ target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
+ # Extract rewrite information for build and target
+ eval rewritten_build=\${REWRITE_${build_var}}
+ if test "x$rewritten_build" = x; then
+ rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
+ echo Build stays the same $rewritten_build
+ else
+ echo Rewriting build for builddeps into $rewritten_build
+ fi
+ eval rewritten_target=\${REWRITE_${target_var}}
+ if test "x$rewritten_target" = x; then
+ rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
+ echo Target stays the same $rewritten_target
+ else
+ echo Rewriting target for builddeps into $rewritten_target
+ fi
+ rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
+ rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
+ fi
+ for ac_prog in 7z unzip
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$BDEPS_UNZIP"; then
+ ac_cv_prog_BDEPS_UNZIP="$BDEPS_UNZIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_BDEPS_UNZIP="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+BDEPS_UNZIP=$ac_cv_prog_BDEPS_UNZIP
+if test -n "$BDEPS_UNZIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_UNZIP" >&5
+$as_echo "$BDEPS_UNZIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$BDEPS_UNZIP" && break
+done
+
+ if test "x$BDEPS_UNZIP" = x7z; then
+ BDEPS_UNZIP="7z x"
+ fi
+
+ for ac_prog in wget lftp ftp
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$BDEPS_FTP"; then
+ ac_cv_prog_BDEPS_FTP="$BDEPS_FTP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_BDEPS_FTP="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+BDEPS_FTP=$ac_cv_prog_BDEPS_FTP
+if test -n "$BDEPS_FTP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BDEPS_FTP" >&5
+$as_echo "$BDEPS_FTP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$BDEPS_FTP" && break
+done
+
+
+
+###############################################################################
+#
+# Determine OpenJDK variants, options and version numbers.
+#
+###############################################################################
+
+# We need build & target for this.
+
###############################################################################
#
@@ -8159,46 +10249,49 @@
# Check whether --enable-openjdk-only was given.
if test "${enable_openjdk_only+set}" = set; then :
enableval=$enable_openjdk_only;
+else
+ enable_openjdk_only="no"
fi
-if test "x$enable_openjdk_only" = "xyes"; then
- OPENJDK=true
-elif test "x$enable_openjdk_only" = "xno"; then
- OPENJDK=false
-elif test -d "$SRC_ROOT/jdk/src/closed"; then
- OPENJDK=false
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
+$as_echo_n "checking for presence of closed sources... " >&6; }
+if test -d "$SRC_ROOT/jdk/src/closed"; then
+ CLOSED_SOURCE_PRESENT=yes
else
+ CLOSED_SOURCE_PRESENT=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
+$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is supressed (openjdk-only)" >&5
+$as_echo_n "checking if closed source is supressed (openjdk-only)... " >&6; }
+SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPRESS_CLOSED_SOURCE" >&5
+$as_echo "$SUPRESS_CLOSED_SOURCE" >&6; }
+
+if test "x$CLOSED_SOURCE_PRESENT" = xno; then
+ OPENJDK=true
+ if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
+$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
+ fi
+else
+ if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
OPENJDK=true
+ else
+ OPENJDK=false
+ fi
fi
if test "x$OPENJDK" = "xtrue"; then
- SET_OPENJDK=OPENJDK=true
+ SET_OPENJDK="OPENJDK=true"
fi
###############################################################################
#
-# JIGSAW or not. The JIGSAW variable is used during the intermediate
-# stage when we are building both the old style JDK and the new style modularized JDK.
-# When the modularized JDK is finalized, this option will go away.
-#
-# Check whether --enable-jigsaw was given.
-if test "${enable_jigsaw+set}" = set; then :
- enableval=$enable_jigsaw;
-fi
-
-
-if test "x$enable_jigsaw" = "xyes"; then
- JIGSAW=true
-else
- JIGSAW=false
-fi
-
-
-###############################################################################
-#
# Should we build a JDK/JVM with headful support (ie a graphical ui)?
# We always build headless support.
#
@@ -8233,28 +10326,6 @@
-###############################################################################
-#
-# Should we compile nimbus swing L&F? We can probably remove this option
-# since nimbus is officially part of javax now.
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build nimbus L&F" >&5
-$as_echo_n "checking whether to build nimbus L&F... " >&6; }
-# Check whether --enable-nimbus was given.
-if test "${enable_nimbus+set}" = set; then :
- enableval=$enable_nimbus; ENABLE_NIMBUS="${enableval}"
-else
- ENABLE_NIMBUS='yes'
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_NIMBUS" >&5
-$as_echo "$ENABLE_NIMBUS" >&6; }
-DISABLE_NIMBUS=
-if test "x$ENABLE_NIMBUS" = xno; then
- DISABLE_NIMBUS=true
-fi
-
-
# Control wether Hotspot runs Queens test after build.
# Check whether --enable-hotspot-test-in-build was given.
if test "${enable_hotspot_test_in_build+set}" = set; then :
@@ -8293,45 +10364,27 @@
###############################################################################
#
-# Compress jars
+# Enable or disable unlimited crypto
#
-COMPRESS_JARS=false
+# Check whether --enable-unlimited-crypto was given.
+if test "${enable_unlimited_crypto+set}" = set; then :
+ enableval=$enable_unlimited_crypto;
+else
+ enable_unlimited_crypto=no
+fi
+if test "x$enable_unlimited_crypto" = "xyes"; then
+ UNLIMITED_CRYPTO=true
+else
+ UNLIMITED_CRYPTO=false
+fi
###############################################################################
#
-# Should we compile JFR
-# default no, except for on closed-jdk
+# Compress jars
#
-ENABLE_JFR=no
-
-# Is the JFR source present
-
-#
-# For closed default is yes
-#
-if test "x${OPENJDK}" != "xtrue"; then
- ENABLE_JFR=yes
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
-$as_echo_n "checking whether to build jfr... " >&6; }
-# Check whether --enable-jfr was given.
-if test "${enable_jfr+set}" = set; then :
- enableval=$enable_jfr;
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ENABLE_JFR}" >&5
-$as_echo "${ENABLE_JFR}" >&6; }
-
-if test "x$ENABLE_JFR" = "xyes"; then
- ENABLE_JFR=true
-elif test "x$ENABLE_JFR" = "xno"; then
- ENABLE_JFR=false
-else
- as_fn_error $? "Invalid argument to --enable-jfr" "$LINENO" 5
-fi
+COMPRESS_JARS=false
@@ -8354,6 +10407,8 @@
+
+
COPYRIGHT_YEAR=`date +'%Y'`
@@ -8381,7 +10436,7 @@
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
# Avoid [:alnum:] since it depends on the locale.
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
- USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
+ USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
fi
@@ -8389,93 +10444,6 @@
-# To properly create a configuration name, we need to have the OpenJDK target
-# and options (variants and debug level) parsed.
-
-
-
-# Check whether --with-conf-name was given.
-if test "${with_conf_name+set}" = set; then :
- withval=$with_conf_name; CONF_NAME=${with_conf_name}
-fi
-
-
-# Test from where we are running configure, in or outside of src root.
-if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
- # We are running configure from the src root.
- # Create a default ./build/target-variant-debuglevel output root.
- if test "x${CONF_NAME}" = x; then
- CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
- fi
- OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
- mkdir -p "$OUTPUT_ROOT"
- if test ! -d "$OUTPUT_ROOT"; then
- as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
- fi
-else
- # We are running configure from outside of the src dir.
- # Then use the current directory as output dir!
- # If configuration is situated in normal build directory, just use the build
- # directory name as configuration name, otherwise use the complete path.
- if test "x${CONF_NAME}" = x; then
- CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
- fi
- OUTPUT_ROOT="$CURDIR"
-fi
-
-
- # Fail with message the path to the output root if var OUTPUT_ROOT contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$OUTPUT_ROOT" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- OUTPUT_ROOT=`$CYGPATH -s -m -a "$OUTPUT_ROOT"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- OUTPUT_ROOT=`$ECHO "$OUTPUT_ROOT" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- OUTPUT_ROOT=`$CYGPATH -u "$OUTPUT_ROOT"`
- else
- as_fn_error $? "You cannot have spaces in the path to the output root! \"$OUTPUT_ROOT\"" "$LINENO" 5
- fi
- fi
-
-
-SPEC=$OUTPUT_ROOT/spec.gmk
-
-CONF_NAME=$CONF_NAME
-
-OUTPUT_ROOT=$OUTPUT_ROOT
-
-
-# Most of the probed defines are put into config.h
-ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
-
-# The spec.gmk file contains all variables for the make system.
-ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
-
-# The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
-ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
-
-# The bootcycle-spec.gmk file contains support for boot cycle builds.
-ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
-
-# The compare.sh is used to compare the build output to other builds.
-ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
-
-# Spec.sh is currently used by compare-objects.sh
-ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
-
-# The generated Makefile knows where the spec.gmk is and where the source is.
-# You can run make from the OUTPUT_ROOT, or from the top-level Makefile
-# which will look for generated configurations
-ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
-
-
-# Save the arguments given to us
-echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
-
-
###############################################################################
#
# Setup BootJDK, used to bootstrap the build.
@@ -8546,26 +10514,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -8768,26 +10843,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -8802,12 +10984,126 @@
# Now execute the test
if test "x$JAVA_HOME" != x; then
- if test "x$OPENJDK_TARGET_OS" = xwindows; then
- # On Windows, JAVA_HOME is likely in DOS-style
- JAVA_HOME_PROCESSED="`$CYGPATH -u "$JAVA_HOME"`"
- else
- JAVA_HOME_PROCESSED="$JAVA_HOME"
- fi
+ JAVA_HOME_PROCESSED="$JAVA_HOME"
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$JAVA_HOME_PROCESSED"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of JAVA_HOME_PROCESSED" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ JAVA_HOME_PROCESSED="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$JAVA_HOME_PROCESSED"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ JAVA_HOME_PROCESSED="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting JAVA_HOME_PROCESSED to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$JAVA_HOME_PROCESSED"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
if test ! -d "$JAVA_HOME_PROCESSED"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
$as_echo "$as_me: Your JAVA_HOME points to a non-existing directory!" >&6;}
@@ -8859,26 +11155,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -8937,26 +11340,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9060,75 +11570,14 @@
# Linux/GNU systems often have links from /usr/bin/java to
# /etc/alternatives/java to the real JDK binary.
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$BINARY"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$BINARY"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- BINARY="$tmp"
-
-
if test "x$OPENJDK_BUILD_OS" != xwindows; then
# Follow a chain of symbolic links. Use readlink
# where it exists, else fall back to horribly
# complicated shell code.
- # Extract the first word of "readlink", so it can be a program name with args.
-set dummy readlink; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_READLINK+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $READLINK in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-READLINK=$ac_cv_path_READLINK
-if test -n "$READLINK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
-$as_echo "$READLINK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink.
- ISGNU=`$READLINK --help 2>&1 | grep GNU`
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then
# A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there?
@@ -9142,23 +11591,25 @@
else
STARTDIR=$PWD
COUNTER=0
- DIR=`dirname $BINARY`
- FIL=`basename $BINARY`
+ sym_link_dir=`$DIRNAME $BINARY`
+ sym_link_file=`$BASENAME $BINARY`
while test $COUNTER -lt 20; do
- ISLINK=`ls -l $DIR/$FIL | grep '\->' | sed -e 's/.*-> \(.*\)/\1/'`
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done!
break
fi
# The link might be relative! We have to use cd to travel safely.
- cd $DIR
- cd `dirname $ISLINK`
- DIR=`pwd`
- FIL=`basename $ISLINK`
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1
done
cd $STARTDIR
- BINARY=$DIR/$FIL
+ BINARY=$sym_link_dir/$sym_link_file
fi
fi
@@ -9210,26 +11661,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9249,19 +11807,209 @@
# Now execute the test
if test "x$ProgramW6432" != x; then
+ VIRTUAL_DIR="$ProgramW6432/Java"
- BOOT_JDK_PREFIX="`$CYGPATH -u "$ProgramW6432"`/Java"
+ windows_path="$VIRTUAL_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VIRTUAL_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VIRTUAL_DIR="$unix_path"
+ fi
+
+
+ BOOT_JDK_PREFIX="$VIRTUAL_DIR"
BOOT_JDK_SUFFIX=""
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
fi
@@ -9302,26 +12050,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9334,19 +12189,209 @@
# Now execute the test
if test "x$PROGRAMW6432" != x; then
+ VIRTUAL_DIR="$PROGRAMW6432/Java"
- BOOT_JDK_PREFIX="`$CYGPATH -u "$PROGRAMW6432"`/Java"
+ windows_path="$VIRTUAL_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VIRTUAL_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VIRTUAL_DIR="$unix_path"
+ fi
+
+
+ BOOT_JDK_PREFIX="$VIRTUAL_DIR"
BOOT_JDK_SUFFIX=""
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
fi
@@ -9387,26 +12432,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9419,19 +12571,209 @@
# Now execute the test
if test "x$PROGRAMFILES" != x; then
+ VIRTUAL_DIR="$PROGRAMFILES/Java"
- BOOT_JDK_PREFIX="`$CYGPATH -u "$PROGRAMFILES"`/Java"
+ windows_path="$VIRTUAL_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VIRTUAL_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VIRTUAL_DIR="$unix_path"
+ fi
+
+
+ BOOT_JDK_PREFIX="$VIRTUAL_DIR"
BOOT_JDK_SUFFIX=""
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
fi
@@ -9472,26 +12814,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9504,19 +12953,209 @@
# Now execute the test
if test "x$ProgramFiles" != x; then
+ VIRTUAL_DIR="$ProgramFiles/Java"
- BOOT_JDK_PREFIX="`$CYGPATH -u "$ProgramFiles"`/Java"
+ windows_path="$VIRTUAL_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VIRTUAL_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VIRTUAL_DIR="$unix_path"
+ fi
+
+
+ BOOT_JDK_PREFIX="$VIRTUAL_DIR"
BOOT_JDK_SUFFIX=""
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
fi
@@ -9557,26 +13196,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9590,16 +13336,195 @@
BOOT_JDK_PREFIX="/cygdrive/c/Program Files/Java"
BOOT_JDK_SUFFIX=""
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
# If previous step claimed to have found a JDK, check it to see if it seems to be valid.
if test "x$BOOT_JDK_FOUND" = xmaybe; then
@@ -9638,26 +13563,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9672,16 +13704,195 @@
BOOT_JDK_PREFIX="/Library/Java/JavaVirtualMachines"
BOOT_JDK_SUFFIX="/Contents/Home"
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
# If previous step claimed to have found a JDK, check it to see if it seems to be valid.
if test "x$BOOT_JDK_FOUND" = xmaybe; then
@@ -9720,26 +13931,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9753,16 +14071,195 @@
BOOT_JDK_PREFIX="/System/Library/Java/JavaVirtualMachines"
BOOT_JDK_SUFFIX="/Contents/Home"
- BEST_JDK_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $GREP jdk | $SORT -r | $HEAD -n 1 `
- if test "x$BEST_JDK_FOUND" != x; then
- BOOT_JDK="${BOOT_JDK_PREFIX}/${BEST_JDK_FOUND}${BOOT_JDK_SUFFIX}"
- if test -d "$BOOT_JDK"; then
- BOOT_JDK_FOUND=maybe
- { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&5
-$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX)" >&6;}
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
# If previous step claimed to have found a JDK, check it to see if it seems to be valid.
if test "x$BOOT_JDK_FOUND" = xmaybe; then
@@ -9801,26 +14298,501 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ elif test "x$OPENJDK_TARGET_OS" = xlinux; then
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK_PREFIX="/usr/lib/jvm"
+ BOOT_JDK_SUFFIX=""
+ ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
+ if test "x$ALL_JDKS_FOUND" != x; then
+ for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
+
+ if test "x$BOOT_JDK_FOUND" = xno; then
+ # Now execute the test
+
+ BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
+ if test -d "$BOOT_JDK"; then
+ BOOT_JDK_FOUND=maybe
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&5
+$as_echo "$as_me: Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)" >&6;}
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
+ fi # end check jdk version
+ fi # end check rt.jar
+ fi # end check javac
+ fi # end check java
+ fi # end check boot jdk found
+ fi
+
+ done
+ fi
+
+
+ # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
+ if test "x$BOOT_JDK_FOUND" = xmaybe; then
+ # Do we have a bin/java?
+ if test ! -x "$BOOT_JDK/bin/java"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have a bin/javac?
+ if test ! -x "$BOOT_JDK/bin/javac"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (This might be an JRE instead of an JDK)" >&5
+$as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Do we have an rt.jar? (On MacOSX it is called classes.jar)
+ if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
+ if test "x$FOUND_VERSION_78" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
+$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: (Your Boot JDK must be version 7 or 8)" >&5
+$as_echo "$as_me: (Your Boot JDK must be version 7 or 8)" >&6;}
+ BOOT_JDK_FOUND=no
+ else
+ # We're done! :-)
+ BOOT_JDK_FOUND=yes
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
+$as_echo_n "checking for Boot JDK... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -9868,26 +14840,133 @@
# We're done! :-)
BOOT_JDK_FOUND=yes
- # Fail with message the path to the Boot JDK if var BOOT_JDK contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$BOOT_JDK" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- BOOT_JDK=`$CYGPATH -s -m -a "$BOOT_JDK"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- BOOT_JDK=`$ECHO "$BOOT_JDK" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- BOOT_JDK=`$CYGPATH -u "$BOOT_JDK"`
- else
- as_fn_error $? "You cannot have spaces in the path to the Boot JDK! \"$BOOT_JDK\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$BOOT_JDK"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of BOOT_JDK" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$BOOT_JDK"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ BOOT_JDK="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BOOT_JDK to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting BOOT_JDK to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$BOOT_JDK"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
$as_echo_n "checking for Boot JDK... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK ($BOOT_JDK_VERSION)" >&5
-$as_echo "$BOOT_JDK ($BOOT_JDK_VERSION)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK" >&5
+$as_echo "$BOOT_JDK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
+$as_echo_n "checking Boot JDK version... " >&6; }
+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
+$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
fi # end check rt.jar
fi # end check javac
@@ -10465,16 +15544,13 @@
+# Locate the actual tools
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-# Check if the VS env variables were setup prior to running configure.
-# If not, then find vcvarsall.bat and run it automatically, and integrate
-# the set env variables into the spec file.
-SETUPDEVENV="# No special vars"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # Store path to cygwin link.exe to help excluding it when searching for
- # VS linker.
- # Extract the first word of "link", so it can be a program name with args.
+ # Store path to cygwin link.exe to help excluding it when searching for
+ # VS linker. This must be done before changing the PATH when looking for VS.
+ # Extract the first word of "link", so it can be a program name with args.
set dummy link; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -10514,6 +15590,7 @@
fi
+ if test "x$CYGWIN_LINK" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the first found link.exe is actually the Cygwin link tool" >&5
$as_echo_n "checking if the first found link.exe is actually the Cygwin link tool... " >&6; }
"$CYGWIN_LINK" --version > /dev/null
@@ -10526,124 +15603,862 @@
# This might be the VS linker. Don't exclude it later on.
CYGWIN_LINK=""
fi
+ fi
- # If vcvarsall.bat has been run, then VCINSTALLDIR is set.
- if test "x$VCINSTALLDIR" != x; then
- # No further setup is needed. The build will happen from this kind
- # of shell.
- SETUPDEVENV="# This spec file expects that you are running bash from within a VS command prompt."
- # Make sure to remind you, if you forget to run make from a cygwin bash shell
- # that is spawned "bash -l" from a VS command prompt.
- CHECK_FOR_VCINSTALLDIR=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if you are running from within a VS command prompt" >&5
-$as_echo_n "checking if you are running from within a VS command prompt... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ # First-hand choice is to locate and run the vsvars bat file.
+
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VCVARSFILE="vc/bin/vcvars32.bat"
+ else
+ VCVARSFILE="vc/bin/amd64/vcvars64.bat"
+ fi
+
+ VS_ENV_CMD=""
+ VS_ENV_ARGS=""
+ if test "x$with_toolsdir" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="$with_toolsdir/../.."
+ METHOD="--with-tools-dir"
+
+ windows_path="$VS100BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VS100BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VS100BASE="$unix_path"
+ fi
+
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
+$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+
+ if test "x$with_toolsdir" != x && test "x$VS_ENV_CMD" = x; then
+ # Having specified an argument which is incorrect will produce an instant failure;
+ # we should not go on looking
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path given by --with-tools-dir does not contain a valid Visual Studio installation" >&5
+$as_echo "$as_me: The path given by --with-tools-dir does not contain a valid Visual Studio installation" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Please point to the VC/bin directory within the Visual Studio installation" >&5
+$as_echo "$as_me: Please point to the VC/bin directory within the Visual Studio installation" >&6;}
+ as_fn_error $? "Cannot locate a valid Visual Studio installation" "$LINENO" 5
+ fi
+
+ if test "x$ProgramW6432" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin"
+ METHOD="well-known name"
+
+ windows_path="$WIN_SDK_BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ WIN_SDK_BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ WIN_SDK_BASE="$unix_path"
+ fi
+
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
+$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+ if test "x$PROGRAMW6432" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="$PROGRAMW6432/Microsoft SDKs/Windows/v7.1/Bin"
+ METHOD="well-known name"
+
+ windows_path="$WIN_SDK_BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ WIN_SDK_BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ WIN_SDK_BASE="$unix_path"
+ fi
+
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
+$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+ if test "x$PROGRAMFILES" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="$PROGRAMFILES/Microsoft SDKs/Windows/v7.1/Bin"
+ METHOD="well-known name"
+
+ windows_path="$WIN_SDK_BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ WIN_SDK_BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ WIN_SDK_BASE="$unix_path"
+ fi
+
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
+$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin"
+ METHOD="well-known name"
+
+ windows_path="$WIN_SDK_BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ WIN_SDK_BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ WIN_SDK_BASE="$unix_path"
+ fi
+
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
+$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin"
+ METHOD="well-known name"
+
+ windows_path="$WIN_SDK_BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ WIN_SDK_BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ WIN_SDK_BASE="$unix_path"
+ fi
+
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
+$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&5
+$as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+
+ if test "x$VS100COMNTOOLS" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="$VS100COMNTOOLS/../.."
+ METHOD="VS100COMNTOOLS variable"
+
+ windows_path="$VS100BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VS100BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VS100BASE="$unix_path"
+ fi
+
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
+$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+ if test "x$PROGRAMFILES" != x; then
+
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="$PROGRAMFILES/Microsoft Visual Studio 10.0"
+ METHOD="well-known name"
+
+ windows_path="$VS100BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VS100BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VS100BASE="$unix_path"
+ fi
+
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
+$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+ fi
+
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="C:/Program Files/Microsoft Visual Studio 10.0"
+ METHOD="well-known name"
+
+ windows_path="$VS100BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VS100BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VS100BASE="$unix_path"
+ fi
+
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
+$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="C:/Program Files (x86)/Microsoft Visual Studio 10.0"
+ METHOD="well-known name"
+
+ windows_path="$VS100BASE"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ VS100BASE="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ VS100BASE="$unix_path"
+ fi
+
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5
+$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5
+$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;}
+ fi
+ fi
+ fi
+
+
+ if test "x$VS_ENV_CMD" != x; then
+ # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file.
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$VS_ENV_CMD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
else
- # Ah, we have not yet run vcvarsall.bat/vsvars32.bat/vsvars64.bat. Lets do that. First find it.
- if test "x$VS100COMNTOOLS" != x; then
- VARSBAT=`find "$VS100COMNTOOLS/../.." -name vcvarsall.bat`
- SEARCH_ROOT="$VS100COMNTOOLS"
- else
- VARSBAT=`find "$PROGRAMFILES" -name vcvarsall.bat`
- SEARCH_ROOT="$PROGRAMFILES"
- fi
- VCPATH=`dirname "$VARSBAT"`
- VCPATH=`cygpath -w "$VCPATH"`
- if test "x$VARSBAT" = x || test ! -d "$VCPATH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can find the VS installation" >&5
-$as_echo_n "checking if we can find the VS installation... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Tried to find a VS installation using both $SEARCH_ROOT but failed. Please run \"c:\\cygwin\\bin\\bash.exe -l\" from a VS command prompt and then run configure/make from there." "$LINENO" 5
- fi
- case "$OPENJDK_TARGET_CPU" in
- x86)
- VARSBAT_ARCH=x86
- ;;
- x86_64)
- VARSBAT_ARCH=amd64
- ;;
- esac
- # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
- cd $OUTPUT_ROOT
- bash $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH"
- cd $CURDIR
- if test ! -s $OUTPUT_ROOT/localdevenv.sh || test ! -s $OUTPUT_ROOT/localdevenv.gmk; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can extract the needed env variables" >&5
-$as_echo_n "checking if we can extract the needed env variables... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Could not succesfully extract the env variables needed for the VS setup. Please run \"c:\\cygwin\\bin\\bash.exe -l\" from a VS command prompt and then run configure/make from there." "$LINENO" 5
- fi
- # Now set all paths and other env variables. This will allow the rest of
- # the configure script to find and run the compiler in the proper way.
- . $OUTPUT_ROOT/localdevenv.sh
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can find the VS installation" >&5
-$as_echo_n "checking if we can find the VS installation... " >&6; }
- if test "x$VCINSTALLDIR" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VCINSTALLDIR" >&5
-$as_echo "$VCINSTALLDIR" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Could not find VS installation. Please install. If you are sure you have installed VS, then please run \"c:\\cygwin\\bin\\bash.exe -l\" from a VS command prompt and then run configure/make from there." "$LINENO" 5
- fi
- CHECK_FOR_VCINSTALLDIR=no
- SETUPDEVENV="include $OUTPUT_ROOT/localdevenv.gmk"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$VS_ENV_CMD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$VS_ENV_CMD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ VS_ENV_CMD="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
+ fi
+
+
+ # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
+$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
+ cd $OUTPUT_ROOT
+ # FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
+ # to autoconf standards.
+
+ #----
+
+ # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
+ # but calculate the difference in Cygwin environment before/after running it and then
+ # apply the diff.
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ _vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
+ _dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
+ _dosbash=`cygpath -a -w -s \`which bash\`.*`
+ else
+ _dosvs10varsall=`cmd //c echo $VS_ENV_CMD`
+ _dosbash=`cmd //c echo \`which bash\``
+ fi
+
+ # generate the set of exported vars before/after the vs10 setup
+ $ECHO "@echo off" > localdevenvtmp.bat
+ $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
+ $ECHO "call $_dosvs10varsall $VS_ENV_ARGS" >> localdevenvtmp.bat
+ $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
+
+ # Now execute the newly created bat file.
+ # The | cat is to stop SetEnv.Cmd to mess with system colors on msys
+ cmd /c localdevenvtmp.bat | cat
+
+ # apply the diff (less some non-vs10 vars named by "!")
+ $SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
+ $SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
+ $COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
+
+ # cleanup
+ $RM localdevenvtmp*
+ #----
+ cd $CURDIR
+ if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
+$as_echo "$as_me: Could not succesfully extract the envionment variables needed for the VS setup." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
+$as_echo "$as_me: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
+$as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+ # Now set all paths and other env variables. This will allow the rest of
+ # the configure script to find and run the compiler in the proper way.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
+$as_echo "$as_me: Setting extracted environment variables" >&6;}
+ . $OUTPUT_ROOT/localdevenv.sh
+ else
+ # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
+$as_echo "$as_me: Cannot locate a valid Visual Studio installation, checking current environment" >&6;}
+ fi
+
+ # At this point, we should have corrent variables in the environment, or we can't continue.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Visual Studio variables" >&5
+$as_echo_n "checking for Visual Studio variables... " >&6; }
+
+ if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
+ if test "x$INCLUDE" = x || test "x$LIB" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: present but broken" >&5
+$as_echo "present but broken" >&6; }
+ as_fn_error $? "Your VC command prompt seems broken, INCLUDE and/or LIB is missing." "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ VS_INCLUDE="$INCLUDE"
+ VS_LIB="$LIB"
+ VS_PATH="$PATH"
+
+
+
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+ if test "x$VS_ENV_CMD" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio or Windows SDK installation on disk," >&5
+$as_echo "$as_me: Cannot locate a valid Visual Studio or Windows SDK installation on disk," >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: nor is this script run from a Visual Studio command prompt." >&5
+$as_echo "$as_me: nor is this script run from a Visual Studio command prompt." >&6;}
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Running the extraction script failed." >&5
+$as_echo "$as_me: Running the extraction script failed." >&6;}
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
+$as_echo "$as_me: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
+$as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
$as_echo_n "checking for msvcr100.dll... " >&6; }
-# Check whether --with-msvcr100dll was given.
-if test "${with_msvcr100dll+set}" = set; then :
- withval=$with_msvcr100dll;
+# Check whether --with-msvcr-dll was given.
+if test "${with_msvcr_dll+set}" = set; then :
+ withval=$with_msvcr_dll;
fi
- if test "x$with_msvcr100dll" != x; then
- MSVCR100DLL="$with_msvcr100dll"
- else
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x64 | head --lines 1`
- else
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
- if test "x$MSVCR100DLL" = x; then
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | head --lines 1`
- fi
- fi
+ if test "x$with_msvcr_dll" != x; then
+ MSVCR_DLL="$with_msvcr_dll"
+ else
+ if test "x$VCINSTALLDIR" != x; then
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1`
+ else
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
+ if test "x$MSVCR_DLL" = x; then
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1`
fi
- if test "x$MSVCR100DLL" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ fi
+ if test "x$MSVCR_DLL" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&5
+$as_echo "$as_me: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&5
+$as_echo "$as_me: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
+ fi
+ fi
+ if test "x$MSVCR_DLL" = x; then
+ if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5
+$as_echo "$as_me: msvcr100.dll found in $SYSTEMROOT/system32" >&6;}
+ MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll"
+ fi
+ fi
+ fi
+ if test "x$MSVCR_DLL" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "Could not find msvcr100.dll !" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR100DLL" >&5
-$as_echo "$MSVCR100DLL" >&6; }
+ as_fn_error $? "Could not find msvcr100.dll !" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
- # Fail with message the path to msvcr100.dll if var MSVCR100DLL contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$MSVCR100DLL" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- MSVCR100DLL=`$CYGPATH -s -m -a "$MSVCR100DLL"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- MSVCR100DLL=`$ECHO "$MSVCR100DLL" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- MSVCR100DLL=`$CYGPATH -u "$MSVCR100DLL"`
- else
- as_fn_error $? "You cannot have spaces in the path to msvcr100.dll! \"$MSVCR100DLL\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$MSVCR_DLL"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of MSVCR_DLL" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ MSVCR_DLL="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$MSVCR_DLL"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ MSVCR_DLL="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$MSVCR_DLL"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
fi
+ fi
+
+
fi
-
-# Locate the actual tools
-
# If --build AND --host is set, then the configure script will find any
# cross compilation tools in the PATH. Cross compilation tools
# follows the cross compilation standard where they are prefixed with ${host}.
@@ -10707,47 +16522,245 @@
done
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$BUILD_CC"
- car="${tmp%% *}"
- tmp="$BUILD_CC EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- BUILD_CC="$car ${cdr% *}"
- else
- BUILD_CC="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ BUILD_CC="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
+ fi
for ac_prog in cl CC g++
do
@@ -10795,47 +16808,245 @@
done
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$BUILD_CXX"
- car="${tmp%% *}"
- tmp="$BUILD_CXX EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- BUILD_CXX="$car ${cdr% *}"
- else
- BUILD_CXX="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ BUILD_CXX="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
+ fi
# Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2
@@ -10878,47 +17089,245 @@
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$BUILD_LD"
- car="${tmp%% *}"
- tmp="$BUILD_LD EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_LD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_LD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$BUILD_LD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- BUILD_LD="$car ${cdr% *}"
- else
- BUILD_LD="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ BUILD_LD="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
+ fi
fi
@@ -11102,16 +17511,874 @@
PATH=$TOOLS_DIR:$PATH
fi
+
+### Locate C compiler (CC)
+
# gcc is almost always present, but on Windows we
# prefer cl.exe and on Solaris we prefer CC.
# Thus test for them in this order.
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Do not probe for cc on MacOSX.
+ COMPILER_CHECK_LIST="cl gcc"
+else
+ COMPILER_CHECK_LIST="cl cc gcc"
+fi
+
+
+ COMPILER_NAME=C
+
+ # Do a first initial attempt at searching the list of compiler names.
+ # AC_PATH_PROGS can't be run multiple times with the same variable,
+ # so create a new name for this run.
+ for ac_prog in $COMPILER_CHECK_LIST
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $POTENTIAL_CC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_POTENTIAL_CC="$POTENTIAL_CC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+POTENTIAL_CC=$ac_cv_path_POTENTIAL_CC
+if test -n "$POTENTIAL_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CC" >&5
+$as_echo "$POTENTIAL_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$POTENTIAL_CC" && break
+done
+
+ CC=$POTENTIAL_CC
+
+ if test "x$$CC" = x; then
+
+ # Print a helpful message on how to acquire the necessary build dependency.
+ # devkit is the help tag: freetyp2, cups, pulse, alsa etc
+ MISSING_DEPENDENCY=devkit
+ PKGHANDLER_COMMAND=
+
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
+
+ as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
+ fi
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of CC, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving CC (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ CC="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;}
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
+$as_echo_n "checking resolved symbolic links for CC... " >&6; }
+ TEST_COMPILER="$CC"
+
+ if test "x$OPENJDK_BUILD_OS" != xwindows; then
+ # Follow a chain of symbolic links. Use readlink
+ # where it exists, else fall back to horribly
+ # complicated shell code.
+ if test "x$READLINK_TESTED" != yes; then
+ # On MacOSX there is a readlink tool with a different
+ # purpose than the GNU readlink tool. Check the found readlink.
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
+ if test "x$ISGNU" = x; then
+ # A readlink that we do not know how to use.
+ # Are there other non-GNU readlinks out there?
+ READLINK_TESTED=yes
+ READLINK=
+ fi
+ fi
+
+ if test "x$READLINK" != x; then
+ TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
+ else
+ STARTDIR=$PWD
+ COUNTER=0
+ sym_link_dir=`$DIRNAME $TEST_COMPILER`
+ sym_link_file=`$BASENAME $TEST_COMPILER`
+ while test $COUNTER -lt 20; do
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ if test "x$ISLINK" == x; then
+ # This is not a symbolic link! We are done!
+ break
+ fi
+ # The link might be relative! We have to use cd to travel safely.
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
+ let COUNTER=COUNTER+1
+ done
+ cd $STARTDIR
+ TEST_COMPILER=$sym_link_dir/$sym_link_file
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
+$as_echo "$TEST_COMPILER" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5
+$as_echo_n "checking if CC is disguised ccache... " >&6; }
+
+ COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
+ if test "x$COMPILER_BASENAME" = "xccache"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
+$as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
+ # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
+ # We want to control ccache invocation ourselves, so ignore this cc and try
+ # searching again.
+
+ # Remove the path to the fake ccache cc from the PATH
+ RETRY_COMPILER_SAVED_PATH="$PATH"
+ COMPILER_DIRNAME=`$DIRNAME $CC`
+ PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
+
+ # Try again looking for our compiler
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in $COMPILER_CHECK_LIST
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PROPER_COMPILER_CC"; then
+ ac_cv_prog_PROPER_COMPILER_CC="$PROPER_COMPILER_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PROPER_COMPILER_CC=$ac_cv_prog_PROPER_COMPILER_CC
+if test -n "$PROPER_COMPILER_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
+$as_echo "$PROPER_COMPILER_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$PROPER_COMPILER_CC" && break
+ done
+fi
+if test -z "$PROPER_COMPILER_CC"; then
+ ac_ct_PROPER_COMPILER_CC=$PROPER_COMPILER_CC
+ for ac_prog in $COMPILER_CHECK_LIST
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PROPER_COMPILER_CC"; then
+ ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_ct_PROPER_COMPILER_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PROPER_COMPILER_CC=$ac_cv_prog_ac_ct_PROPER_COMPILER_CC
+if test -n "$ac_ct_PROPER_COMPILER_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PROPER_COMPILER_CC" >&5
+$as_echo "$ac_ct_PROPER_COMPILER_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PROPER_COMPILER_CC" && break
+done
+
+ if test "x$ac_ct_PROPER_COMPILER_CC" = x; then
+ PROPER_COMPILER_CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PROPER_COMPILER_CC=$ac_ct_PROPER_COMPILER_CC
+ fi
+fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ PROPER_COMPILER_CC="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;}
+ fi
+
+ PATH="$RETRY_COMPILER_SAVED_PATH"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CC" >&5
+$as_echo_n "checking for resolved symbolic links for CC... " >&6; }
+
+ if test "x$OPENJDK_BUILD_OS" != xwindows; then
+ # Follow a chain of symbolic links. Use readlink
+ # where it exists, else fall back to horribly
+ # complicated shell code.
+ if test "x$READLINK_TESTED" != yes; then
+ # On MacOSX there is a readlink tool with a different
+ # purpose than the GNU readlink tool. Check the found readlink.
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
+ if test "x$ISGNU" = x; then
+ # A readlink that we do not know how to use.
+ # Are there other non-GNU readlinks out there?
+ READLINK_TESTED=yes
+ READLINK=
+ fi
+ fi
+
+ if test "x$READLINK" != x; then
+ PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
+ else
+ STARTDIR=$PWD
+ COUNTER=0
+ sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
+ sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
+ while test $COUNTER -lt 20; do
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ if test "x$ISLINK" == x; then
+ # This is not a symbolic link! We are done!
+ break
+ fi
+ # The link might be relative! We have to use cd to travel safely.
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
+ let COUNTER=COUNTER+1
+ done
+ cd $STARTDIR
+ PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
+$as_echo "$PROPER_COMPILER_CC" >&6; }
+ CC="$PROPER_COMPILER_CC"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CC" >&5
+$as_echo "no, keeping CC" >&6; }
+ CC="$TEST_COMPILER"
+ fi
+
+ COMPILER=$CC
+ COMPILER_NAME=$COMPILER_NAME
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
+ COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
+ $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
+ if test $? -ne 0; then
+ GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
+$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
+$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
+ as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
+ else
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
+ COMPILER_VENDOR="Sun Studio"
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # First line typically looks something like:
+ # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
+ COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
+ COMPILER_VENDOR="Microsoft CL.EXE"
+ COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
+ if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
+ if test "x$COMPILER_CPU_TEST" != "x80x86"; then
+ as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
+ fi
+ elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+ if test "x$COMPILER_CPU_TEST" != "xx64"; then
+ as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
+ fi
+ fi
+ else
+ COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+ # Check that this is likely to be GCC.
+ $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
+ if test $? -ne 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
+$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
+$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
+ as_fn_error $? "GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
+ fi
+
+ # First line typically looks something like:
+ # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \([1-9][0-9.]*\)/\1/p"`
+ COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
+ fi
+ # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
+ CC_VERSION="$COMPILER_VERSION"
+ # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
+ CC_VENDOR="$COMPILER_VENDOR"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
+$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
+
+
+# Now that we have resolved CC ourself, let autoconf have it's go at it
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl cc gcc
+ for ac_prog in $CC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -11155,7 +18422,7 @@
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl cc gcc
+ for ac_prog in $CC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11703,7 +18970,69 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "x$CC" = x; then
+
+### Locate C++ compiler (CXX)
+
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Do not probe for CC on MacOSX.
+ COMPILER_CHECK_LIST="cl g++"
+else
+ COMPILER_CHECK_LIST="cl CC g++"
+fi
+
+ COMPILER_NAME=C++
+
+ # Do a first initial attempt at searching the list of compiler names.
+ # AC_PATH_PROGS can't be run multiple times with the same variable,
+ # so create a new name for this run.
+ for ac_prog in $COMPILER_CHECK_LIST
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $POTENTIAL_CXX in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_POTENTIAL_CXX="$POTENTIAL_CXX" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+POTENTIAL_CXX=$ac_cv_path_POTENTIAL_CXX
+if test -n "$POTENTIAL_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CXX" >&5
+$as_echo "$POTENTIAL_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$POTENTIAL_CXX" && break
+done
+
+ CXX=$POTENTIAL_CXX
+
+ if test "x$$CXX" = x; then
# Print a helpful message on how to acquire the necessary build dependency.
# devkit is the help tag: freetyp2, cups, pulse, alsa etc
@@ -11729,56 +19058,775 @@
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
fi
- as_fn_error $? "Could not find a compiler. $HELP_MSG" "$LINENO" 5
-fi
-if test "x$CC" = xcc && test "x$OPENJDK_BUILD_OS" = xmacosx; then
- # Do not use cc on MacOSX use gcc instead.
- CC="gcc"
-fi
+ as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
+ fi
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$CC"
- car="${tmp%% *}"
- tmp="$CC EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of CXX, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving CXX (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ CXX="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;}
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
+$as_echo_n "checking resolved symbolic links for CXX... " >&6; }
+ TEST_COMPILER="$CXX"
+
+ if test "x$OPENJDK_BUILD_OS" != xwindows; then
+ # Follow a chain of symbolic links. Use readlink
+ # where it exists, else fall back to horribly
+ # complicated shell code.
+ if test "x$READLINK_TESTED" != yes; then
+ # On MacOSX there is a readlink tool with a different
+ # purpose than the GNU readlink tool. Check the found readlink.
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
+ if test "x$ISGNU" = x; then
+ # A readlink that we do not know how to use.
+ # Are there other non-GNU readlinks out there?
+ READLINK_TESTED=yes
+ READLINK=
+ fi
+ fi
+
+ if test "x$READLINK" != x; then
+ TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
+ else
+ STARTDIR=$PWD
+ COUNTER=0
+ sym_link_dir=`$DIRNAME $TEST_COMPILER`
+ sym_link_file=`$BASENAME $TEST_COMPILER`
+ while test $COUNTER -lt 20; do
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ if test "x$ISLINK" == x; then
+ # This is not a symbolic link! We are done!
+ break
+ fi
+ # The link might be relative! We have to use cd to travel safely.
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
+ let COUNTER=COUNTER+1
+ done
+ cd $STARTDIR
+ TEST_COMPILER=$sym_link_dir/$sym_link_file
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
+$as_echo "$TEST_COMPILER" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5
+$as_echo_n "checking if CXX is disguised ccache... " >&6; }
+
+ COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
+ if test "x$COMPILER_BASENAME" = "xccache"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
+$as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
+ # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
+ # We want to control ccache invocation ourselves, so ignore this cc and try
+ # searching again.
+
+ # Remove the path to the fake ccache cc from the PATH
+ RETRY_COMPILER_SAVED_PATH="$PATH"
+ COMPILER_DIRNAME=`$DIRNAME $CXX`
+ PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
+
+ # Try again looking for our compiler
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in $COMPILER_CHECK_LIST
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PROPER_COMPILER_CXX"; then
+ ac_cv_prog_PROPER_COMPILER_CXX="$PROPER_COMPILER_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PROPER_COMPILER_CXX=$ac_cv_prog_PROPER_COMPILER_CXX
+if test -n "$PROPER_COMPILER_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
+$as_echo "$PROPER_COMPILER_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$PROPER_COMPILER_CXX" && break
+ done
+fi
+if test -z "$PROPER_COMPILER_CXX"; then
+ ac_ct_PROPER_COMPILER_CXX=$PROPER_COMPILER_CXX
+ for ac_prog in $COMPILER_CHECK_LIST
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
+ ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_ct_PROPER_COMPILER_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PROPER_COMPILER_CXX=$ac_cv_prog_ac_ct_PROPER_COMPILER_CXX
+if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PROPER_COMPILER_CXX" >&5
+$as_echo "$ac_ct_PROPER_COMPILER_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PROPER_COMPILER_CXX" && break
+done
+
+ if test "x$ac_ct_PROPER_COMPILER_CXX" = x; then
+ PROPER_COMPILER_CXX=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PROPER_COMPILER_CXX=$ac_ct_PROPER_COMPILER_CXX
+ fi
+fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
fi
- if test "x$cdr" != xEOL; then
- CC="$car ${cdr% *}"
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$PROPER_COMPILER_CXX"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ PROPER_COMPILER_CXX="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;}
+ fi
+
+ PATH="$RETRY_COMPILER_SAVED_PATH"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CXX" >&5
+$as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
+
+ if test "x$OPENJDK_BUILD_OS" != xwindows; then
+ # Follow a chain of symbolic links. Use readlink
+ # where it exists, else fall back to horribly
+ # complicated shell code.
+ if test "x$READLINK_TESTED" != yes; then
+ # On MacOSX there is a readlink tool with a different
+ # purpose than the GNU readlink tool. Check the found readlink.
+ ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
+ if test "x$ISGNU" = x; then
+ # A readlink that we do not know how to use.
+ # Are there other non-GNU readlinks out there?
+ READLINK_TESTED=yes
+ READLINK=
+ fi
+ fi
+
+ if test "x$READLINK" != x; then
+ PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
+ else
+ STARTDIR=$PWD
+ COUNTER=0
+ sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
+ sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
+ while test $COUNTER -lt 20; do
+ ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ if test "x$ISLINK" == x; then
+ # This is not a symbolic link! We are done!
+ break
+ fi
+ # The link might be relative! We have to use cd to travel safely.
+ cd $sym_link_dir
+ # ... and we must get the to the absolute path, not one using symbolic links.
+ cd `pwd -P`
+ cd `$DIRNAME $ISLINK`
+ sym_link_dir=`$THEPWDCMD`
+ sym_link_file=`$BASENAME $ISLINK`
+ let COUNTER=COUNTER+1
+ done
+ cd $STARTDIR
+ PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
+$as_echo "$PROPER_COMPILER_CXX" >&6; }
+ CXX="$PROPER_COMPILER_CXX"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CXX" >&5
+$as_echo "no, keeping CXX" >&6; }
+ CXX="$TEST_COMPILER"
+ fi
+
+ COMPILER=$CXX
+ COMPILER_NAME=$COMPILER_NAME
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
+ COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
+ $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
+ if test $? -ne 0; then
+ GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
+$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
+$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
+ as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
else
- CC="$car"
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
+ COMPILER_VENDOR="Sun Studio"
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # First line typically looks something like:
+ # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
+ COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
+ COMPILER_VENDOR="Microsoft CL.EXE"
+ COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
+ if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
+ if test "x$COMPILER_CPU_TEST" != "x80x86"; then
+ as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
+ fi
+ elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+ if test "x$COMPILER_CPU_TEST" != "xx64"; then
+ as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
+ fi
+ fi
+ else
+ COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+ # Check that this is likely to be GCC.
+ $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
+ if test $? -ne 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
+$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
+$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
+ as_fn_error $? "GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
fi
+ # First line typically looks something like:
+ # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \([1-9][0-9.]*\)/\1/p"`
+ COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
+ fi
+ # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
+ CXX_VERSION="$COMPILER_VERSION"
+ # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
+ CXX_VENDOR="$COMPILER_VENDOR"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
+$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
+
+
+# Now that we have resolved CXX ourself, let autoconf have it's go at it
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11789,7 +19837,7 @@
CXX=$CCC
else
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl CC g++
+ for ac_prog in $CXX
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -11833,7 +19881,7 @@
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in cl CC g++
+ for ac_prog in $CXX
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12036,85 +20084,10 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "x$CXX" = xCC && test "x$OPENJDK_BUILD_OS" = xmacosx; then
- # The found CC, even though it seems to be a g++ derivate, cannot compile
- # c++ code. Override.
- CXX="g++"
-fi
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$CXX"
- car="${tmp%% *}"
- tmp="$CXX EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+### Locate other tools
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
-
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
- fi
- car="$tmp"
-
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- CXX="$car ${cdr% *}"
- else
- CXX="$car"
- fi
-
-
-if test "x$CXX" = x || test "x$CC" = x; then
-
- # Print a helpful message on how to acquire the necessary build dependency.
- # devkit is the help tag: freetyp2, cups, pulse, alsa etc
- MISSING_DEPENDENCY=devkit
- PKGHANDLER_COMMAND=
-
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
-
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
- fi
-
- as_fn_error $? "Could not find the needed compilers! $HELP_MSG " "$LINENO" 5
-fi
-
-if test "x$OPENJDK_BUILD_OS" != xwindows; then
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
ac_ext=m
ac_cpp='$OBJCPP $CPPFLAGS'
ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12367,47 +20340,245 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$OBJC"
- car="${tmp%% *}"
- tmp="$OBJC EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of OBJC, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- OBJC="$car ${cdr% *}"
- else
- OBJC="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ OBJC="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;}
+ fi
else
OBJC=
@@ -12431,7 +20602,7 @@
# Linking C++ executables.
-if test "x$OPENJDK_BUILD_OS" != xwindows; then
+if test "x$OPENJDK_TARGET_OS" != xwindows; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -12525,59 +20696,263 @@
fi
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$AR"
- car="${tmp%% *}"
- tmp="$AR EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of AR, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving AR (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- AR="$car ${cdr% *}"
- else
- AR="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ AR="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
+ fi
fi
-if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
ARFLAGS="-r"
else
ARFLAGS=""
fi
+# For hotspot, we need these in Windows mixed path; other platforms keep them the same
+HOTSPOT_CXX="$CXX"
+HOTSPOT_LD="$LD"
+
+
+
COMPILER_NAME=gcc
COMPILER_TYPE=CC
-if test "x$OPENJDK_BUILD_OS" = xwindows; then :
+if test "x$OPENJDK_TARGET_OS" = xwindows; then :
# For now, assume that we are always compiling using cl.exe.
CC_OUT_OPTION=-Fo
@@ -12643,25 +21018,245 @@
# Since we must ignore the first found link, WINLD will contain
# the full path to the link.exe program.
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$WINLD"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$WINLD"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINLD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
fi
- WINLD="$tmp"
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of WINLD, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINLD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINLD"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ WINLD="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;}
+ fi
printf "Windows linker was found at $WINLD\n"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
@@ -12735,25 +21330,245 @@
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$MT"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$MT"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MT"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
fi
- MT="$tmp"
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of MT, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MT"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MT"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving MT (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ MT="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
+ fi
# The resource compiler
# Extract the first word of "rc", so it can be a program name with args.
@@ -12811,28 +21626,297 @@
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$RC"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$RC"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$RC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
fi
- RC="$tmp"
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of RC, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$RC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
- RC_FLAGS="-nologo /l 0x409 /r"
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$RC"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving RC (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ RC="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
+ fi
+
+
+ # For hotspot, we need these in Windows mixed path,
+ # so rewrite them all. Need added .exe suffix.
+ HOTSPOT_CXX="$CXX.exe"
+ HOTSPOT_LD="$LD.exe"
+ HOTSPOT_MT="$MT.exe"
+ HOTSPOT_RC="$RC.exe"
+
+ unix_path="$HOTSPOT_CXX"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ windows_path=`$CYGPATH -m "$unix_path"`
+ HOTSPOT_CXX="$windows_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ windows_path=`cmd //c echo $unix_path`
+ HOTSPOT_CXX="$windows_path"
+ fi
+
+
+ unix_path="$HOTSPOT_LD"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ windows_path=`$CYGPATH -m "$unix_path"`
+ HOTSPOT_LD="$windows_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ windows_path=`cmd //c echo $unix_path`
+ HOTSPOT_LD="$windows_path"
+ fi
+
+
+ unix_path="$HOTSPOT_MT"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ windows_path=`$CYGPATH -m "$unix_path"`
+ HOTSPOT_MT="$windows_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ windows_path=`cmd //c echo $unix_path`
+ HOTSPOT_MT="$windows_path"
+ fi
+
+
+ unix_path="$HOTSPOT_RC"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ windows_path=`$CYGPATH -m "$unix_path"`
+ HOTSPOT_RC="$windows_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ windows_path=`cmd //c echo $unix_path`
+ HOTSPOT_RC="$windows_path"
+ fi
+
+
+
+
+ RC_FLAGS="-nologo -l 0x409 -r"
if test "x$VARIANT" = xOPT; then :
RC_FLAGS="$RC_FLAGS -d NDEBUG"
@@ -12891,25 +21975,245 @@
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$WINAR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$WINAR"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINAR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
fi
- WINAR="$tmp"
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of WINAR, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINAR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$WINAR"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ WINAR="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;}
+ fi
AR="$WINAR"
ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
@@ -12952,25 +22256,245 @@
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$DUMPBIN"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$DUMPBIN"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
- fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$DUMPBIN"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
fi
- DUMPBIN="$tmp"
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$DUMPBIN"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$DUMPBIN"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ DUMPBIN="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
+ fi
COMPILER_TYPE=CL
@@ -13118,47 +22642,245 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$CPP"
- car="${tmp%% *}"
- tmp="$CPP EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of CPP, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving CPP (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- CPP="$car ${cdr% *}"
- else
- CPP="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ CPP="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
+ fi
ac_ext=cpp
@@ -13295,47 +23017,245 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$CXXCPP"
- car="${tmp%% *}"
- tmp="$CXXCPP EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXXCPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXXCPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$CXXCPP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- CXXCPP="$car ${cdr% *}"
- else
- CXXCPP="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ CXXCPP="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
+ fi
if test "x$COMPILE_TYPE" != "xcross"; then
@@ -13359,7 +23279,7 @@
fi
# Find the right assembler.
-if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -13401,54 +23321,252 @@
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$AS"
- car="${tmp%% *}"
- tmp="$AS EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of AS, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$AS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving AS (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- AS="$car ${cdr% *}"
- else
- AS="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ AS="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
+ fi
else
AS="$CC -c"
fi
-if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+if test "x$OPENJDK_TARGET_OS" = xsolaris; then
for ac_prog in gnm nm
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -13495,47 +23613,245 @@
done
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$NM"
- car="${tmp%% *}"
- tmp="$NM EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- NM="$car ${cdr% *}"
- else
- NM="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ NM="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
+ fi
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -13578,47 +23894,245 @@
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$STRIP"
- car="${tmp%% *}"
- tmp="$STRIP EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- STRIP="$car ${cdr% *}"
- else
- STRIP="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ STRIP="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
+ fi
# Extract the first word of "mcs", so it can be a program name with args.
set dummy mcs; ac_word=$2
@@ -13661,49 +24175,247 @@
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$MCS"
- car="${tmp%% *}"
- tmp="$MCS EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MCS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MCS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$MCS"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving MCS (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- MCS="$car ${cdr% *}"
- else
- MCS="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
-elif test "x$OPENJDK_BUILD_OS" != xwindows; then
+ if test "x$complete" != "x$new_complete"; then
+ MCS="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
+ fi
+
+elif test "x$OPENJDK_TARGET_OS" != xwindows; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
set dummy ${ac_tool_prefix}nm; ac_word=$2
@@ -13797,47 +24509,245 @@
fi
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$NM"
- car="${tmp%% *}"
- tmp="$NM EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$NM"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- NM="$car ${cdr% *}"
- else
- NM="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ NM="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
+ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -13932,78 +24842,615 @@
fi
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$STRIP"
- car="${tmp%% *}"
- tmp="$STRIP EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$STRIP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- STRIP="$car ${cdr% *}"
- else
- STRIP="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ STRIP="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
+ fi
fi
-###
-#
-# Check for objcopy
-#
-# but search for gobjcopy first...
-# since I on solaris found a broken objcopy...buhh
-#
+# objcopy is used for moving debug symbols to separate files when
+# full debug symbols are enabled.
+if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in gobjcopy objcopy
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJCOPY"; then
+ ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$OBJCOPY" && break
+ done
+fi
+if test -z "$OBJCOPY"; then
+ ac_ct_OBJCOPY=$OBJCOPY
+ for ac_prog in gobjcopy objcopy
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJCOPY"; then
+ ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
+if test -n "$ac_ct_OBJCOPY"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
+$as_echo "$ac_ct_OBJCOPY" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_OBJCOPY" && break
+done
+
+ if test "x$ac_ct_OBJCOPY" = x; then
+ OBJCOPY=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJCOPY=$ac_ct_OBJCOPY
+ fi
+fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJCOPY"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJCOPY"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJCOPY"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ OBJCOPY="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
+ fi
+
+fi
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gobjcopy", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gobjcopy; ac_word=$2
+ for ac_prog in gobjdump objdump
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OBJCOPY+set}" = set; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $OBJCOPY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -14011,42 +25458,43 @@
done
IFS=$as_save_IFS
- ;;
-esac
fi
-OBJCOPY=$ac_cv_path_OBJCOPY
-if test -n "$OBJCOPY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
-$as_echo "$OBJCOPY" >&6; }
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ test -n "$OBJDUMP" && break
+ done
fi
-if test -z "$ac_cv_path_OBJCOPY"; then
- ac_pt_OBJCOPY=$OBJCOPY
- # Extract the first word of "gobjcopy", so it can be a program name with args.
-set dummy gobjcopy; ac_word=$2
+if test -z "$OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ for ac_prog in gobjdump objdump
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_OBJCOPY+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $ac_pt_OBJCOPY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_OBJCOPY="$ac_pt_OBJCOPY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -14054,20 +25502,23 @@
done
IFS=$as_save_IFS
- ;;
-esac
fi
-ac_pt_OBJCOPY=$ac_cv_path_ac_pt_OBJCOPY
-if test -n "$ac_pt_OBJCOPY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_OBJCOPY" >&5
-$as_echo "$ac_pt_OBJCOPY" >&6; }
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_pt_OBJCOPY" = x; then
- OBJCOPY=""
+
+ test -n "$ac_ct_OBJDUMP" && break
+done
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14075,110 +25526,252 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- OBJCOPY=$ac_pt_OBJCOPY
+ OBJDUMP=$ac_ct_OBJDUMP
fi
-else
- OBJCOPY="$ac_cv_path_OBJCOPY"
fi
-if test "x$OBJCOPY" = x; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objcopy; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OBJCOPY+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $OBJCOPY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+if test "x$OBJDUMP" != x; then
+ # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJDUMP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
+ fi
fi
-done
- done
-IFS=$as_save_IFS
- ;;
-esac
-fi
-OBJCOPY=$ac_cv_path_OBJCOPY
-if test -n "$OBJCOPY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
-$as_echo "$OBJCOPY" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_OBJCOPY"; then
- ac_pt_OBJCOPY=$OBJCOPY
- # Extract the first word of "objcopy", so it can be a program name with args.
-set dummy objcopy; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_OBJCOPY+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_OBJCOPY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_OBJCOPY="$ac_pt_OBJCOPY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_OBJCOPY=$ac_cv_path_ac_pt_OBJCOPY
-if test -n "$ac_pt_OBJCOPY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_OBJCOPY" >&5
-$as_echo "$ac_pt_OBJCOPY" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_OBJCOPY" = x; then
- OBJCOPY=""
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
+ fi
else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OBJCOPY=$ac_pt_OBJCOPY
+ input_to_shortpath="$new_path"
fi
-else
- OBJCOPY="$ac_cv_path_OBJCOPY"
-fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJDUMP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$OBJDUMP"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ OBJDUMP="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
+ fi
fi
@@ -14224,47 +25817,245 @@
- # Translate "gcc -E" into "`which gcc` -E" ie
- # extract the full path to the binary and at the
- # same time maintain any arguments passed to it.
- # The command MUST exist in the path, or else!
- tmp="$LIPO"
- car="${tmp%% *}"
- tmp="$LIPO EOL"
- cdr="${tmp#* }"
- # On windows we want paths without spaces.
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- # Translate long cygdrive or C:\sdfsf path
- # into a short mixed mode path that has no
- # spaces in it.
- tmp="$car"
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$LIPO"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- tmp=`$CYGPATH -u "$car"`
- tmp=`which "$tmp"`
- # If file exists with .exe appended, that's the real filename
- # and cygpath needs that to convert to short style path.
- if test -f "${tmp}.exe"; then
- tmp="${tmp}.exe"
- elif test -f "${tmp}.cmd"; then
- tmp="${tmp}.cmd"
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path=`$CYGPATH -u "$path"`
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path=`$CYGPATH -u "$path"`
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
+ fi
+ fi
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ # Short path failed, file does not exist as specified.
+ # Try adding .exe or .cmd
+ if test -f "${new_path}.exe"; then
+ input_to_shortpath="${new_path}.exe"
+ elif test -f "${new_path}.cmd"; then
+ input_to_shortpath="${new_path}.cmd"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$new_path\", is invalid." >&5
+$as_echo "$as_me: The path of LIPO, which resolves as \"$new_path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
+$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
+ as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
+ fi
+ else
+ input_to_shortpath="$new_path"
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+ new_path="$input_to_shortpath"
+
+ input_path="$input_to_shortpath"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$LIPO"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ # Now try to locate executable using which
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # Oops. Which didn't find the executable.
+ # The splitting of arguments from the executable at a space might have been incorrect,
+ # since paths with space are more likely in Windows. Give it another try with the whole
+ # argument.
+ path="$complete"
+ arguments="EOL"
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+
+ new_path=`$WHICH "$new_path" 2> /dev/null`
+
+ if test "x$new_path" = x; then
+ # It's still not found. Now this is an unrecoverable error.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
+$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
+ fi
+ as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
+ fi
+ fi
+
+ # Now new_path has a complete unix path to the binary
+ if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
+ # Keep paths in /bin as-is, but remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+ # Do not save /bin paths to all_fixpath_prefixes!
+ else
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $new_path`
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+ # Output is in $new_path
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ # remove trailing .exe if any
+ new_path="${new_path/%.exe/}"
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+ fi
+
+ else
+ # We're on a posix platform. Hooray! :)
+ # First separate the path from the arguments. This will split at the first
+ # space.
+ complete="$LIPO"
+ path="${complete%% *}"
+ tmp="$complete EOL"
+ arguments="${tmp#* }"
+
+ new_path=`$WHICH $path 2> /dev/null`
+ if test "x$new_path" = x; then
+ is_absolute_path=`$ECHO "$path" | $GREP ^/`
+ if test "x$is_absolute_path" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&5
+$as_echo "$as_me: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&6;}
+ new_path="$path"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
+$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
+ has_space=`$ECHO "$complete" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
+$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
fi
- # Convert to C:/ mixed style path without spaces.
- tmp=`$CYGPATH -s -m "$tmp"`
+ as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
+ fi
fi
- car="$tmp"
+ fi
- else
- # "which" is not portable, but is used here
- # because we know that the command exists!
- car=`which $car`
- fi
- if test "x$cdr" != xEOL; then
- LIPO="$car ${cdr% *}"
- else
- LIPO="$car"
- fi
+ # Now join together the path and the arguments once again
+ if test "x$arguments" != xEOL; then
+ new_complete="$new_path ${arguments% *}"
+ else
+ new_complete="$new_path"
+ fi
+
+ if test "x$complete" != "x$new_complete"; then
+ LIPO="$new_complete"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
+$as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;}
+ fi
fi
@@ -14800,7 +26591,7 @@
POST_STRIP_CMD="$STRIP -g"
# Linking is different on MacOSX
- if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Might change in the future to clang.
COMPILER_NAME=gcc
SHARED_LIBRARY='lib$1.dylib'
@@ -14814,7 +26605,7 @@
POST_STRIP_CMD="$STRIP -S"
fi
else
- if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
COMPILER_NAME=ossc
PICFLAG="-KPIC"
@@ -14838,7 +26629,7 @@
POST_STRIP_CMD="$STRIP -x"
POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
fi
- if test "x$OPENJDK_BUILD_OS" = xwindows; then
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
# If it is not gcc, then assume it is the MS Visual Studio compiler
COMPILER_NAME=cl
PICFLAG=""
@@ -14986,6 +26777,11 @@
# Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
#CC_HIGHEST="$CC_HIGHEST -xlibmopt"
+ if test "x$OPENJDK_TARGET_CPU" = xsparc; then
+ CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
+ CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
+ fi
+
case $OPENJDK_TARGET_CPU_ARCH in
x86)
C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
@@ -15002,8 +26798,6 @@
fi
;;
sparc)
- CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
- CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
@@ -15132,7 +26926,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
case $OPENJDK_TARGET_CPU_ARCH in
x86 )
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -Di386"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
;;
esac
@@ -15232,7 +27026,7 @@
# libraries will link to whatever is in memory. Yuck.
#
# Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
-if test "x$COMPILER_TYPE" = xCL; then
+if test "x$COMPILER_NAME" = xcl; then
LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
if test "x$OPENJDK_TARGET_CPU" = xx86; then
LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
@@ -15248,19 +27042,23 @@
fi
LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
else
- # If this is a --hash-style=gnu system, use --hash-style=both, why?
- HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
- if test -n "$HAS_GNU_HASH"; then
- # And since we now know that the linker is gnu, then add -z defs, to forbid
- # undefined symbols in object files.
- LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both -Xlinker -z -Xlinker defs"
- if test "x$DEBUG_LEVEL" == "xrelease"; then
- # When building release libraries, tell the linker optimize them.
- # Should this be supplied to the OSS linker as well?
- LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+ if test "x$COMPILER_NAME" = xgcc; then
+ # If this is a --hash-style=gnu system, use --hash-style=both, why?
+ HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
+ if test -n "$HAS_GNU_HASH"; then
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
+ fi
+ if test "x$OPENJDK_TARGET_OS" = xlinux; then
+ # And since we now know that the linker is gnu, then add -z defs, to forbid
+ # undefined symbols in object files.
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
+ if test "x$DEBUG_LEVEL" = "xrelease"; then
+ # When building release libraries, tell the linker optimize them.
+ # Should this be supplied to the OSS linker as well?
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+ fi
fi
fi
-
LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client \
@@ -15307,53 +27105,6 @@
-# After we have toolchain, we can compile the uncygdrive helper
-
-# When using cygwin, we need a wrapper binary that renames
-# /cygdrive/c/ arguments into c:/ arguments and peeks into
-# @files and rewrites these too! This wrapper binary is
-# called uncygdrive.exe.
-UNCYGDRIVE=
-if test "x$OPENJDK_BUILD_OS" = xwindows; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if uncygdrive can be created" >&5
-$as_echo_n "checking if uncygdrive can be created... " >&6; }
- UNCYGDRIVE_SRC=`$CYGPATH -m $SRC_ROOT/common/src/uncygdrive.c`
- rm -f $OUTPUT_ROOT/uncygdrive*
- UNCYGDRIVE=`$CYGPATH -m $OUTPUT_ROOT/uncygdrive.exe`
- cd $OUTPUT_ROOT
- $CC $UNCYGDRIVE_SRC /Fe$UNCYGDRIVE > $OUTPUT_ROOT/uncygdrive1.log 2>&1
- cd $CURDIR
-
- if test ! -x $OUTPUT_ROOT/uncygdrive.exe; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cat $OUTPUT_ROOT/uncygdrive1.log
- as_fn_error $? "Could not create $OUTPUT_ROOT/uncygdrive.exe" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNCYGDRIVE" >&5
-$as_echo "$UNCYGDRIVE" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if uncygdrive.exe works" >&5
-$as_echo_n "checking if uncygdrive.exe works... " >&6; }
- cd $OUTPUT_ROOT
- $UNCYGDRIVE $CC $SRC_ROOT/common/src/uncygdrive.c /Fe$OUTPUT_ROOT/uncygdrive2.exe > $OUTPUT_ROOT/uncygdrive2.log 2>&1
- cd $CURDIR
- if test ! -x $OUTPUT_ROOT/uncygdrive2.exe; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cat $OUTPUT_ROOT/uncygdrive2.log
- as_fn_error $? "Uncygdrive did not work!" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- rm -f $OUTPUT_ROOT/uncygdrive?.??? $OUTPUT_ROOT/uncygdrive.obj
- # The path to uncygdrive to use should be Unix-style
- UNCYGDRIVE="$OUTPUT_ROOT/uncygdrive.exe"
-fi
-
-
-
-
-
# Setup debug symbols (need objcopy from the toolchain for that)
#
@@ -15384,7 +27135,7 @@
if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then
# Default is on if objcopy is found, otherwise off
- if test "x$OBJCOPY" != x; then
+ if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
ENABLE_DEBUG_SYMBOLS=yes
else
ENABLE_DEBUG_SYMBOLS=no
@@ -15536,7 +27287,6 @@
-
###############################################################################
#
# Check for X Windows
@@ -16308,10 +28058,15 @@
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
+
+# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
+ # include <X11/Xutil.h>
+
+"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -16323,6 +28078,7 @@
done
+
CFLAGS="$OLD_CFLAGS"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -16382,28 +28138,20 @@
fi
-# Check whether --with-cups-lib was given.
-if test "${with_cups_lib+set}" = set; then :
- withval=$with_cups_lib;
-fi
-
-
if test "x$CUPS_NOT_NEEDED" = xyes; then
- if test "x${with_cups}" != x || test "x${with_cups_include}" != x || test "x${with_cups_lib}" != x; then
+ if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5
$as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;}
fi
CUPS_CFLAGS=
- CUPS_LIBS=
else
CUPS_FOUND=no
- if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno || test "x${with_cups_lib}" = xno; then
+ if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
as_fn_error $? "It is not possible to disable the use of cups. Remove the --without-cups option." "$LINENO" 5
fi
if test "x${with_cups}" != x; then
- CUPS_LIBS="-L${with_cups}/lib -lcups"
CUPS_CFLAGS="-I${with_cups}/include"
CUPS_FOUND=yes
fi
@@ -16411,10 +28159,6 @@
CUPS_CFLAGS="-I${with_cups_include}"
CUPS_FOUND=yes
fi
- if test "x${with_cups_lib}" != x; then
- CUPS_LIBS="-L${with_cups_lib} -lcups"
- CUPS_FOUND=yes
- fi
if test "x$CUPS_FOUND" = xno; then
@@ -16572,7 +28316,6 @@
_ACEOF
CUPS_FOUND=yes
CUPS_CFLAGS=
- CUPS_LIBS="-lcups"
DEFAULT_CUPS=yes
fi
@@ -16582,18 +28325,16 @@
if test "x$CUPS_FOUND" = xno; then
# Getting nervous now? Lets poke around for standard Solaris third-party
# package installation locations.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers and libs" >&5
-$as_echo_n "checking for cups headers and libs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
+$as_echo_n "checking for cups headers... " >&6; }
if test -s /opt/sfw/cups/include/cups/cups.h; then
# An SFW package seems to be installed!
CUPS_FOUND=yes
CUPS_CFLAGS="-I/opt/sfw/cups/include"
- CUPS_LIBS="-L/opt/sfw/cups/lib -lcups"
elif test -s /opt/csw/include/cups/cups.h; then
# A CSW package seems to be installed!
CUPS_FOUND=yes
CUPS_CFLAGS="-I/opt/csw/include"
- CUPS_LIBS="-L/opt/csw/lib -lcups"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
$as_echo "$CUPS_FOUND" >&6; }
@@ -16633,7 +28374,6 @@
-
###############################################################################
#
# The ubiquitous freetype2 library is used to render fonts.
@@ -16661,32 +28401,138 @@
if test "x$with_freetype" != x; then
- # Fail with message the path to freetype if var with_freetype contains a path with no spaces in it.
- # Unless on Windows, where we can rewrite the path.
- HAS_SPACE=`echo "$with_freetype" | grep " "`
- if test "x$HAS_SPACE" != x; then
- if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # First convert it to DOS-style, short mode (no spaces)
- with_freetype=`$CYGPATH -s -m -a "$with_freetype"`
- # Now it's case insensitive; let's make it lowercase to improve readability
- with_freetype=`$ECHO "$with_freetype" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
- # Now convert it back to Unix-stile (cygpath)
- with_freetype=`$CYGPATH -u "$with_freetype"`
- else
- as_fn_error $? "You cannot have spaces in the path to freetype! \"$with_freetype\"" "$LINENO" 5
- fi
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$with_freetype"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of with_freetype" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ with_freetype="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_freetype to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting with_freetype to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$with_freetype"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ with_freetype="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_freetype to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting with_freetype to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$with_freetype"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
fi
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
+ FREETYPE2_LIB_PATH="$with_freetype/lib"
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
+ FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
+ FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
+ fi
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
fi
- FREETYPE2_LIB_PATH="$with_freetype/lib"
FREETYPE2_CFLAGS="-I$with_freetype/include"
if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
fi
- FREETYPE2_FOUND=yes
+ FREETYPE2_FOUND=yes
if test "x$FREETYPE2_FOUND" = xyes; then
# Verify that the directories exist
if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
@@ -16695,7 +28541,7 @@
# List the contents of the lib.
FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
if test "x$FREETYPELIB" = x; then
- as_fn_error $? "Could not find libfreetype.se nor freetype.dll in $with_freetype/lib" "$LINENO" 5
+ as_fn_error $? "Could not find libfreetype.so nor freetype.dll in $with_freetype/lib" "$LINENO" 5
fi
# Check one h-file
if ! test -s "$with_freetype/include/ft2build.h"; then
@@ -16851,6 +28697,145 @@
USING_SYSTEM_FT_LIB=true
fi
+ if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
+ FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$FREETYPELOCATION"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of FREETYPELOCATION" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPELOCATION="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPELOCATION to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPELOCATION to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$FREETYPELOCATION"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPELOCATION="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPELOCATION to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPELOCATION to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$FREETYPELOCATION"
+
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
+$as_echo_n "checking for freetype in some standard windows locations... " >&6; }
+ if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
+ FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
+ FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
+ FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
+ if ! test -s "$FREETYPE2_LIBS"; then
+ as_fn_error $? "Could not find $FREETYPE2_LIBS" "$LINENO" 5
+ fi
+ if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
+ as_fn_error $? "Could not find $FREETYPE2_LIB_PATH/freetype.dll" "$LINENO" 5
+ fi
+ USING_SYSTEM_FT_LIB=true
+ FREETYPE2_FOUND=yes
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
+$as_echo "$FREETYPE2_FOUND" >&6; }
+ fi
if test "x$FREETYPE2_FOUND" = xno; then
pkg_failed=no
@@ -16919,7 +28904,13 @@
$as_echo "yes" >&6; }
FREETYPE2_FOUND=yes
fi
+ # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+ FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
USING_SYSTEM_FT_LIB=true
+ # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+ if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
+ fi
fi
if test "x$FREETYPE2_FOUND" = xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5
@@ -16993,6 +28984,60 @@
as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
fi
+
+ if test "x$OPENJDK_TARGET_OS" != xwindows; then
+ # AC_CHECK_LIB does not support use of cl.exe
+ PREV_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$FREETYPE2_LIBS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
+$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
+if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfreetype $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char FT_Init_FreeType ();
+int
+main ()
+{
+return FT_Init_FreeType ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_freetype_FT_Init_FreeType=yes
+else
+ ac_cv_lib_freetype_FT_Init_FreeType=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
+$as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
+if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBFREETYPE 1
+_ACEOF
+
+ LIBS="-lfreetype $LIBS"
+
+else
+ as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
+fi
+
+ LDFLAGS="$PREV_LDFLAGS"
+ fi
fi
@@ -17795,16 +29840,19 @@
if test "x$enable_static_link_stdc__" = xyes; then
LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
LDCXX="$CC"
+ STATIC_CXX_SETTING="STATIC_CXX=true"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
$as_echo "static" >&6; }
else
LIBCXX="$LIBCXX -lstdc++"
LDCXX="$CXX"
+ STATIC_CXX_SETTING="STATIC_CXX=false"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic" >&5
$as_echo "dynamic" >&6; }
fi
fi
+
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
@@ -17819,6 +29867,66 @@
+# After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
+
+# When using cygwin or msys, we need a wrapper binary that renames
+# /cygdrive/c/ arguments into c:/ arguments and peeks into
+# @files and rewrites these too! This wrapper binary is
+# called fixpath.
+FIXPATH=
+if test "x$OPENJDK_BUILD_OS" = xwindows; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
+$as_echo_n "checking if fixpath can be created... " >&6; }
+ FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+ FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+ if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
+ FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
+ # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
+ FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+ FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
+ FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
+
+ # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
+ # @ was chosen as separator to minimize risk of other tools messing around with it
+ all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+ fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
+
+ FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
+ fi
+ rm -f $OUTPUT_ROOT/fixpath*
+ cd $OUTPUT_ROOT
+ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+ cd $CURDIR
+
+ if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ cat $OUTPUT_ROOT/fixpath1.log
+ as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
+$as_echo_n "checking if fixpath.exe works... " >&6; }
+ cd $OUTPUT_ROOT
+ $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+ cd $CURDIR
+ if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ cat $OUTPUT_ROOT/fixpath2.log
+ as_fn_error $? "fixpath did not work!" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
+fi
+
+
+
+
###############################################################################
#
# We need to do some final tweaking, when everything else is done.
@@ -17873,6 +29981,10 @@
# Looks like a MacOSX system
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'`
FOUND_CORES=yes
+ elif test -n "$NUMBER_OF_PROCESSORS"; then
+ # On windows, look in the env
+ NUM_CORES=$NUMBER_OF_PROCESSORS
+ FOUND_CORES=yes
fi
# For c/c++ code we run twice as many concurrent build
@@ -17883,8 +29995,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
$as_echo "$NUM_CORES" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1!" >&5
-$as_echo "could not detect number of cores, defaulting to 1!" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1" >&5
+$as_echo "could not detect number of cores, defaulting to 1" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This will disable all parallelism from build!" >&5
+$as_echo "$as_me: WARNING: This will disable all parallelism from build!" >&2;}
fi
@@ -17926,9 +30040,10 @@
MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'`
MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
FOUND_MEM=yes
- elif test "x$build_os" = xwindows; then
+ elif test "x$OPENJDK_BUILD_OS" = xwindows; then
# Windows, but without cygwin
- MEMORY_SIZE=`systeminfo | grep 'Total Physical Memory:' | awk '{ print $4 }' | sed 's/,//'`
+ MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
FOUND_MEM=yes
fi
@@ -17936,8 +30051,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMORY_SIZE MB" >&5
$as_echo "$MEMORY_SIZE MB" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size defaulting to 1024 MB!" >&5
-$as_echo "could not detect memory size defaulting to 1024 MB!" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to 1024 MB" >&5
+$as_echo "could not detect memory size, defaulting to 1024 MB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5
+$as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;}
fi
else
@@ -18366,11 +30483,26 @@
# df -l lists only local disks; if the given directory is not found then
# a non-zero exit code is given
- if $DF -l $OUTPUT_ROOT > /dev/null 2>&1; then
- OUTPUT_DIR_IS_LOCAL="yes"
- else
- OUTPUT_DIR_IS_LOCAL="no"
- fi
+ if test "x$DF" = x; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # msys does not have df; use Windows "net use" instead.
+ IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
+ if test "x$IS_NETWORK_DISK" = x; then
+ OUTPUT_DIR_IS_LOCAL="yes"
+ else
+ OUTPUT_DIR_IS_LOCAL="no"
+ fi
+ else
+ # No df here, say it's local
+ OUTPUT_DIR_IS_LOCAL="yes"
+ fi
+ else
+ if $DF -l $OUTPUT_ROOT > /dev/null 2>&1; then
+ OUTPUT_DIR_IS_LOCAL="yes"
+ else
+ OUTPUT_DIR_IS_LOCAL="no"
+ fi
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
$as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
@@ -18909,7 +31041,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by openjdk $as_me jdk8, which was
+This file was extended by OpenJDK $as_me jdk8, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18965,13 +31097,14 @@
Configuration headers:
$config_headers
-Report bugs to <build-dev@openjdk.java.net>."
+Report bugs to <build-dev@openjdk.java.net>.
+OpenJDK home page: <http://openjdk.java.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-openjdk config.status jdk8
+OpenJDK config.status jdk8
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
@@ -19718,7 +31851,15 @@
printf "* JDK variant: $JDK_VARIANT\n"
printf "* JVM variants: $with_jvm_variants\n"
printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
-printf "* Boot JDK: $BOOT_JDK\n"
+
+printf "\n"
+printf "Tools summary:\n"
+if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
+fi
+printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
+printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
+printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
printf "\n"
printf "Build performance summary:\n"
diff --git a/common/autoconf/help.m4 b/common/autoconf/help.m4
index 01b4817..12ff371 100644
--- a/common/autoconf/help.m4
+++ b/common/autoconf/help.m4
@@ -55,6 +55,19 @@
fi
])
+cygwin_help() {
+ case $1 in
+ unzip)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
+ zip)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
+ make)
+ PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
+ * )
+ break ;;
+ esac
+}
+
apt_help() {
case $1 in
devkit)
@@ -149,7 +162,15 @@
printf "* JDK variant: $JDK_VARIANT\n"
printf "* JVM variants: $with_jvm_variants\n"
printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
-printf "* Boot JDK: $BOOT_JDK\n"
+
+printf "\n"
+printf "Tools summary:\n"
+if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+ printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
+fi
+printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
+printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
+printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
printf "\n"
printf "Build performance summary:\n"
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
index b4e9d5c..68cc8e4 100644
--- a/common/autoconf/hotspot-spec.gmk.in
+++ b/common/autoconf/hotspot-spec.gmk.in
@@ -48,8 +48,8 @@
# The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the
# compiler that produces code that can be run on the build platform.
-HOSTCC:=@UNCYGDRIVE@ @BUILD_CC@
-HOSTCXX:=@UNCYGDRIVE@ @BUILD_CXX@
+HOSTCC:=@FIXPATH@ @BUILD_CC@
+HOSTCXX:=@FIXPATH@ @BUILD_CXX@
####################################################
#
@@ -78,13 +78,23 @@
ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
ALT_EXPORT_PATH=$(HOTSPOT_DIST)
-HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@
+HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
# This is used from the libjvm build for C/C++ code.
HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
# Control wether Hotspot runs Queens test after building
TEST_IN_BUILD=@TEST_IN_BUILD@
+# For hotspot, override compiler/tools definition to not include FIXPATH prefix.
+# Hotspot has its own handling on the Windows path situation.
+CXX:=@CCACHE@ @HOTSPOT_CXX@
+LD:=@HOTSPOT_LD@
+MT:=@HOTSPOT_MT@
+RC:=@HOTSPOT_RC@
EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@
EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
+
+# Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
+# This is needed to get the LOG setting to work properly.
+include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index 92d97e2..39e003f 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -64,7 +64,7 @@
# ie normal interpreter and C1, only the serial GC, kernel jvmti etc
# zero: no machine code interpreter, no compiler
# zeroshark: zero interpreter and shark/llvm compiler backend
-AC_MSG_CHECKING([which variants of the JVM that should be built])
+AC_MSG_CHECKING([which variants of the JVM to build])
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
[JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])])
@@ -241,48 +241,47 @@
# Should we build only OpenJDK even if closed sources are present?
#
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
- [build OpenJDK regardless of the presence of closed repositories @<:@disabled@:>@])],,)
+ [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
-if test "x$enable_openjdk_only" = "xyes"; then
- OPENJDK=true
-elif test "x$enable_openjdk_only" = "xno"; then
- OPENJDK=false
-elif test -d "$SRC_ROOT/jdk/src/closed"; then
- OPENJDK=false
+AC_MSG_CHECKING([for presence of closed sources])
+if test -d "$SRC_ROOT/jdk/src/closed"; then
+ CLOSED_SOURCE_PRESENT=yes
else
+ CLOSED_SOURCE_PRESENT=no
+fi
+AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
+
+AC_MSG_CHECKING([if closed source is supressed (openjdk-only)])
+SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
+AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE])
+
+if test "x$CLOSED_SOURCE_PRESENT" = xno; then
+ OPENJDK=true
+ if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
+ AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
+ fi
+else
+ if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
OPENJDK=true
+ else
+ OPENJDK=false
+ fi
fi
if test "x$OPENJDK" = "xtrue"; then
- SET_OPENJDK=OPENJDK=true
+ SET_OPENJDK="OPENJDK=true"
fi
AC_SUBST(SET_OPENJDK)
###############################################################################
#
-# JIGSAW or not. The JIGSAW variable is used during the intermediate
-# stage when we are building both the old style JDK and the new style modularized JDK.
-# When the modularized JDK is finalized, this option will go away.
-#
-AC_ARG_ENABLE([jigsaw], [AS_HELP_STRING([--enable-jigsaw],
- [build Jigsaw images (not yet available) @<:@disabled@:>@])],,)
-
-if test "x$enable_jigsaw" = "xyes"; then
- JIGSAW=true
-else
- JIGSAW=false
-fi
-AC_SUBST(JIGSAW)
-
-###############################################################################
-#
# Should we build a JDK/JVM with headful support (ie a graphical ui)?
# We always build headless support.
#
AC_MSG_CHECKING([headful support])
AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
- [build headful support (graphical UI support) @<:@enabled@:>@])],
+ [disable building headful support (graphical UI support) @<:@enabled@:>@])],
[SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
SUPPORT_HEADLESS=yes
@@ -305,25 +304,9 @@
AC_SUBST(SUPPORT_HEADFUL)
AC_SUBST(BUILD_HEADLESS)
-###############################################################################
-#
-# Should we compile nimbus swing L&F? We can probably remove this option
-# since nimbus is officially part of javax now.
-#
-AC_MSG_CHECKING([whether to build nimbus L&F])
-AC_ARG_ENABLE([nimbus], [AS_HELP_STRING([--disable-nimbus],
- [disable Nimbus L&F @<:@enabled@:>@])],
- [ENABLE_NIMBUS="${enableval}"], [ENABLE_NIMBUS='yes'])
-AC_MSG_RESULT([$ENABLE_NIMBUS])
-DISABLE_NIMBUS=
-if test "x$ENABLE_NIMBUS" = xno; then
- DISABLE_NIMBUS=true
-fi
-AC_SUBST(DISABLE_NIMBUS)
-
# Control wether Hotspot runs Queens test after build.
AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
- [enable running of Queens test after Hotspot build (not yet available) @<:@disabled@:>@])],,
+ [run the Queens test after Hotspot build @<:@disabled@:>@])],,
[enable_hotspot_test_in_build=no])
if test "x$enable_hotspot_test_in_build" = "xyes"; then
TEST_IN_BUILD=true
@@ -351,43 +334,25 @@
###############################################################################
#
+# Enable or disable unlimited crypto
+#
+AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
+ [Enable unlimited crypto policy @<:@disabled@:>@])],,
+ [enable_unlimited_crypto=no])
+if test "x$enable_unlimited_crypto" = "xyes"; then
+ UNLIMITED_CRYPTO=true
+else
+ UNLIMITED_CRYPTO=false
+fi
+AC_SUBST(UNLIMITED_CRYPTO)
+
+###############################################################################
+#
# Compress jars
#
COMPRESS_JARS=false
AC_SUBST(COMPRESS_JARS)
-
-###############################################################################
-#
-# Should we compile JFR
-# default no, except for on closed-jdk
-#
-ENABLE_JFR=no
-
-# Is the JFR source present
-
-#
-# For closed default is yes
-#
-if test "x${OPENJDK}" != "xtrue"; then
- ENABLE_JFR=yes
-fi
-
-AC_MSG_CHECKING([whether to build jfr])
-AC_ARG_ENABLE([jfr], [AS_HELP_STRING([--enable-jfr],
- [enable jfr (default is no)])]
- [ENABLE_JFR="${enableval}"])
-AC_MSG_RESULT([${ENABLE_JFR}])
-
-if test "x$ENABLE_JFR" = "xyes"; then
- ENABLE_JFR=true
-elif test "x$ENABLE_JFR" = "xno"; then
- ENABLE_JFR=false
-else
- AC_MSG_ERROR([Invalid argument to --enable-jfr])
-fi
-
-AC_SUBST(ENABLE_JFR)
])
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
@@ -409,6 +374,8 @@
AC_SUBST(PRODUCT_SUFFIX)
AC_SUBST(JDK_RC_PLATFORM_NAME)
AC_SUBST(COMPANY_NAME)
+AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
+AC_SUBST(MACOSX_BUNDLE_ID_BASE)
COPYRIGHT_YEAR=`date +'%Y'`
AC_SUBST(COPYRIGHT_YEAR)
@@ -437,7 +404,7 @@
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
# Avoid [:alnum:] since it depends on the locale.
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
- USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
+ USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
fi
AC_SUBST(FULL_VERSION)
@@ -473,7 +440,7 @@
fi
AC_ARG_ENABLE([debug-symbols],
- [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols (@<:@enabled@:>@)])],
+ [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])],
[ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}],
)
@@ -487,7 +454,7 @@
if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then
# Default is on if objcopy is found, otherwise off
- if test "x$OBJCOPY" != x; then
+ if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
ENABLE_DEBUG_SYMBOLS=yes
else
ENABLE_DEBUG_SYMBOLS=no
@@ -502,7 +469,7 @@
ZIP_DEBUGINFO_FILES=yes
AC_ARG_ENABLE([zip-debug-info],
- [AS_HELP_STRING([--disable-zip-debug-info],[don't zip debug-info files (@<:@enabled@:@)])],
+ [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
[ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}],
)
@@ -528,5 +495,5 @@
# for a degree of customization of the build targets and the rules/recipes
# to create them
AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
- [directory containing custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
+ [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
AC_SUBST(CUSTOM_MAKE_DIR)
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 8c09744..32a62ba 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -172,9 +172,15 @@
AC_LANG_PUSH(C)
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
+
+# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
- [X11_A_OK=yes],
- [X11_A_OK=no])
+ [X11_A_OK=yes],
+ [X11_A_OK=no],
+ [ # include <X11/Xlib.h>
+ # include <X11/Xutil.h>
+ ])
+
CFLAGS="$OLD_CFLAGS"
AC_LANG_POP(C)
@@ -196,27 +202,23 @@
#
AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
[specify prefix directory for the cups package
- (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+ (expecting the headers under PATH/include)])])
AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
[specify directory for the cups include files])])
-AC_ARG_WITH(cups-lib, [AS_HELP_STRING([--with-cups-lib],
- [specify directory for the cups library])])
if test "x$CUPS_NOT_NEEDED" = xyes; then
- if test "x${with_cups}" != x || test "x${with_cups_include}" != x || test "x${with_cups_lib}" != x; then
+ if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
AC_MSG_WARN([cups not used, so --with-cups is ignored])
fi
CUPS_CFLAGS=
- CUPS_LIBS=
else
CUPS_FOUND=no
- if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno || test "x${with_cups_lib}" = xno; then
+ if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
fi
if test "x${with_cups}" != x; then
- CUPS_LIBS="-L${with_cups}/lib -lcups"
CUPS_CFLAGS="-I${with_cups}/include"
CUPS_FOUND=yes
fi
@@ -224,10 +226,6 @@
CUPS_CFLAGS="-I${with_cups_include}"
CUPS_FOUND=yes
fi
- if test "x${with_cups_lib}" != x; then
- CUPS_LIBS="-L${with_cups_lib} -lcups"
- CUPS_FOUND=yes
- fi
if test "x$CUPS_FOUND" = xno; then
BDEPS_CHECK_MODULE(CUPS, cups, xxx, [CUPS_FOUND=yes])
fi
@@ -236,23 +234,20 @@
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
[CUPS_FOUND=yes
CUPS_CFLAGS=
- CUPS_LIBS="-lcups"
DEFAULT_CUPS=yes])
fi
if test "x$CUPS_FOUND" = xno; then
# Getting nervous now? Lets poke around for standard Solaris third-party
# package installation locations.
- AC_MSG_CHECKING([for cups headers and libs])
+ AC_MSG_CHECKING([for cups headers])
if test -s /opt/sfw/cups/include/cups/cups.h; then
# An SFW package seems to be installed!
CUPS_FOUND=yes
CUPS_CFLAGS="-I/opt/sfw/cups/include"
- CUPS_LIBS="-L/opt/sfw/cups/lib -lcups"
elif test -s /opt/csw/include/cups/cups.h; then
# A CSW package seems to be installed!
CUPS_FOUND=yes
CUPS_CFLAGS="-I/opt/csw/include"
- CUPS_LIBS="-L/opt/csw/lib -lcups"
fi
AC_MSG_RESULT([$CUPS_FOUND])
fi
@@ -263,7 +258,6 @@
fi
AC_SUBST(CUPS_CFLAGS)
-AC_SUBST(CUPS_LIBS)
])
@@ -292,17 +286,21 @@
FREETYPE2_FOUND=no
if test "x$with_freetype" != x; then
- SPACESAFE(with_freetype,[the path to freetype])
+ BASIC_FIXUP_PATH(with_freetype)
FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
+ FREETYPE2_LIB_PATH="$with_freetype/lib"
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
+ FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
+ FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
+ fi
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
fi
- FREETYPE2_LIB_PATH="$with_freetype/lib"
FREETYPE2_CFLAGS="-I$with_freetype/include"
if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
fi
- FREETYPE2_FOUND=yes
+ FREETYPE2_FOUND=yes
if test "x$FREETYPE2_FOUND" = xyes; then
# Verify that the directories exist
if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
@@ -311,7 +309,7 @@
# List the contents of the lib.
FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
if test "x$FREETYPELIB" = x; then
- AC_MSG_ERROR([Could not find libfreetype.se nor freetype.dll in $with_freetype/lib])
+ AC_MSG_ERROR([Could not find libfreetype.so nor freetype.dll in $with_freetype/lib])
fi
# Check one h-file
if ! test -s "$with_freetype/include/ft2build.h"; then
@@ -323,9 +321,34 @@
BDEPS_CHECK_MODULE(FREETYPE2, freetype2, xxx, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
USING_SYSTEM_FT_LIB=true
fi
+ if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
+ FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
+ BASIC_FIXUP_PATH(FREETYPELOCATION)
+ AC_MSG_CHECKING([for freetype in some standard windows locations])
+ if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
+ FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
+ FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
+ FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
+ if ! test -s "$FREETYPE2_LIBS"; then
+ AC_MSG_ERROR([Could not find $FREETYPE2_LIBS])
+ fi
+ if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
+ AC_MSG_ERROR([Could not find $FREETYPE2_LIB_PATH/freetype.dll])
+ fi
+ USING_SYSTEM_FT_LIB=true
+ FREETYPE2_FOUND=yes
+ fi
+ AC_MSG_RESULT([$FREETYPE2_FOUND])
+ fi
if test "x$FREETYPE2_FOUND" = xno; then
PKG_CHECK_MODULES(FREETYPE2, freetype2, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
+ # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+ FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
USING_SYSTEM_FT_LIB=true
+ # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+ if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
+ fi
fi
if test "x$FREETYPE2_FOUND" = xno; then
AC_MSG_CHECKING([for freetype in some standard locations])
@@ -364,7 +387,15 @@
if test "x$FREETYPE2_FOUND" = xno; then
HELP_MSG_MISSING_DEPENDENCY([freetype2])
AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])
- fi
+ fi
+
+ if test "x$OPENJDK_TARGET_OS" != xwindows; then
+ # AC_CHECK_LIB does not support use of cl.exe
+ PREV_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$FREETYPE2_LIBS"
+ AC_CHECK_LIB(freetype, FT_Init_FreeType, [], AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ]))
+ LDFLAGS="$PREV_LDFLAGS"
+ fi
fi
AC_SUBST(USING_SYSTEM_FT_LIB)
@@ -621,13 +652,16 @@
if test "x$enable_static_link_stdc__" = xyes; then
LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
LDCXX="$CC"
+ STATIC_CXX_SETTING="STATIC_CXX=true"
AC_MSG_RESULT([static])
else
LIBCXX="$LIBCXX -lstdc++"
LDCXX="$CXX"
+ STATIC_CXX_SETTING="STATIC_CXX=false"
AC_MSG_RESULT([dynamic])
fi
fi
+AC_SUBST(STATIC_CXX_SETTING)
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
index afa32ad..2977606 100644
--- a/common/autoconf/platform.m4
+++ b/common/autoconf/platform.m4
@@ -87,22 +87,32 @@
*linux*)
VAR_OS=linux
VAR_OS_API=posix
+ VAR_OS_ENV=linux
;;
*solaris*)
VAR_OS=solaris
VAR_OS_API=posix
+ VAR_OS_ENV=solaris
;;
*darwin*)
VAR_OS=macosx
VAR_OS_API=posix
+ VAR_OS_ENV=macosx
;;
*bsd*)
VAR_OS=bsd
VAR_OS_API=posix
+ VAR_OS_ENV=bsd
;;
- *cygwin*|*windows*)
+ *cygwin*)
VAR_OS=windows
VAR_OS_API=winapi
+ VAR_OS_ENV=windows.cygwin
+ ;;
+ *mingw*)
+ VAR_OS=windows
+ VAR_OS_API=winapi
+ VAR_OS_ENV=windows.msys
;;
*)
AC_MSG_ERROR([unsupported operating system $1])
@@ -128,11 +138,33 @@
AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME)
# Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
+ PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
+ PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
+ # ..and setup our own variables. (Do this explicitely to facilitate searching)
+ OPENJDK_BUILD_OS="$VAR_OS"
+ OPENJDK_BUILD_OS_API="$VAR_OS_API"
+ OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
+ OPENJDK_BUILD_CPU="$VAR_CPU"
+ OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
+ OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
+ OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+ AC_SUBST(OPENJDK_BUILD_OS)
+ AC_SUBST(OPENJDK_BUILD_OS_API)
+ AC_SUBST(OPENJDK_BUILD_CPU)
+ AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
+ AC_SUBST(OPENJDK_BUILD_CPU_BITS)
+ AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
+
+ AC_MSG_CHECKING([openjdk-build os-cpu])
+ AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
+
+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
# ... and setup our own variables. (Do this explicitely to facilitate searching)
OPENJDK_TARGET_OS="$VAR_OS"
OPENJDK_TARGET_OS_API="$VAR_OS_API"
+ OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
OPENJDK_TARGET_CPU="$VAR_CPU"
OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
@@ -144,22 +176,8 @@
AC_SUBST(OPENJDK_TARGET_CPU_BITS)
AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
- # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
- PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
- PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
- # ..and setup our own variables. (Do this explicitely to facilitate searching)
- OPENJDK_BUILD_OS="$VAR_OS"
- OPENJDK_BUILD_OS_API="$VAR_OS_API"
- OPENJDK_BUILD_CPU="$VAR_CPU"
- OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
- OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
- OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
- AC_SUBST(OPENJDK_BUILD_OS)
- AC_SUBST(OPENJDK_BUILD_OS_API)
- AC_SUBST(OPENJDK_BUILD_CPU)
- AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
- AC_SUBST(OPENJDK_BUILD_CPU_BITS)
- AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
+ AC_MSG_CHECKING([openjdk-target os-cpu])
+ AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
])
# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
@@ -208,7 +226,7 @@
fi
AC_SUBST(COMPILE_TYPE)
-AC_MSG_CHECKING([for compilation type])
+AC_MSG_CHECKING([compilation type])
AC_MSG_RESULT([$COMPILE_TYPE])
])
@@ -299,7 +317,11 @@
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
A_LP64="LP64:="
- ADD_LP64="-D_LP64=1"
+ # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
+ # unpack200.exe
+ if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ ADD_LP64="-D_LP64=1"
+ fi
fi
AC_SUBST(LP64,$A_LP64)
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 2150234..b8d3e10 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -41,7 +41,9 @@
#'
DQUOTE:="
#"
-define NEWLINE:=
+define NEWLINE
+
+
endef
# A self-referential reference to this file.
@@ -50,11 +52,7 @@
# Specify where the spec file is.
MAKE_ARGS="SPEC=$(SPEC)"
-# TODO The logic for finding and setting MAKE is currently not working
-# well on windows. Disable it TEMPORARILY there for now.
-ifneq (@OPENJDK_TARGET_OS@,windows)
- MAKE:=@MAKE@
-endif
+MAKE:=@MAKE@
# Pass along the verbosity setting.
ifeq (,$(findstring VERBOSE=,$(MAKE)))
@@ -77,6 +75,7 @@
# The built jdk will run in this target system.
OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
+OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
@@ -109,16 +108,21 @@
REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
@SET_OPENJDK@
-JIGSAW:=@JIGSAW@
LIBM:=-lm
LIBDL:=@LIBDL@
# colon or semicolon
PATH_SEP:=@PATH_SEP@
-# Set special env variables, to be passed to external tools.
-# Used for cygwin setups.
-@SETUPDEVENV@
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ # On Windows, the Visual Studio toolchain needs the LIB and INCLUDE
+ # environment variables (in Windows path style), and the PATH needs to
+ # be adjusted to include Visual Studio tools (but this needs to be in
+ # cygwin/msys style).
+ export PATH:=@VS_PATH@
+ export INCLUDE:=@VS_INCLUDE@
+ export LIB:=@VS_LIB@
+endif
# The sys root where standard headers and libraries are found.
# Usually not needed since the configure script should have
@@ -131,7 +135,6 @@
OVERRIDE_SRC_ROOT:=@OVERRIDE_SRC_ROOT@
TOPDIR:=@SRC_ROOT@
OUTPUT_ROOT:=@OUTPUT_ROOT@
-JDK_MAKE_SHARED_DIR:=@JDK_TOPDIR@/makefiles/common/shared
JDK_TOPDIR:=@JDK_TOPDIR@
LANGTOOLS_TOPDIR:=@LANGTOOLS_TOPDIR@
CORBA_TOPDIR:=@CORBA_TOPDIR@
@@ -155,6 +158,8 @@
PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
COMPANY_NAME:=@COMPANY_NAME@
+MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
+MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
# Different version strings generated from the above information.
JDK_VERSION:=@JDK_VERSION@
@@ -260,6 +265,9 @@
# Source file for cacerts
CACERTS_FILE=@CACERTS_FILE@
+# Enable unlimited crypto policy
+UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
+
# Necessary additional compiler flags to compile X11
X_CFLAGS:=@X_CFLAGS@
X_LIBS:=@X_LIBS@
@@ -289,7 +297,7 @@
CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
# Tools that potentially need to be cross compilation aware.
-CC:=@UNCYGDRIVE@ @CCACHE@ @CC@
+CC:=@FIXPATH@ @CCACHE@ @CC@
# CFLAGS used to compile the jdk native libraries (C-code)
CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
@@ -299,17 +307,17 @@
CFLAGS_JDKEXE:=@CFLAGS_JDKEXE@
CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
-CXX:=@UNCYGDRIVE@ @CCACHE@ @CXX@
+CXX:=@FIXPATH@ @CCACHE@ @CXX@
#CXXFLAGS:=@CXXFLAGS@
OBJC:=@CCACHE@ @OBJC@
#OBJCFLAGS:=@OBJCFLAGS@
-CPP:=@UNCYGDRIVE@ @CPP@
+CPP:=@FIXPATH@ @CPP@
#CPPFLAGS:=@CPPFLAGS@
# The linker can be gcc or ld on posix systems, or link.exe on windows systems.
-LD:=@UNCYGDRIVE@ @LD@
+LD:=@FIXPATH@ @LD@
# LDFLAGS used to link the jdk native libraries (C-code)
LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
@@ -317,7 +325,7 @@
# On some platforms the linker cannot be used to create executables, thus
# the need for a separate LDEXE command.
-LDEXE:=@UNCYGDRIVE@ @LDEXE@
+LDEXE:=@FIXPATH@ @LDEXE@
# LDFLAGS used to link the jdk native launchers (C-code)
LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
@@ -327,22 +335,22 @@
LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
# Sometimes a different linker is needed for c++ libs
-LDCXX:=@UNCYGDRIVE@ @LDCXX@
+LDCXX:=@FIXPATH@ @LDCXX@
# The flags for linking libstdc++ linker.
LIBCXX:=@LIBCXX@
# Sometimes a different linker is needed for c++ executables
-LDEXECXX:=@UNCYGDRIVE@ @LDEXECXX@
+LDEXECXX:=@FIXPATH@ @LDEXECXX@
# BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
# build platform.
-BUILD_CC:=@UNCYGDRIVE@ @BUILD_CC@
-BUILD_LD:=@UNCYGDRIVE@ @BUILD_LD@
+BUILD_CC:=@FIXPATH@ @BUILD_CC@
+BUILD_LD:=@FIXPATH@ @BUILD_LD@
-AS:=@UNCYGDRIVE@ @AS@
+AS:=@FIXPATH@ @AS@
# AR is used to create a static library (is ar in posix, lib.exe in windows)
-AR:=@UNCYGDRIVE@ @AR@
+AR:=@FIXPATH@ @AR@
ARFLAGS:=@ARFLAGS@
NM:=@NM@
@@ -400,20 +408,20 @@
JAVA_FLAGS:=@BOOT_JDK_JVMARGS@
-JAVA=@UNCYGDRIVE@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
+JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
-JAVAC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javac
+JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
# Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
# overriding that value by using ?=.
JAVAC_FLAGS?=@JAVAC_FLAGS@
-JAVAH=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javah
+JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
-JAR=@UNCYGDRIVE@ $(BOOT_JDK)/bin/jar
+JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar
-RMIC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/rmic
+RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
-NATIVE2ASCII=@UNCYGDRIVE@ $(BOOT_JDK)/bin/native2ascii
+NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
# Base flags for RC
# Guarding this against resetting value. Legacy make files include spec multiple
@@ -424,21 +432,20 @@
# A specific java binary with specific options can be used to run
# the long running background sjavac servers and other long running tasks.
-SJAVAC_SERVER_JAVA:=@UNCYGDRIVE@ @SJAVAC_SERVER_JAVA@
+SJAVAC_SERVER_JAVA:=@FIXPATH@ @SJAVAC_SERVER_JAVA@
# Tools adhering to a minimal and common standard of posix compliance.
AWK:=@AWK@
BASENAME:=@BASENAME@
+BASH:=@BASH@
CAT:=@CAT@
CCACHE:=@CCACHE@
# CD is going away, but remains to cater for legacy makefiles.
CD:=cd
CHMOD:=@CHMOD@
CP:=@CP@
-CPIO:=@CPIO@
CUT:=@CUT@
DATE:=@DATE@
-DF:=@DF@
DIFF:=@DIFF@
FIND:=@FIND@
FIND_DELETE:=@FIND_DELETE@
@@ -461,6 +468,7 @@
TAR:=@TAR@
TAIL:=@TAIL@
TEE:=@TEE@
+TIME:=@TIME@
TR:=@TR@
TOUCH:=@TOUCH@
WC:=@WC@
@@ -468,9 +476,9 @@
ZIPEXE:=@ZIP@
ZIP:=@ZIP@
UNZIP:=@UNZIP@
-MT:=@UNCYGDRIVE@ @MT@
-RC:=@UNCYGDRIVE@ @RC@
-DUMPBIN:=@UNCYGDRIVE@ @DUMPBIN@
+MT:=@FIXPATH@ @MT@
+RC:=@FIXPATH@ @RC@
+DUMPBIN:=@FIXPATH@ @DUMPBIN@
CYGPATH:=@CYGPATH@
LDD:=@LDD@
OTOOL:=@OTOOL@
@@ -479,8 +487,9 @@
FILE:=@FILE@
HG:=@HG@
OBJCOPY:=@OBJCOPY@
+SETFILE:=@SETFILE@
-UNCYGDRIVE:=@UNCYGDRIVE@
+FIXPATH:=@FIXPATH@
# Where the build output is stored for your convenience.
BUILD_LOG:=@BUILD_LOG@
@@ -488,14 +497,12 @@
BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
# Build setup
-DISABLE_NIMBUS:=@DISABLE_NIMBUS@
ENABLE_JFR=@ENABLE_JFR@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
-CHECK_FOR_VCINSTALLDIR=@CHECK_FOR_VCINSTALLDIR@
-MSVCRNN_DLL:=@MSVCR100DLL@
+MSVCR_DLL:=@MSVCR_DLL@
# ADD_SRCS takes a single argument with source roots
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
index 45c376f..eb8d2b1 100644
--- a/common/autoconf/toolchain.m4
+++ b/common/autoconf/toolchain.m4
@@ -23,111 +23,67 @@
# questions.
#
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
+# $1 = compiler to test (CC or CXX)
+# $2 = human readable name of compiler (C or C++)
+AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION],
[
+ COMPILER=[$]$1
+ COMPILER_NAME=$2
-# Check if the VS env variables were setup prior to running configure.
-# If not, then find vcvarsall.bat and run it automatically, and integrate
-# the set env variables into the spec file.
-SETUPDEVENV="# No special vars"
-if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
- # Store path to cygwin link.exe to help excluding it when searching for
- # VS linker.
- AC_PATH_PROG(CYGWIN_LINK, link)
- AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
- "$CYGWIN_LINK" --version > /dev/null
- if test $? -eq 0 ; then
- AC_MSG_RESULT([yes])
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
+ COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
+ $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
+ if test $? -ne 0; then
+ GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+
+ AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.])
+ AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"])
+ AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
else
- AC_MSG_RESULT([no])
- # This might be the VS linker. Don't exclude it later on.
- CYGWIN_LINK=""
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/p"`
+ COMPILER_VENDOR="Sun Studio"
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # First line typically looks something like:
+ # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
+ COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
+ COMPILER_VENDOR="Microsoft CL.EXE"
+ COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
+ if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
+ if test "x$COMPILER_CPU_TEST" != "x80x86"; then
+ AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".])
+ fi
+ elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+ if test "x$COMPILER_CPU_TEST" != "xx64"; then
+ AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
+ fi
+ fi
+ else
+ COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+ # Check that this is likely to be GCC.
+ $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
+ if test $? -ne 0; then
+ AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.])
+ AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
+ AC_MSG_ERROR([GCC compiler is required. Try setting --with-tools-dir.])
fi
- # If vcvarsall.bat has been run, then VCINSTALLDIR is set.
- if test "x$VCINSTALLDIR" != x; then
- # No further setup is needed. The build will happen from this kind
- # of shell.
- SETUPDEVENV="# This spec file expects that you are running bash from within a VS command prompt."
- # Make sure to remind you, if you forget to run make from a cygwin bash shell
- # that is spawned "bash -l" from a VS command prompt.
- CHECK_FOR_VCINSTALLDIR=yes
- AC_MSG_CHECKING([if you are running from within a VS command prompt])
- AC_MSG_RESULT([yes])
- else
- # Ah, we have not yet run vcvarsall.bat/vsvars32.bat/vsvars64.bat. Lets do that. First find it.
- if test "x$VS100COMNTOOLS" != x; then
- VARSBAT=`find "$VS100COMNTOOLS/../.." -name vcvarsall.bat`
- SEARCH_ROOT="$VS100COMNTOOLS"
- else
- VARSBAT=`find "$PROGRAMFILES" -name vcvarsall.bat`
- SEARCH_ROOT="$PROGRAMFILES"
- fi
- VCPATH=`dirname "$VARSBAT"`
- VCPATH=`cygpath -w "$VCPATH"`
- if test "x$VARSBAT" = x || test ! -d "$VCPATH"; then
- AC_MSG_CHECKING([if we can find the VS installation])
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Tried to find a VS installation using both $SEARCH_ROOT but failed. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
- fi
- case "$OPENJDK_TARGET_CPU" in
- x86)
- VARSBAT_ARCH=x86
- ;;
- x86_64)
- VARSBAT_ARCH=amd64
- ;;
- esac
- # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
- cd $OUTPUT_ROOT
- bash $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH"
- cd $CURDIR
- if test ! -s $OUTPUT_ROOT/localdevenv.sh || test ! -s $OUTPUT_ROOT/localdevenv.gmk; then
- AC_MSG_CHECKING([if we can extract the needed env variables])
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Could not succesfully extract the env variables needed for the VS setup. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
- fi
- # Now set all paths and other env variables. This will allow the rest of
- # the configure script to find and run the compiler in the proper way.
- . $OUTPUT_ROOT/localdevenv.sh
- AC_MSG_CHECKING([if we can find the VS installation])
- if test "x$VCINSTALLDIR" != x; then
- AC_MSG_RESULT([$VCINSTALLDIR])
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Could not find VS installation. Please install. If you are sure you have installed VS, then please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.])
- fi
- CHECK_FOR_VCINSTALLDIR=no
- SETUPDEVENV="include $OUTPUT_ROOT/localdevenv.gmk"
+ # First line typically looks something like:
+ # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
+ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/p"`
+ COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) @<:@1-9@:>@@<:@0-9.@:>@*/\1/p"`
+ fi
+ # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
+ $1_VERSION="$COMPILER_VERSION"
+ # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
+ $1_VENDOR="$COMPILER_VENDOR"
- AC_MSG_CHECKING([for msvcr100.dll])
- AC_ARG_WITH(msvcr100dll, [AS_HELP_STRING([--with-msvcr100dll],
- [copy this msvcr100.dll into the built JDK])])
- if test "x$with_msvcr100dll" != x; then
- MSVCR100DLL="$with_msvcr100dll"
- else
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x64 | head --lines 1`
- else
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
- if test "x$MSVCR100DLL" = x; then
- MSVCR100DLL=`find "$VCINSTALLDIR/.." -name msvcr100.dll | head --lines 1`
- fi
- fi
- fi
- if test "x$MSVCR100DLL" = x; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Could not find msvcr100.dll !])
- fi
- AC_MSG_RESULT([$MSVCR100DLL])
- SPACESAFE(MSVCR100DLL,[the path to msvcr100.dll])
- fi
-fi
-AC_SUBST(SETUPDEVENV)
-AC_SUBST(CHECK_FOR_VCINSTALLDIR)
-AC_SUBST(MSVCR100DLL)
+ AC_MSG_NOTICE([Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)])
])
+
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS],
[
###############################################################################
@@ -151,8 +107,67 @@
AC_SUBST(AR_OUT_OPTION)
])
-AC_DEFUN_ONCE([TOOLCHAIN_SETUP_PATHS],
+# $1 = compiler to test (CC or CXX)
+# $2 = human readable name of compiler (C or C++)
+# $3 = list of compiler names to search for
+AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
[
+ COMPILER_NAME=$2
+
+ # Do a first initial attempt at searching the list of compiler names.
+ # AC_PATH_PROGS can't be run multiple times with the same variable,
+ # so create a new name for this run.
+ AC_PATH_PROGS(POTENTIAL_$1, $3)
+ $1=$POTENTIAL_$1
+
+ if test "x$[$]$1" = x; then
+ HELP_MSG_MISSING_DEPENDENCY([devkit])
+ AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
+ fi
+ BASIC_FIXUP_EXECUTABLE($1)
+ AC_MSG_CHECKING([resolved symbolic links for $1])
+ TEST_COMPILER="[$]$1"
+ BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
+ AC_MSG_RESULT([$TEST_COMPILER])
+ AC_MSG_CHECKING([if $1 is disguised ccache])
+
+ COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
+ if test "x$COMPILER_BASENAME" = "xccache"; then
+ AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
+ # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
+ # We want to control ccache invocation ourselves, so ignore this cc and try
+ # searching again.
+
+ # Remove the path to the fake ccache cc from the PATH
+ RETRY_COMPILER_SAVED_PATH="$PATH"
+ COMPILER_DIRNAME=`$DIRNAME [$]$1`
+ PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
+
+ # Try again looking for our compiler
+ AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
+ BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
+ PATH="$RETRY_COMPILER_SAVED_PATH"
+
+ AC_MSG_CHECKING([for resolved symbolic links for $1])
+ BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
+ AC_MSG_RESULT([$PROPER_COMPILER_$1])
+ $1="$PROPER_COMPILER_$1"
+ else
+ AC_MSG_RESULT([no, keeping $1])
+ $1="$TEST_COMPILER"
+ fi
+ TOOLCHAIN_CHECK_COMPILER_VERSION([$1], [$COMPILER_NAME])
+])
+
+
+AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
+[
+if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
+fi
+
+AC_SUBST(MSVCR_DLL)
+
# If --build AND --host is set, then the configure script will find any
# cross compilation tools in the PATH. Cross compilation tools
# follows the cross compilation standard where they are prefixed with ${host}.
@@ -171,11 +186,11 @@
# Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
# to wait until they are properly discovered.
AC_PATH_PROGS(BUILD_CC, [cl cc gcc])
- SET_FULL_PATH(BUILD_CC)
+ BASIC_FIXUP_EXECUTABLE(BUILD_CC)
AC_PATH_PROGS(BUILD_CXX, [cl CC g++])
- SET_FULL_PATH(BUILD_CXX)
+ BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
AC_PATH_PROG(BUILD_LD, ld)
- SET_FULL_PATH(BUILD_LD)
+ BASIC_FIXUP_EXECUTABLE(BUILD_LD)
fi
AC_SUBST(BUILD_CC)
AC_SUBST(BUILD_CXX)
@@ -218,36 +233,40 @@
PATH=$TOOLS_DIR:$PATH
fi
+
+### Locate C compiler (CC)
+
# gcc is almost always present, but on Windows we
# prefer cl.exe and on Solaris we prefer CC.
# Thus test for them in this order.
-AC_PROG_CC([cl cc gcc])
-if test "x$CC" = x; then
- HELP_MSG_MISSING_DEPENDENCY([devkit])
- AC_MSG_ERROR([Could not find a compiler. $HELP_MSG])
-fi
-if test "x$CC" = xcc && test "x$OPENJDK_BUILD_OS" = xmacosx; then
- # Do not use cc on MacOSX use gcc instead.
- CC="gcc"
-fi
-SET_FULL_PATH(CC)
-
-AC_PROG_CXX([cl CC g++])
-if test "x$CXX" = xCC && test "x$OPENJDK_BUILD_OS" = xmacosx; then
- # The found CC, even though it seems to be a g++ derivate, cannot compile
- # c++ code. Override.
- CXX="g++"
-fi
-SET_FULL_PATH(CXX)
-
-if test "x$CXX" = x || test "x$CC" = x; then
- HELP_MSG_MISSING_DEPENDENCY([devkit])
- AC_MSG_ERROR([Could not find the needed compilers! $HELP_MSG ])
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Do not probe for cc on MacOSX.
+ COMPILER_CHECK_LIST="cl gcc"
+else
+ COMPILER_CHECK_LIST="cl cc gcc"
fi
-if test "x$OPENJDK_BUILD_OS" != xwindows; then
+TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
+# Now that we have resolved CC ourself, let autoconf have it's go at it
+AC_PROG_CC([$CC])
+
+### Locate C++ compiler (CXX)
+
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Do not probe for CC on MacOSX.
+ COMPILER_CHECK_LIST="cl g++"
+else
+ COMPILER_CHECK_LIST="cl CC g++"
+fi
+TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
+# Now that we have resolved CXX ourself, let autoconf have it's go at it
+AC_PROG_CXX([$CXX])
+
+### Locate other tools
+
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
AC_PROG_OBJC
- SET_FULL_PATH(OBJC)
+ BASIC_FIXUP_EXECUTABLE(OBJC)
else
OBJC=
fi
@@ -270,20 +289,26 @@
# Linking C++ executables.
AC_SUBST(LDEXECXX)
-if test "x$OPENJDK_BUILD_OS" != xwindows; then
+if test "x$OPENJDK_TARGET_OS" != xwindows; then
AC_CHECK_TOOL(AR, ar)
- SET_FULL_PATH(AR)
+ BASIC_FIXUP_EXECUTABLE(AR)
fi
-if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
ARFLAGS="-r"
else
ARFLAGS=""
fi
AC_SUBST(ARFLAGS)
+# For hotspot, we need these in Windows mixed path; other platforms keep them the same
+HOTSPOT_CXX="$CXX"
+HOTSPOT_LD="$LD"
+AC_SUBST(HOTSPOT_CXX)
+AC_SUBST(HOTSPOT_LD)
+
COMPILER_NAME=gcc
COMPILER_TYPE=CC
-AS_IF([test "x$OPENJDK_BUILD_OS" = xwindows], [
+AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [
# For now, assume that we are always compiling using cl.exe.
CC_OUT_OPTION=-Fo
EXE_OUT_OPTION=-out:
@@ -294,7 +319,7 @@
AC_CHECK_PROG([WINLD], [link],[link],,, [$CYGWIN_LINK])
# Since we must ignore the first found link, WINLD will contain
# the full path to the link.exe program.
- SET_FULL_PATH_SPACESAFE([WINLD])
+ BASIC_FIXUP_EXECUTABLE(WINLD)
printf "Windows linker was found at $WINLD\n"
AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
"$WINLD" --version > /dev/null
@@ -310,12 +335,25 @@
LDEXECXX="$WINLD"
AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
- SET_FULL_PATH_SPACESAFE([MT])
+ BASIC_FIXUP_EXECUTABLE(MT)
# The resource compiler
AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
- SET_FULL_PATH_SPACESAFE([RC])
+ BASIC_FIXUP_EXECUTABLE(RC)
- RC_FLAGS="-nologo /l 0x409 /r"
+ # For hotspot, we need these in Windows mixed path,
+ # so rewrite them all. Need added .exe suffix.
+ HOTSPOT_CXX="$CXX.exe"
+ HOTSPOT_LD="$LD.exe"
+ HOTSPOT_MT="$MT.exe"
+ HOTSPOT_RC="$RC.exe"
+ BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_CXX)
+ BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_LD)
+ BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_MT)
+ BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_RC)
+ AC_SUBST(HOTSPOT_MT)
+ AC_SUBST(HOTSPOT_RC)
+
+ RC_FLAGS="-nologo -l 0x409 -r"
AS_IF([test "x$VARIANT" = xOPT], [
RC_FLAGS="$RC_FLAGS -d NDEBUG"
])
@@ -333,12 +371,12 @@
# lib.exe is used to create static libraries.
AC_CHECK_PROG([WINAR], [lib],[lib],,,)
- SET_FULL_PATH_SPACESAFE([WINAR])
+ BASIC_FIXUP_EXECUTABLE(WINAR)
AR="$WINAR"
ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
- SET_FULL_PATH_SPACESAFE([DUMPBIN])
+ BASIC_FIXUP_EXECUTABLE(DUMPBIN)
COMPILER_TYPE=CL
CCXXFLAGS="$CCXXFLAGS -nologo"
@@ -347,10 +385,10 @@
AC_SUBST(COMPILER_TYPE)
AC_PROG_CPP
-SET_FULL_PATH(CPP)
+BASIC_FIXUP_EXECUTABLE(CPP)
AC_PROG_CXXCPP
-SET_FULL_PATH(CXXCPP)
+BASIC_FIXUP_EXECUTABLE(CXXCPP)
if test "x$COMPILE_TYPE" != "xcross"; then
# If we are not cross compiling, use the same compilers for
@@ -373,43 +411,44 @@
fi
# Find the right assembler.
-if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+if test "x$OPENJDK_TARGET_OS" = xsolaris; then
AC_PATH_PROG(AS, as)
- SET_FULL_PATH(AS)
+ BASIC_FIXUP_EXECUTABLE(AS)
else
AS="$CC -c"
fi
AC_SUBST(AS)
-if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+if test "x$OPENJDK_TARGET_OS" = xsolaris; then
AC_PATH_PROGS(NM, [gnm nm])
- SET_FULL_PATH(NM)
+ BASIC_FIXUP_EXECUTABLE(NM)
AC_PATH_PROG(STRIP, strip)
- SET_FULL_PATH(STRIP)
+ BASIC_FIXUP_EXECUTABLE(STRIP)
AC_PATH_PROG(MCS, mcs)
- SET_FULL_PATH(MCS)
-elif test "x$OPENJDK_BUILD_OS" != xwindows; then
+ BASIC_FIXUP_EXECUTABLE(MCS)
+elif test "x$OPENJDK_TARGET_OS" != xwindows; then
AC_CHECK_TOOL(NM, nm)
- SET_FULL_PATH(NM)
+ BASIC_FIXUP_EXECUTABLE(NM)
AC_CHECK_TOOL(STRIP, strip)
- SET_FULL_PATH(STRIP)
+ BASIC_FIXUP_EXECUTABLE(STRIP)
fi
-###
-#
-# Check for objcopy
-#
-# but search for gobjcopy first...
-# since I on solaris found a broken objcopy...buhh
-#
-AC_PATH_TOOL(OBJCOPY, gobjcopy)
-if test "x$OBJCOPY" = x; then
- AC_PATH_TOOL(OBJCOPY, objcopy)
+# objcopy is used for moving debug symbols to separate files when
+# full debug symbols are enabled.
+if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
+ BASIC_FIXUP_EXECUTABLE(OBJCOPY)
+fi
+
+AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+if test "x$OBJDUMP" != x; then
+ # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
+ BASIC_FIXUP_EXECUTABLE(OBJDUMP)
fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
AC_PATH_PROG(LIPO, lipo)
- SET_FULL_PATH(LIPO)
+ BASIC_FIXUP_EXECUTABLE(LIPO)
fi
# Restore old path without tools dir
@@ -449,7 +488,7 @@
POST_STRIP_CMD="$STRIP -g"
# Linking is different on MacOSX
- if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Might change in the future to clang.
COMPILER_NAME=gcc
SHARED_LIBRARY='lib[$]1.dylib'
@@ -463,7 +502,7 @@
POST_STRIP_CMD="$STRIP -S"
fi
else
- if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
COMPILER_NAME=ossc
PICFLAG="-KPIC"
@@ -487,7 +526,7 @@
POST_STRIP_CMD="$STRIP -x"
POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
fi
- if test "x$OPENJDK_BUILD_OS" = xwindows; then
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
# If it is not gcc, then assume it is the MS Visual Studio compiler
COMPILER_NAME=cl
PICFLAG=""
@@ -626,6 +665,11 @@
# Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
#CC_HIGHEST="$CC_HIGHEST -xlibmopt"
+ if test "x$OPENJDK_TARGET_CPU" = xsparc; then
+ CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
+ CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
+ fi
+
case $OPENJDK_TARGET_CPU_ARCH in
x86)
C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
@@ -642,8 +686,6 @@
fi
;;
sparc)
- CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
- CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
@@ -759,7 +801,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
case $OPENJDK_TARGET_CPU_ARCH in
x86 )
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -Di386"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
;;
esac
@@ -859,7 +901,7 @@
# libraries will link to whatever is in memory. Yuck.
#
# Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
-if test "x$COMPILER_TYPE" = xCL; then
+if test "x$COMPILER_NAME" = xcl; then
LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
if test "x$OPENJDK_TARGET_CPU" = xx86; then
LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
@@ -875,19 +917,23 @@
fi
LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
else
- # If this is a --hash-style=gnu system, use --hash-style=both, why?
- HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
- if test -n "$HAS_GNU_HASH"; then
- # And since we now know that the linker is gnu, then add -z defs, to forbid
- # undefined symbols in object files.
- LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both -Xlinker -z -Xlinker defs"
- if test "x$DEBUG_LEVEL" == "xrelease"; then
- # When building release libraries, tell the linker optimize them.
- # Should this be supplied to the OSS linker as well?
- LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+ if test "x$COMPILER_NAME" = xgcc; then
+ # If this is a --hash-style=gnu system, use --hash-style=both, why?
+ HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
+ if test -n "$HAS_GNU_HASH"; then
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
+ fi
+ if test "x$OPENJDK_TARGET_OS" = xlinux; then
+ # And since we now know that the linker is gnu, then add -z defs, to forbid
+ # undefined symbols in object files.
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
+ if test "x$DEBUG_LEVEL" = "xrelease"; then
+ # When building release libraries, tell the linker optimize them.
+ # Should this be supplied to the OSS linker as well?
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+ fi
fi
fi
-
LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server \
-L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client \
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
new file mode 100644
index 0000000..f034ded
--- /dev/null
+++ b/common/autoconf/toolchain_windows.m4
@@ -0,0 +1,258 @@
+#
+# Copyright (c) 2011, 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.
+#
+
+AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
+[
+ if test "x$VS_ENV_CMD" = x; then
+ VS100BASE="$1"
+ METHOD="$2"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS100BASE)
+ if test -d "$VS100BASE"; then
+ if test -f "$VS100BASE/$VCVARSFILE"; then
+ AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD])
+ VS_ENV_CMD="$VS100BASE/$VCVARSFILE"
+ else
+ AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD])
+ AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring])
+ fi
+ fi
+ fi
+])
+
+AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
+[
+ if test "x$VS_ENV_CMD" = x; then
+ WIN_SDK_BASE="$1"
+ METHOD="$2"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
+ if test -d "$WIN_SDK_BASE"; then
+ if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
+ AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
+ VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VS_ENV_ARGS="/x86"
+ else
+ VS_ENV_ARGS="/x64"
+ fi
+ else
+ AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
+ AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring])
+ fi
+ fi
+ fi
+])
+
+AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
+[
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ VCVARSFILE="vc/bin/vcvars32.bat"
+ else
+ VCVARSFILE="vc/bin/amd64/vcvars64.bat"
+ fi
+
+ VS_ENV_CMD=""
+ VS_ENV_ARGS=""
+ if test "x$with_toolsdir" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$with_toolsdir/../..], [--with-tools-dir])
+ fi
+
+ if test "x$with_toolsdir" != x && test "x$VS_ENV_CMD" = x; then
+ # Having specified an argument which is incorrect will produce an instant failure;
+ # we should not go on looking
+ AC_MSG_NOTICE([The path given by --with-tools-dir does not contain a valid Visual Studio installation])
+ AC_MSG_NOTICE([Please point to the VC/bin directory within the Visual Studio installation])
+ AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
+ fi
+
+ if test "x$ProgramW6432" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
+ fi
+ if test "x$PROGRAMW6432" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
+ fi
+ if test "x$PROGRAMFILES" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMFILES/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
+ fi
+ TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
+ TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin], [well-known name])
+
+ if test "x$VS100COMNTOOLS" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable])
+ fi
+ if test "x$PROGRAMFILES" != x; then
+ TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$PROGRAMFILES/Microsoft Visual Studio 10.0], [well-known name])
+ fi
+ TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files/Microsoft Visual Studio 10.0], [well-known name])
+ TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files (x86)/Microsoft Visual Studio 10.0], [well-known name])
+])
+
+# Check if the VS env variables were setup prior to running configure.
+# If not, then find vcvarsall.bat and run it automatically, and integrate
+# the set env variables into the spec file.
+AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
+[
+ # Store path to cygwin link.exe to help excluding it when searching for
+ # VS linker. This must be done before changing the PATH when looking for VS.
+ AC_PATH_PROG(CYGWIN_LINK, link)
+ if test "x$CYGWIN_LINK" != x; then
+ AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
+ "$CYGWIN_LINK" --version > /dev/null
+ if test $? -eq 0 ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ # This might be the VS linker. Don't exclude it later on.
+ CYGWIN_LINK=""
+ fi
+ fi
+
+ # First-hand choice is to locate and run the vsvars bat file.
+ TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE
+ if test "x$VS_ENV_CMD" != x; then
+ # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file.
+ BASIC_FIXUP_EXECUTABLE(VS_ENV_CMD)
+
+ # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
+ AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
+ cd $OUTPUT_ROOT
+ # FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
+ # to autoconf standards.
+
+ #----
+
+ # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
+ # but calculate the difference in Cygwin environment before/after running it and then
+ # apply the diff.
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ _vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
+ _dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
+ _dosbash=`cygpath -a -w -s \`which bash\`.*`
+ else
+ _dosvs10varsall=`cmd //c echo $VS_ENV_CMD`
+ _dosbash=`cmd //c echo \`which bash\``
+ fi
+
+ # generate the set of exported vars before/after the vs10 setup
+ $ECHO "@echo off" > localdevenvtmp.bat
+ $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
+ $ECHO "call $_dosvs10varsall $VS_ENV_ARGS" >> localdevenvtmp.bat
+ $ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
+
+ # Now execute the newly created bat file.
+ # The | cat is to stop SetEnv.Cmd to mess with system colors on msys
+ cmd /c localdevenvtmp.bat | cat
+
+ # apply the diff (less some non-vs10 vars named by "!")
+ $SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
+ $SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
+ $COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
+
+ # cleanup
+ $RM localdevenvtmp*
+ #----
+ cd $CURDIR
+ if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
+ AC_MSG_RESULT([no])
+ AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.])
+ AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
+ AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+
+ # Now set all paths and other env variables. This will allow the rest of
+ # the configure script to find and run the compiler in the proper way.
+ AC_MSG_NOTICE([Setting extracted environment variables])
+ . $OUTPUT_ROOT/localdevenv.sh
+ else
+ # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
+ AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
+ fi
+
+ # At this point, we should have corrent variables in the environment, or we can't continue.
+ AC_MSG_CHECKING([for Visual Studio variables])
+
+ if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
+ if test "x$INCLUDE" = x || test "x$LIB" = x; then
+ AC_MSG_RESULT([present but broken])
+ AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
+ else
+ AC_MSG_RESULT([ok])
+ VS_INCLUDE="$INCLUDE"
+ VS_LIB="$LIB"
+ VS_PATH="$PATH"
+ AC_SUBST(VS_INCLUDE)
+ AC_SUBST(VS_LIB)
+ AC_SUBST(VS_PATH)
+ fi
+ else
+ AC_MSG_RESULT([not found])
+
+ if test "x$VS_ENV_CMD" = x; then
+ AC_MSG_NOTICE([Cannot locate a valid Visual Studio or Windows SDK installation on disk,])
+ AC_MSG_NOTICE([nor is this script run from a Visual Studio command prompt.])
+ else
+ AC_MSG_NOTICE([Running the extraction script failed.])
+ fi
+ AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
+ AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+
+ AC_MSG_CHECKING([for msvcr100.dll])
+ AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
+ [copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])])
+ if test "x$with_msvcr_dll" != x; then
+ MSVCR_DLL="$with_msvcr_dll"
+ else
+ if test "x$VCINSTALLDIR" != x; then
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1`
+ else
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
+ if test "x$MSVCR_DLL" = x; then
+ MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1`
+ fi
+ fi
+ if test "x$MSVCR_DLL" != x; then
+ AC_MSG_NOTICE([msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR])
+ else
+ AC_MSG_NOTICE([Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR])
+ fi
+ fi
+ if test "x$MSVCR_DLL" = x; then
+ if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then
+ AC_MSG_NOTICE([msvcr100.dll found in $SYSTEMROOT/system32])
+ MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll"
+ fi
+ fi
+ fi
+ if test "x$MSVCR_DLL" = x; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Could not find msvcr100.dll !])
+ fi
+ AC_MSG_RESULT([$MSVCR_DLL])
+ BASIC_FIXUP_PATH(MSVCR_DLL)
+])
diff --git a/common/autoconf/version.numbers b/common/autoconf/version.numbers
index fc558c22..f174ed4 100644
--- a/common/autoconf/version.numbers
+++ b/common/autoconf/version.numbers
@@ -34,3 +34,7 @@
PRODUCT_SUFFIX="Runtime Environment"
JDK_RC_PLATFORM_NAME=Platform
COMPANY_NAME=N/A
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="OpenJDK"
+MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
new file mode 100644
index 0000000..ef3e80f
--- /dev/null
+++ b/common/bin/compare.sh
@@ -0,0 +1,1220 @@
+#!/bin/bash
+#
+# Copyright (c) 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.
+#
+# 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 script is processed by configure before it's usable. It is run from
+# the root of the build directory.
+
+
+##########################################################################################
+
+# Check that we are run via the wrapper generated by configure
+if [ -z "$SRC_ROOT" ]; then
+ echo "Error: You must run this script using build/[conf]/compare.sh"
+ exit 1
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
+ FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d"
+ LDD_CMD="$OTOOL -L"
+ DIS_CMD="$OTOOL -v -t"
+ STAT_PRINT_SIZE="-f %z"
+elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ FULLDUMP_CMD="$DUMPBIN -all"
+ LDD_CMD="$DUMPBIN -dependants | $GREP .dll"
+ DIS_CMD="$DUMPBIN -disasm:nobytes"
+ STAT_PRINT_SIZE="-c %s"
+else
+ FULLDUMP_CMD="$READELF -a"
+ LDD_CMD="$LDD"
+ DIS_CMD="$OBJDUMP -d"
+ STAT_PRINT_SIZE="-c %s"
+fi
+
+UNARCHIVE="$UNZIP -q"
+
+COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
+if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
+ echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
+ exit 1
+fi
+# Include exception definitions
+. "$COMPARE_EXCEPTIONS_INCLUDE"
+
+##########################################################################################
+# Compare text files and ignore specific differences:
+#
+# * Timestamps in Java sources generated by idl2java
+# * Sorting order and cleanup style in .properties files
+
+diff_text() {
+ OTHER_FILE=$1
+ THIS_FILE=$2
+
+ SUFFIX="${THIS_FILE##*.}"
+
+ TMP=1
+
+ if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
+ TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
+ $GREP '^[<>]' | \
+ $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
+ -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
+ fi
+ if test "x$SUFFIX" = "xjava"; then
+ TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
+ $GREP '^[<>]' | \
+ $SED -e '/[<>] \* from.*\.idl/d' \
+ -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
+ -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
+ -e '/\/\/ Generated from input file.*/d' \
+ -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
+ -e '/\/\/ java GenerateCharacter.*/d')
+ fi
+ # Ignore date strings in class files.
+ # On Macosx the system sources for generated java classes produce different output on
+ # consequtive invokations seemingly randomly.
+ # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
+ if test "x$SUFFIX" = "xclass"; then
+ # To improve performance when large diffs are found, do a rough filtering of classes
+ # elibeble for these exceptions
+ if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
+ $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
+ $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
+ TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
+ $GREP '^[<>]' | \
+ $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
+ -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
+ -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
+ -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
+ fi
+ fi
+ if test "x$SUFFIX" = "xproperties"; then
+ $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+ | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
+ | $SED -e '/^#/d' -e '/^$/d' \
+ -e :a -e '/\\$/N; s/\\\n//; ta' \
+ -e 's/^[ \t]*//;s/[ \t]*$//' \
+ -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
+ TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
+ fi
+ if test -n "$TMP"; then
+ echo Files $OTHER_FILE and $THIS_FILE differ
+ return 1
+ fi
+
+ return 0
+}
+
+##########################################################################################
+# Compare directory structure
+
+compare_dirs() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ mkdir -p $WORK_DIR
+
+ (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
+ (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
+
+ $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff
+
+ echo -n Directory structure...
+ if [ -s $WORK_DIR/dirs_diff ]; then
+ echo Differences found.
+ REGRESSIONS=true
+ # Differences in directories found.
+ ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff)
+ if [ "$ONLY_OTHER" ]; then
+ echo Only in $OTHER
+ $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g'
+ fi
+ ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff)
+ if [ "$ONLY_THIS" ]; then
+ echo Only in $THIS
+ $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g'
+ fi
+ else
+ echo Identical!
+ fi
+}
+
+
+##########################################################################################
+# Compare file structure
+
+compare_files() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ $MKDIR -p $WORK_DIR
+
+ (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other)
+ (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this)
+
+ $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff
+
+ echo -n File names...
+ if [ -s $WORK_DIR/files_diff ]; then
+ echo Differences found.
+ REGRESSIONS=true
+ # Differences in files found.
+ ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff)
+ if [ "$ONLY_OTHER" ]; then
+ echo Only in $OTHER
+ $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g'
+ fi
+ ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff)
+ if [ "$ONLY_THIS" ]; then
+ echo Only in $THIS
+ $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g'
+ fi
+ else
+ echo Identical!
+ fi
+}
+
+
+##########################################################################################
+# Compare permissions
+
+compare_permissions() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ mkdir -p $WORK_DIR
+
+ echo -n Permissions...
+ found=""
+ for f in `cd $OTHER_DIR && $FIND . -type f`
+ do
+ if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
+ if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
+ OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
+ TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
+ if [ "$OP" != "$TP" ]
+ then
+ if [ -z "$found" ]; then echo ; found="yes"; fi
+ $PRINTF "\told: ${OP} new: ${TP}\t$f\n"
+ fi
+ done
+ if [ -z "$found" ]; then
+ echo "Identical!"
+ else
+ REGRESSIONS=true
+ fi
+}
+
+##########################################################################################
+# Compare file command output
+
+compare_file_types() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ $MKDIR -p $WORK_DIR
+
+ echo -n File types...
+ found=""
+ for f in `cd $OTHER_DIR && $FIND . ! -type d`
+ do
+ if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
+ if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
+ OF=`cd ${OTHER_DIR} && $FILE -h $f`
+ TF=`cd ${THIS_DIR} && $FILE -h $f`
+ if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]]
+ then
+ if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
+ then
+ # the way we produces zip-files make it so that directories are stored in old file
+ # but not in new (only files with full-path)
+ # this makes file-5.09 report them as different
+ continue;
+ fi
+ fi
+
+ if [ "$OF" != "$TF" ]
+ then
+ if [ -z "$found" ]; then echo ; found="yes"; fi
+ $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
+ fi
+ done
+ if [ -z "$found" ]; then
+ echo "Identical!"
+ else
+ REGRESSIONS=true
+ fi
+}
+
+##########################################################################################
+# Compare the rest of the files
+
+compare_general_files() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
+ ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
+ ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
+ ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
+ ! -name "*.lib" ! -name "*.war" \
+ | $GREP -v "./bin/" | $SORT | $FILTER)
+
+ echo General files...
+ for f in $GENERAL_FILES
+ do
+ if [ -e $OTHER_DIR/$f ]; then
+ if [ "$(basename $f)" = "release" ]; then
+ # Ignore differences in change numbers in release file.
+ OTHER_FILE=$WORK_DIR/$f.other
+ THIS_FILE=$WORK_DIR/$f.this
+ $MKDIR -p $(dirname $OTHER_FILE)
+ $MKDIR -p $(dirname $THIS_FILE)
+ $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE
+ $CAT $THIS_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE
+ else
+ OTHER_FILE=$OTHER_DIR/$f
+ THIS_FILE=$THIS_DIR/$f
+ fi
+ DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1)
+ if [ -n "$DIFF_OUT" ]; then
+ echo $f
+ REGRESSIONS=true
+ if [ "$SHOW_DIFFS" = "true" ]; then
+ echo "$DIFF_OUT"
+ fi
+ fi
+ fi
+ done
+
+
+}
+
+##########################################################################################
+# Compare zip file
+
+compare_zip_file() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+ ZIP_FILE=$4
+
+ THIS_ZIP=$THIS_DIR/$ZIP_FILE
+ OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
+
+ THIS_SUFFIX="${THIS_ZIP##*.}"
+ OTHER_SUFFIX="${OTHER_ZIP##*.}"
+ if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
+ echo The files do not have the same suffix type!
+ return 2
+ fi
+
+ TYPE="$THIS_SUFFIX"
+
+ if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
+ then
+ return 0
+ fi
+ # Not quite identical, the might still contain the same data.
+ # Unpack the jar/zip files in temp dirs
+
+ THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
+ OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
+ $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
+ $MKDIR -p $THIS_UNZIPDIR
+ $MKDIR -p $OTHER_UNZIPDIR
+ (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
+ (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
+
+ CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
+ # On solaris, there is no -q option.
+ if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
+ LANG=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
+ | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
+ > $CONTENTS_DIFF_FILE
+ else
+ LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
+ fi
+
+ ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
+ ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
+
+ return_value=0
+
+ if [ -n "$ONLY_OTHER" ]; then
+ echo " Only OTHER $ZIP_FILE contains:"
+ echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g'
+ return_value=1
+ fi
+
+ if [ -n "$ONLY_THIS" ]; then
+ echo " Only THIS $ZIP_FILE contains:"
+ echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g'
+ return_value=1
+ fi
+
+ if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
+ DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \
+ | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
+ else
+ DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
+ | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
+ fi
+
+ $RM -f $WORK_DIR/$ZIP_FILE.diffs
+ for file in $DIFFING_FILES; do
+ if [[ "$ACCEPTED_JARZIP_CONTENTS" != *"$file"* ]]; then
+ diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
+ fi
+ done
+
+ if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
+ return_value=1
+ echo " Differing files in $ZIP_FILE"
+ $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \
+ $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist
+ $CAT $WORK_DIR/$ZIP_FILE.difflist
+
+ if [ -n "$SHOW_DIFFS" ]; then
+ for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
+ if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
+ LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
+ elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
+ LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
+ else
+ LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
+ fi
+ done
+ fi
+ fi
+
+ return $return_value
+}
+
+
+##########################################################################################
+# Compare all zip files
+
+compare_all_zip_files() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
+
+ if [ -n "$ZIPS" ]; then
+ echo Zip files...
+
+ return_value=0
+ for f in $ZIPS; do
+ if [ -f "$OTHER_DIR/$f" ]; then
+ compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
+ if [ "$?" != "0" ]; then
+ return_value=1
+ REGRESSIONS=true
+ fi
+ fi
+ done
+ fi
+
+ return $return_value
+}
+
+##########################################################################################
+# Compare all jar files
+
+compare_all_jar_files() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ # TODO filter?
+ ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER)
+
+ if [ -n "$ZIPS" ]; then
+ echo Jar files...
+
+ return_value=0
+ for f in $ZIPS; do
+ if [ -f "$OTHER_DIR/$f" ]; then
+ compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
+ if [ "$?" != "0" ]; then
+ return_value=1
+ REGRESSIONS=true
+ fi
+ fi
+ done
+ fi
+
+ return $return_value
+}
+
+##########################################################################################
+# Compare binary (executable/library) file
+
+compare_bin_file() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+ BIN_FILE=$4
+
+ THIS_FILE=$THIS_DIR/$BIN_FILE
+ OTHER_FILE=$OTHER_DIR/$BIN_FILE
+ NAME=$(basename $BIN_FILE)
+ WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
+ FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
+
+ $MKDIR -p $FILE_WORK_DIR
+
+ ORIG_THIS_FILE="$THIS_FILE"
+ ORIG_OTHER_FILE="$OTHER_FILE"
+
+ if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
+ THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
+ OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
+ $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
+ $CP $THIS_FILE $THIS_STRIPPED_FILE
+ $CP $OTHER_FILE $OTHER_STRIPPED_FILE
+ $STRIP $THIS_STRIPPED_FILE
+ $STRIP $OTHER_STRIPPED_FILE
+ THIS_FILE="$THIS_STRIPPED_FILE"
+ OTHER_FILE="$OTHER_STRIPPED_FILE"
+ fi
+
+ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ unset _NT_SYMBOL_PATH
+ # On windows we need to unzip the debug symbols, if present
+ OTHER_FILE_BASE=${OTHER_FILE/.dll/}
+ OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/}
+ DIZ_NAME=$(basename $OTHER_FILE_BASE).diz
+ # java.exe and java.dll diz files will have the same name. Have to
+ # make sure java.exe gets the right one. This is only needed for
+ # OTHER since in the new build, all pdb files are left around.
+ if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then
+ OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz"
+ elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
+ OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
+ else
+ # Some files, jli.dll, appears twice in the image but only one of
+ # thme has a diz file next to it.
+ OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)"
+ if [ ! -f "$OTHER_DIZ_FILE" ]; then
+ # As a last resort, look for diz file in the whole build output
+ # dir.
+ OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)"
+ fi
+ fi
+ if [ -n "$OTHER_DIZ_FILE" ]; then
+ $MKDIR -p $FILE_WORK_DIR/other
+ (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE)
+ export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other"
+ fi
+ THIS_FILE_BASE=${THIS_FILE/.dll/}
+ THIS_FILE_BASE=${THIS_FILE_BASE/.exe/}
+ if [ -f "${THIS_FILE/.dll/}.diz" ]; then
+ THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
+ else
+ THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
+ if [ ! -f "$THIS_DIZ_FILE" ]; then
+ # As a last resort, look for diz file in the whole build output
+ # dir.
+ THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)"
+ fi
+ fi
+ if [ -n "$THIS_DIZ_FILE" ]; then
+ $MKDIR -p $FILE_WORK_DIR/this
+ (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE)
+ export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this"
+ fi
+ fi
+
+ if [ -z "$SKIP_BIN_DIFF" ]; then
+ if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
+ # The files were bytewise identical.
+ if [ -n "$VERBOSE" ]; then
+ echo " : : : : : $BIN_FILE"
+ fi
+ return 0
+ fi
+ BIN_MSG=" diff "
+ if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_BIN=true
+ if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
+ BIN_MSG="*$BIN_MSG*"
+ REGRESSIONS=true
+ else
+ BIN_MSG=" $BIN_MSG "
+ fi
+ else
+ BIN_MSG="($BIN_MSG)"
+ DIFF_BIN=
+ fi
+ fi
+
+ if [ -n "$STAT" ]; then
+ THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE")
+ OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE")
+ else
+ THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
+ OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
+ fi
+ if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
+ DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
+ DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
+ SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
+ if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then
+ SIZE_MSG="($SIZE_MSG)"
+ DIFF_SIZE=
+ elif [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_NUM" = 512 ]; then
+ # On windows, size of binaries increase in 512 increments.
+ SIZE_MSG="($SIZE_MSG)"
+ DIFF_SIZE=
+ else
+ if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_SIZE=true
+ if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
+ SIZE_MSG="*$SIZE_MSG*"
+ REGRESSIONS=true
+ else
+ SIZE_MSG=" $SIZE_MSG "
+ fi
+ else
+ SIZE_MSG="($SIZE_MSG)"
+ DIFF_SIZE=
+ fi
+ fi
+ else
+ SIZE_MSG=" "
+ DIFF_SIZE=
+ if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
+ SIZE_MSG=" ! "
+ fi
+ fi
+
+ if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
+ SYM_SORT_CMD="sort"
+ else
+ SYM_SORT_CMD="cat"
+ fi
+
+ # Check symbols
+ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ # The output from dumpbin on windows differs depending on if the debug symbol
+ # files are still around at the location the binary is pointing too. Need
+ # to filter out that extra information.
+ $DUMPBIN -exports $OTHER_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
+ $DUMPBIN -exports $THIS_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
+ elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
+ # Some symbols get seemingly random 15 character prefixes. Filter them out.
+ $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
+ $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
+ else
+ $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
+ $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
+ fi
+
+ LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
+ if [ -s $WORK_FILE_BASE.symbols.diff ]; then
+ SYM_MSG=" diff "
+ if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_SYM=true
+ if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
+ SYM_MSG="*$SYM_MSG*"
+ REGRESSIONS=true
+ else
+ SYM_MSG=" $SYM_MSG "
+ fi
+ else
+ SYM_MSG="($SYM_MSG)"
+ DIFF_SYM=
+ fi
+ else
+ SYM_MSG=" "
+ DIFF_SYM=
+ if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
+ SYM_MSG=" ! "
+ fi
+ fi
+
+ # Check dependencies
+ if [ -n "$LDD_CMD" ]; then
+ (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
+ (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
+ (cd $FILE_WORK_DIR && $RM -f $NAME)
+
+ LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
+ LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
+
+ if [ -s $WORK_FILE_BASE.deps.diff ]; then
+ if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
+ DEP_MSG=" diff "
+ else
+ DEP_MSG=" redun "
+ fi
+ if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_DEP=true
+ if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
+ DEP_MSG="*$DEP_MSG*"
+ REGRESSIONS=true
+ else
+ DEP_MSG=" $DEP_MSG "
+ fi
+ else
+ DEP_MSG="($DEP_MSG)"
+ DIFF_DEP=
+ fi
+ else
+ DEP_MSG=" "
+ DIFF_DEP=
+ if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
+ DEP_MSG=" ! "
+ fi
+ fi
+ else
+ DEP_MSG=" - "
+ fi
+
+ # Compare fulldump output
+ if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
+ $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1
+ $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1
+ LANG=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
+
+ if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
+ ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
+ ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
+ if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_ELF=true
+ if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
+ ELF_MSG="*$ELF_MSG*"
+ REGRESSIONS=true
+ else
+ ELF_MSG=" $ELF_MSG "
+ fi
+ else
+ ELF_MSG="($ELF_MSG)"
+ DIFF_ELF=
+ fi
+ else
+ ELF_MSG=" "
+ DIFF_ELF=
+ if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
+ ELF_MSG=" ! "
+ fi
+ fi
+ fi
+
+ # Compare disassemble output
+ if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
+ if [ -z "$DIS_DIFF_FILTER" ]; then
+ DIS_DIFF_FILTER="$CAT"
+ fi
+ $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1
+ $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1
+
+ LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
+
+ if [ -s $WORK_FILE_BASE.dis.diff ]; then
+ DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
+ DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
+ if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
+ DIFF_DIS=true
+ if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
+ DIS_MSG="*$DIS_MSG*"
+ REGRESSIONS=true
+ else
+ DIS_MSG=" $DIS_MSG "
+ fi
+ else
+ DIS_MSG="($DIS_MSG)"
+ DIFF_DIS=
+ fi
+ else
+ DIS_MSG=" "
+ DIFF_DIS=
+ if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
+ DIS_MSG=" ! "
+ fi
+ fi
+ fi
+
+
+ if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
+ if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
+ if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
+ if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
+ if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
+ if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi
+ if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
+ echo " $BIN_FILE"
+ if [ "$SHOW_DIFFS" = "true" ]; then
+ if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
+ echo "Symbols diff:"
+ $CAT $WORK_FILE_BASE.symbols.diff
+ fi
+ if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
+ echo "Deps diff:"
+ $CAT $WORK_FILE_BASE.deps.diff
+ fi
+ if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then
+ echo "Fulldump diff:"
+ $CAT $WORK_FILE_BASE.fulldump.diff
+ fi
+ if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
+ echo "Disassembly diff:"
+ $CAT $WORK_FILE_BASE.dis.diff
+ fi
+ fi
+ return 1
+ fi
+ return 0
+}
+
+##########################################################################################
+# Print binary diff header
+
+print_binary_diff_header() {
+ if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
+ if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi
+ if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
+ if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi
+ if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi
+ if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi
+ echo
+}
+
+##########################################################################################
+# Compare all libraries
+
+compare_all_libs() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' \) | $SORT | $FILTER)
+
+ if [ -n "$LIBS" ]; then
+ echo Libraries...
+ print_binary_diff_header
+ for l in $LIBS; do
+ if [ -f "$OTHER_DIR/$l" ]; then
+ compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
+ if [ "$?" != "0" ]; then
+ return_value=1
+ fi
+ fi
+ done
+ fi
+
+ return $return_value
+}
+
+##########################################################################################
+# Compare all executables
+
+compare_all_execs() {
+ THIS_DIR=$1
+ OTHER_DIR=$2
+ WORK_DIR=$3
+
+ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
+ else
+ EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' -o -name '*.jar' -o -name '*.diz' \) | $SORT | $FILTER)
+ fi
+
+ if [ -n "$EXECS" ]; then
+ echo Executables...
+ print_binary_diff_header
+ for e in $EXECS; do
+ if [ -f "$OTHER_DIR/$e" ]; then
+ compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
+ if [ "$?" != "0" ]; then
+ return_value=1
+ fi
+ fi
+ done
+ fi
+
+ return $return_value
+}
+
+##########################################################################################
+# Initiate configuration
+
+COMPARE_ROOT=/tmp/cimages.$USER
+$MKDIR -p $COMPARE_ROOT
+if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ if [ "$(uname -o)" = "Cygwin" ]; then
+ COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
+ fi
+fi
+
+THIS="$( cd "$( dirname "$0" )" && pwd )"
+echo "$THIS"
+THIS_SCRIPT="$0"
+
+if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
+ echo "bash ./compare.sh [OPTIONS] [FILTER]"
+ echo ""
+ echo "-all Compare all files in all known ways"
+ echo "-names Compare the file names and directory structure"
+ echo "-perms Compare the permission bits on all files and directories"
+ echo "-types Compare the output of the file command on all files"
+ echo "-general Compare the files not convered by the specialized comparisons"
+ echo "-zips Compare the contents of all zip files"
+ echo "-jars Compare the contents of all jar files"
+ echo "-libs Compare all native libraries"
+ echo "-execs Compare all executables"
+ echo "-v Verbose output, does not hide known differences"
+ echo "-vv More verbose output, shows diff output of all comparisons"
+ echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory"
+ echo ""
+ echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
+ echo "Example:"
+ echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
+ exit 10
+fi
+
+CMP_NAMES=false
+CMP_PERMS=false
+CMP_TYPES=false
+CMP_GENERAL=false
+CMP_ZIPS=false
+CMP_JARS=false
+CMP_LIBS=false
+CMP_EXECS=false
+
+while [ -n "$1" ]; do
+ case "$1" in
+ -v)
+ VERBOSE=true
+ ;;
+ -vv)
+ VERBOSE=true
+ SHOW_DIFFS=true
+ ;;
+ -o)
+ OTHER="$2"
+ shift
+ ;;
+ -all)
+ CMP_NAMES=true
+ if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
+ CMP_PERMS=true
+ fi
+ CMP_TYPES=true
+ CMP_GENERAL=true
+ CMP_ZIPS=true
+ CMP_JARS=true
+ CMP_LIBS=true
+ CMP_EXECS=true
+ ;;
+ -names)
+ CMP_NAMES=true
+ ;;
+ -perms)
+ CMP_PERMS=true
+ ;;
+ -types)
+ CMP_TYPES=true
+ ;;
+ -general)
+ CMP_GENERAL=true
+ ;;
+ -zips)
+ CMP_ZIPS=true
+ ;;
+ -jars)
+ CMP_JARS=true
+ ;;
+ -libs)
+ CMP_LIBS=true
+ ;;
+ -execs)
+ CMP_EXECS=true
+ ;;
+ *)
+ CMP_NAMES=false
+ CMP_PERMS=false
+ CMP_TYPES=false
+ CMP_ZIPS=true
+ CMP_JARS=true
+ CMP_LIBS=true
+ CMP_EXECS=true
+
+ if [ -z "$FILTER" ]; then
+ FILTER="$GREP"
+ fi
+ FILTER="$FILTER -e $1"
+ ;;
+ esac
+ shift
+done
+
+if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
+ CMP_NAMES=true
+ CMP_PERMS=true
+ CMP_TYPES=true
+ CMP_GENERAL=true
+ CMP_ZIPS=true
+ CMP_JARS=true
+ CMP_LIBS=true
+ CMP_EXECS=true
+fi
+
+if [ -z "$FILTER" ]; then
+ FILTER="$CAT"
+fi
+
+if [ -z "$OTHER" ]; then
+ OTHER="$THIS/../$LEGACY_BUILD_DIR"
+ if [ -d "$OTHER" ]; then
+ OTHER="$( cd "$OTHER" && pwd )"
+ else
+ echo "Default old build directory does not exist:"
+ echo "$OTHER"
+ exit 1
+ fi
+ echo "Comparing to default old build:"
+ echo "$OTHER"
+ echo
+else
+ if [ ! -d "$OTHER" ]; then
+ echo "Other build directory does not exist:"
+ echo "$OTHER"
+ exit 1
+ fi
+ OTHER="$( cd "$OTHER" && pwd )"
+ echo "Comparing to:"
+ echo "$OTHER"
+ echo
+fi
+
+
+# Figure out the layout of the this build. Which kinds of images have been produced
+if [ -d "$THIS/deploy/j2sdk-image" ]; then
+ THIS_J2SDK="$THIS/deploy/j2sdk-image"
+ THIS_J2RE="$THIS/deploy/j2re-image"
+elif [ -d "$THIS/images/j2sdk-image" ]; then
+ THIS_J2SDK="$THIS/images/j2sdk-image"
+ THIS_J2RE="$THIS/images/j2re-image"
+fi
+if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
+ THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+ THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+fi
+
+if [ -d "$THIS/images/j2sdk-bundle" ]; then
+ THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
+ THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+fi
+
+# Figure out the layout of the other build (old or new, normal or overlay image)
+if [ -d "$OTHER/j2sdk-image" ]; then
+ if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
+ OTHER_J2SDK="$OTHER/j2sdk-image"
+ OTHER_J2RE="$OTHER/j2re-image"
+ else
+ OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
+ OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+ fi
+
+fi
+
+if [ -d "$OTHER/j2sdk-bundle" ]; then
+ OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
+ OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+fi
+
+if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
+ if [ -z "$THIS_J2SDK_OVERLAY" ]; then
+ echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
+ exit 1
+ fi
+fi
+
+if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
+ echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
+ exit 1
+fi
+
+if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+ echo "WARNING! OTHER build has bundles built while this build does not."
+ echo "Skipping bundle compare!"
+fi
+
+##########################################################################################
+# Do the work
+
+if [ "$CMP_NAMES" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ echo -n "J2SDK "
+ compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ echo -n "J2RE "
+ compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
+
+ echo -n "J2SDK "
+ compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ echo -n "J2RE "
+ compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "J2SDK Overlay "
+ compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ echo -n "J2RE Overlay "
+ compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
+
+ echo -n "J2SDK Overlay "
+ compare_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ echo -n "J2RE Overlay "
+ compare_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
+ fi
+ if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+ echo -n "J2SDK Bundle "
+ compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
+ echo -n "J2RE Bundle "
+ compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
+
+ echo -n "J2SDK Bundle "
+ compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
+ echo -n "J2RE Bundle "
+ compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
+ fi
+fi
+
+if [ "$CMP_PERMS" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ echo -n "J2SDK "
+ compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ echo -n "J2RE "
+ compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "J2SDK Overlay "
+ compare_permissions $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ echo -n "J2RE Overlay "
+ compare_permissions $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
+ fi
+ if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+ echo -n "J2SDK Bundle "
+ compare_permissions $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
+ echo -n "J2RE Bundle "
+ compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
+ fi
+fi
+
+if [ "$CMP_TYPES" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ echo -n "J2SDK "
+ compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ echo -n "J2RE "
+ compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "J2SDK Overlay "
+ compare_file_types $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ echo -n "J2RE Overlay "
+ compare_file_types $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
+ fi
+ if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+ echo -n "J2SDK Bundle "
+ compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
+ echo -n "J2RE Bundle "
+ compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
+ fi
+fi
+
+if [ "$CMP_GENERAL" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ echo -n "J2SDK "
+ compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ echo -n "J2RE "
+ compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "J2SDK Overlay "
+ compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ echo -n "J2RE Overlay "
+ compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
+ fi
+ if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+ echo -n "J2SDK Bundle "
+ compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
+ echo -n "J2RE Bundle "
+ compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
+ fi
+fi
+
+if [ "$CMP_ZIPS" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ fi
+fi
+
+if [ "$CMP_JARS" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ fi
+fi
+
+if [ "$CMP_LIBS" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "Bundle "
+ compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ fi
+fi
+
+if [ "$CMP_EXECS" = "true" ]; then
+ if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
+ compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
+ fi
+ if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
+ echo -n "Overlay "
+ compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
+ fi
+fi
+
+echo
+
+if [ -n "$REGRESSIONS" ]; then
+ echo "REGRESSIONS FOUND!"
+ echo
+ exit 1
+else
+ echo "No regressions found"
+ echo
+ exit 0
+fi
diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl
new file mode 100644
index 0000000..3e2946d
--- /dev/null
+++ b/common/bin/compare_exceptions.sh.incl
@@ -0,0 +1,935 @@
+#!/bin/bash
+#
+# Copyright (c) 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.
+#
+# 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 script is not to be run as stand-alone, it should be included from
+# compare.sh.
+
+##########################################################################################
+# Check that we are run via inclusion from compare.sh and not as stand-alone.
+if [ -z "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
+ echo "Error: This script should not be run as stand-alone. It is included by compare.sh"
+ exit 1
+fi
+
+##########################################################################################
+# Diff exceptions
+
+if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+"
+
+ACCEPTED_BIN_DIFF="
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/i386/client/libjvm.so
+./jre/lib/i386/libattach.so
+./jre/lib/i386/libdt_socket.so
+./jre/lib/i386/libhprof.so
+./jre/lib/i386/libinstrument.so
+./jre/lib/i386/libjava_crw_demo.so
+./jre/lib/i386/libjsdt.so
+./jre/lib/i386/libmanagement.so
+./jre/lib/i386/libnpt.so
+./jre/lib/i386/libverify.so
+./jre/lib/i386/server/libjvm.so
+./bin/appletviewer
+./bin/extcheck
+./bin/idlj
+./bin/jar
+./bin/jarsigner
+./bin/java
+./bin/javac
+./bin/javadoc
+./bin/javah
+./bin/javap
+./bin/jcmd
+./bin/jconsole
+./bin/jdb
+./bin/jhat
+./bin/jinfo
+./bin/jmap
+./bin/jps
+./bin/jrunscript
+./bin/jsadebugd
+./bin/jstack
+./bin/jstat
+./bin/jstatd
+./bin/keytool
+./bin/native2ascii
+./bin/orbd
+./bin/pack200
+./bin/policytool
+./bin/rmic
+./bin/rmid
+./bin/rmiregistry
+./bin/schemagen
+./bin/serialver
+./bin/servertool
+./bin/tnameserv
+./bin/wsgen
+./bin/wsimport
+./bin/xjc
+./jre/bin/java
+./jre/bin/keytool
+./jre/bin/orbd
+./jre/bin/pack200
+./jre/bin/policytool
+./jre/bin/rmid
+./jre/bin/rmiregistry
+./jre/bin/servertool
+./jre/bin/tnameserv
+"
+
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+"
+
+ACCEPTED_BIN_DIFF="
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/amd64/libattach.so
+./jre/lib/amd64/libdt_socket.so
+./jre/lib/amd64/libhprof.so
+./jre/lib/amd64/libinstrument.so
+./jre/lib/amd64/libjava_crw_demo.so
+./jre/lib/amd64/libjsdt.so
+./jre/lib/amd64/libjsig.so
+./jre/lib/amd64/libmanagement.so
+./jre/lib/amd64/libnpt.so
+./jre/lib/amd64/libsaproc.so
+./jre/lib/amd64/libverify.so
+./jre/lib/amd64/server/libjsig.so
+./jre/lib/amd64/server/libjvm.so
+./bin/appletviewer
+./bin/extcheck
+./bin/idlj
+./bin/jar
+./bin/jarsigner
+./bin/java
+./bin/javac
+./bin/javadoc
+./bin/javah
+./bin/javap
+./bin/jcmd
+./bin/jconsole
+./bin/jdb
+./bin/jhat
+./bin/jinfo
+./bin/jmap
+./bin/jps
+./bin/jrunscript
+./bin/jsadebugd
+./bin/jstack
+./bin/jstat
+./bin/jstatd
+./bin/keytool
+./bin/native2ascii
+./bin/orbd
+./bin/pack200
+./bin/policytool
+./bin/rmic
+./bin/rmid
+./bin/rmiregistry
+./bin/schemagen
+./bin/serialver
+./bin/servertool
+./bin/tnameserv
+./bin/wsgen
+./bin/wsimport
+./bin/xjc
+./jre/bin/java
+./jre/bin/keytool
+./jre/bin/orbd
+./jre/bin/pack200
+./jre/bin/policytool
+./jre/bin/rmid
+./jre/bin/rmiregistry
+./jre/bin/servertool
+./jre/bin/tnameserv
+"
+
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jni/Poller/lib/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/i386/jexec
+"
+
+SORT_SYMBOLS="
+./jre/lib/i386/client/libjvm.so
+./jre/lib/i386/libsaproc.so
+./jre/lib/i386/server/libjvm.so
+"
+
+SKIP_BIN_DIFF="true"
+
+ACCEPTED_SMALL_SIZE_DIFF="
+./demo/jni/Poller/lib/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/i386/client/libjvm.so
+./jre/lib/i386/jli/libjli.so
+./jre/lib/i386/libJdbcOdbc.so
+./jre/lib/i386/libattach.so
+./jre/lib/i386/libawt.so
+./jre/lib/i386/libawt_headless.so
+./jre/lib/i386/libawt_xawt.so
+./jre/lib/i386/libdcpr.so
+./jre/lib/i386/libdt_socket.so
+./jre/lib/i386/libfontmanager.so
+./jre/lib/i386/libhprof.so
+./jre/lib/i386/libinstrument.so
+./jre/lib/i386/libj2gss.so
+./jre/lib/i386/libj2pcsc.so
+./jre/lib/i386/libj2pkcs11.so
+./jre/lib/i386/libj2ucrypto.so
+./jre/lib/i386/libjaas_unix.so
+./jre/lib/i386/libjava.so
+./jre/lib/i386/libjava_crw_demo.so
+./jre/lib/i386/libjawt.so
+./jre/lib/i386/libjdwp.so
+./jre/lib/i386/libjfr.so
+./jre/lib/i386/libjpeg.so
+./jre/lib/i386/libjsdt.so
+./jre/lib/i386/libjsound.so
+./jre/lib/i386/libkcms.so
+./jre/lib/i386/liblcms.so
+./jre/lib/i386/libmanagement.so
+./jre/lib/i386/libmlib_image.so
+./jre/lib/i386/libnet.so
+./jre/lib/i386/libnio.so
+./jre/lib/i386/libnpt.so
+./jre/lib/i386/libsctp.so
+./jre/lib/i386/libsplashscreen.so
+./jre/lib/i386/libsunec.so
+./jre/lib/i386/libsunwjdga.so
+./jre/lib/i386/libt2k.so
+./jre/lib/i386/libunpack.so
+./jre/lib/i386/libverify.so
+./jre/lib/i386/libzip.so
+./jre/lib/i386/server/libjvm.so
+./bin/appletviewer
+./bin/extcheck
+./bin/idlj
+./bin/jar
+./bin/jarsigner
+./bin/java
+./bin/javac
+./bin/javadoc
+./bin/javah
+./bin/javap
+./bin/jcmd
+./bin/jconsole
+./bin/jdb
+./bin/jhat
+./bin/jinfo
+./bin/jmap
+./bin/jps
+./bin/jrunscript
+./bin/jsadebugd
+./bin/jstack
+./bin/jstat
+./bin/jstatd
+./bin/keytool
+./bin/native2ascii
+./bin/orbd
+./bin/pack200
+./bin/policytool
+./bin/rmic
+./bin/rmid
+./bin/rmiregistry
+./bin/schemagen
+./bin/serialver
+./bin/servertool
+./bin/tnameserv
+./bin/unpack200
+./bin/wsgen
+./bin/wsimport
+./bin/xjc
+./jre/bin/java
+./jre/bin/keytool
+./jre/bin/orbd
+./jre/bin/pack200
+./jre/bin/policytool
+./jre/bin/rmid
+./jre/bin/rmiregistry
+./jre/bin/servertool
+./jre/bin/tnameserv
+./jre/bin/unpack200
+./jre/lib/i386/jexec
+"
+
+SKIP_FULLDUMP_DIFF="true"
+
+# Filter random C++ symbol strings.
+DIS_DIFF_FILTER="$SED -e s/\.[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g"
+
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jni/Poller/lib/amd64/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/amd64/libgctest.so
+./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
+./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
+./demo/jvmti/hprof/lib/amd64/libhprof.so
+./demo/jvmti/minst/lib/amd64/libminst.so
+./demo/jvmti/mtrace/lib/amd64/libmtrace.so
+./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
+./demo/jvmti/waiters/lib/amd64/libwaiters.so
+"
+
+SORT_SYMBOLS="
+./jre/lib/amd64/server/libjvm.so
+./jre/lib/amd64/libsaproc.so
+"
+
+SKIP_BIN_DIFF="true"
+
+ACCEPTED_SMALL_SIZE_DIFF="
+./demo/jni/Poller/lib/amd64/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/amd64/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/amd64/libgctest.so
+./demo/jvmti/heapTracker/lib/amd64/libheapTracker.so
+./demo/jvmti/heapViewer/lib/amd64/libheapViewer.so
+./demo/jvmti/hprof/lib/amd64/libhprof.so
+./demo/jvmti/minst/lib/amd64/libminst.so
+./demo/jvmti/mtrace/lib/amd64/libmtrace.so
+./demo/jvmti/versionCheck/lib/amd64/libversionCheck.so
+./demo/jvmti/waiters/lib/amd64/libwaiters.so
+./jre/lib/amd64/jli/libjli.so
+./jre/lib/amd64/libJdbcOdbc.so
+./jre/lib/amd64/libattach.so
+./jre/lib/amd64/libawt.so
+./jre/lib/amd64/libawt_headless.so
+./jre/lib/amd64/libawt_xawt.so
+./jre/lib/amd64/libdcpr.so
+./jre/lib/amd64/libdt_socket.so
+./jre/lib/amd64/libfontmanager.so
+./jre/lib/amd64/libhprof.so
+./jre/lib/amd64/libinstrument.so
+./jre/lib/amd64/libj2gss.so
+./jre/lib/amd64/libj2pcsc.so
+./jre/lib/amd64/libj2pkcs11.so
+./jre/lib/amd64/libj2ucrypto.so
+./jre/lib/amd64/libjaas_unix.so
+./jre/lib/amd64/libjava.so
+./jre/lib/amd64/libjava_crw_demo.so
+./jre/lib/amd64/libjawt.so
+./jre/lib/amd64/libjdwp.so
+./jre/lib/amd64/libjfr.so
+./jre/lib/amd64/libjpeg.so
+./jre/lib/amd64/libjsdt.so
+./jre/lib/amd64/libjsound.so
+./jre/lib/amd64/libkcms.so
+./jre/lib/amd64/liblcms.so
+./jre/lib/amd64/libmanagement.so
+./jre/lib/amd64/libmlib_image.so
+./jre/lib/amd64/libnet.so
+./jre/lib/amd64/libnio.so
+./jre/lib/amd64/libnpt.so
+./jre/lib/amd64/libsctp.so
+./jre/lib/amd64/libsplashscreen.so
+./jre/lib/amd64/libsunec.so
+./jre/lib/amd64/libsunwjdga.so
+./jre/lib/amd64/libt2k.so
+./jre/lib/amd64/libunpack.so
+./jre/lib/amd64/libverify.so
+./jre/lib/amd64/libzip.so
+./jre/lib/amd64/server/64/libjvm_db.so
+./jre/lib/amd64/server/64/libjvm_dtrace.so
+./bin/amd64/appletviewer
+./bin/amd64/extcheck
+./bin/amd64/idlj
+./bin/amd64/jar
+./bin/amd64/jarsigner
+./bin/amd64/java
+./bin/amd64/javac
+./bin/amd64/javadoc
+./bin/amd64/javah
+./bin/amd64/javap
+./bin/amd64/jcmd
+./bin/amd64/jconsole
+./bin/amd64/jdb
+./bin/amd64/jhat
+./bin/amd64/jinfo
+./bin/amd64/jmap
+./bin/amd64/jps
+./bin/amd64/jrunscript
+./bin/amd64/jsadebugd
+./bin/amd64/jstack
+./bin/amd64/jstat
+./bin/amd64/jstatd
+./bin/amd64/keytool
+./bin/amd64/native2ascii
+./bin/amd64/orbd
+./bin/amd64/pack200
+./bin/amd64/policytool
+./bin/amd64/rmic
+./bin/amd64/rmid
+./bin/amd64/rmiregistry
+./bin/amd64/schemagen
+./bin/amd64/serialver
+./bin/amd64/servertool
+./bin/amd64/tnameserv
+./bin/amd64/unpack200
+./bin/amd64/wsgen
+./bin/amd64/wsimport
+./bin/amd64/xjc
+./jre/bin/amd64/java
+./jre/bin/amd64/keytool
+./jre/bin/amd64/orbd
+./jre/bin/amd64/pack200
+./jre/bin/amd64/policytool
+./jre/bin/amd64/rmid
+./jre/bin/amd64/rmiregistry
+./jre/bin/amd64/servertool
+./jre/bin/amd64/tnameserv
+./jre/bin/amd64/unpack200
+./jre/lib/amd64/jexec
+"
+
+SKIP_FULLDUMP_DIFF="true"
+
+# Filter random C++ symbol strings.
+DIS_DIFF_FILTER="$SED -e s/\.[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g"
+
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparc" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jni/Poller/lib/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/sparc/jexec
+"
+
+SORT_SYMBOLS="
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/sparc/client/64/libjvm_db.so
+./jre/lib/sparc/client/64/libjvm_dtrace.so
+./jre/lib/sparc/client/libjsig.so
+./jre/lib/sparc/client/libjvm.so
+./jre/lib/sparc/client/libjvm_db.so
+./jre/lib/sparc/client/libjvm_dtrace.so
+./jre/lib/sparc/libjsig.so
+./jre/lib/sparc/libsaproc.so
+./jre/lib/sparc/server/64/libjvm_db.so
+./jre/lib/sparc/server/64/libjvm_dtrace.so
+./jre/lib/sparc/server/libjsig.so
+./jre/lib/sparc/server/libjvm.so
+./jre/lib/sparc/server/libjvm_db.so
+./jre/lib/sparc/server/libjvm_dtrace.so
+"
+
+SKIP_BIN_DIFF="true"
+
+ACCEPTED_SMALL_SIZE_DIFF="
+./demo/jni/Poller/lib/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/libgctest.so
+./demo/jvmti/heapTracker/lib/libheapTracker.so
+./demo/jvmti/heapViewer/lib/libheapViewer.so
+./demo/jvmti/hprof/lib/libhprof.so
+./demo/jvmti/minst/lib/libminst.so
+./demo/jvmti/mtrace/lib/libmtrace.so
+./demo/jvmti/versionCheck/lib/libversionCheck.so
+./demo/jvmti/waiters/lib/libwaiters.so
+./jre/lib/sparc/client/libjvm.so
+./jre/lib/sparc/jli/libjli.so
+./jre/lib/sparc/libJdbcOdbc.so
+./jre/lib/sparc/libattach.so
+./jre/lib/sparc/libawt.so
+./jre/lib/sparc/libawt_headless.so
+./jre/lib/sparc/libawt_xawt.so
+./jre/lib/sparc/libdcpr.so
+./jre/lib/sparc/libdt_socket.so
+./jre/lib/sparc/libfontmanager.so
+./jre/lib/sparc/libhprof.so
+./jre/lib/sparc/libinstrument.so
+./jre/lib/sparc/libj2gss.so
+./jre/lib/sparc/libj2pcsc.so
+./jre/lib/sparc/libj2pkcs11.so
+./jre/lib/sparc/libj2ucrypto.so
+./jre/lib/sparc/libjaas_unix.so
+./jre/lib/sparc/libjava.so
+./jre/lib/sparc/libjava_crw_demo.so
+./jre/lib/sparc/libjawt.so
+./jre/lib/sparc/libjdwp.so
+./jre/lib/sparc/libjfr.so
+./jre/lib/sparc/libjpeg.so
+./jre/lib/sparc/libjsdt.so
+./jre/lib/sparc/libjsound.so
+./jre/lib/sparc/libkcms.so
+./jre/lib/sparc/liblcms.so
+./jre/lib/sparc/libmanagement.so
+./jre/lib/sparc/libmlib_image.so
+./jre/lib/sparc/libmlib_image_v.so
+./jre/lib/sparc/libnet.so
+./jre/lib/sparc/libnio.so
+./jre/lib/sparc/libnpt.so
+./jre/lib/sparc/libsctp.so
+./jre/lib/sparc/libsplashscreen.so
+./jre/lib/sparc/libsunec.so
+./jre/lib/sparc/libsunwjdga.so
+./jre/lib/sparc/libt2k.so
+./jre/lib/sparc/libunpack.so
+./jre/lib/sparc/libverify.so
+./jre/lib/sparc/libzip.so
+./jre/lib/sparc/server/libjvm.so
+./bin/appletviewer
+./bin/extcheck
+./bin/idlj
+./bin/jar
+./bin/jarsigner
+./bin/java
+./bin/javac
+./bin/javadoc
+./bin/javah
+./bin/javap
+./bin/jcmd
+./bin/jconsole
+./bin/jdb
+./bin/jhat
+./bin/jinfo
+./bin/jmap
+./bin/jps
+./bin/jrunscript
+./bin/jsadebugd
+./bin/jstack
+./bin/jstat
+./bin/jstatd
+./bin/keytool
+./bin/native2ascii
+./bin/orbd
+./bin/pack200
+./bin/policytool
+./bin/rmic
+./bin/rmid
+./bin/rmiregistry
+./bin/schemagen
+./bin/serialver
+./bin/servertool
+./bin/tnameserv
+./bin/unpack200
+./bin/wsgen
+./bin/wsimport
+./bin/xjc
+./jre/bin/java
+./jre/bin/keytool
+./jre/bin/orbd
+./jre/bin/pack200
+./jre/bin/policytool
+./jre/bin/rmid
+./jre/bin/rmiregistry
+./jre/bin/servertool
+./jre/bin/tnameserv
+./jre/bin/unpack200
+./jre/lib/sparc/jexec
+"
+
+# Filter random C++ symbol strings.
+# Some numbers differ randomly.
+DIS_DIFF_FILTER="$SED -e s/\$[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/\([0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].\)[0-9a-f][0-9a-f]/\1<NUM>/g -e s/\(%g1,.0x\)[0-9a-f]*\(,.%g1\)/\1<HEX>\2/g -e s/\(!.\)[0-9a-f]*\(.<SUNWprivate_1.1+0x\)[0-9a-f]*/\1<NUM>\2<HEX>/g"
+
+# Some xor instructions end up with different args in the lib but not in the object files.
+ACCEPTED_DIS_DIFF="
+./demo/jvmti/waiters/lib/libwaiters.so
+"
+
+SKIP_FULLDUMP_DIFF="true"
+
+fi
+
+if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]; then
+
+STRIP_BEFORE_COMPARE="
+./demo/jni/Poller/lib/sparcv9/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/sparcv9/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/sparcv9/libgctest.so
+./demo/jvmti/heapTracker/lib/sparcv9/libheapTracker.so
+./demo/jvmti/heapViewer/lib/sparcv9/libheapViewer.so
+./demo/jvmti/hprof/lib/sparcv9/libhprof.so
+./demo/jvmti/minst/lib/sparcv9/libminst.so
+./demo/jvmti/mtrace/lib/sparcv9/libmtrace.so
+./demo/jvmti/versionCheck/lib/sparcv9/libversionCheck.so
+./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
+"
+
+SORT_SYMBOLS="
+./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
+./jre/lib/sparcv9/libjsig.so
+./jre/lib/sparcv9/libsaproc.so
+./jre/lib/sparcv9/server/libjvm.so
+./jre/lib/sparcv9/server/libjvm_dtrace.so
+"
+
+SKIP_BIN_DIFF="true"
+
+ACCEPTED_SMALL_SIZE_DIFF="
+./demo/jni/Poller/lib/sparcv9/libPoller.so
+./demo/jvmti/compiledMethodLoad/lib/sparcv9/libcompiledMethodLoad.so
+./demo/jvmti/gctest/lib/sparcv9/libgctest.so
+./demo/jvmti/heapTracker/lib/sparcv9/libheapTracker.so
+./demo/jvmti/heapViewer/lib/sparcv9/libheapViewer.so
+./demo/jvmti/hprof/lib/sparcv9/libhprof.so
+./demo/jvmti/minst/lib/sparcv9/libminst.so
+./demo/jvmti/mtrace/lib/sparcv9/libmtrace.so
+./demo/jvmti/versionCheck/lib/sparcv9/libversionCheck.so
+./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
+./jre/lib/sparcv9/client/libjvm.so
+./jre/lib/sparcv9/jli/libjli.so
+./jre/lib/sparcv9/libJdbcOdbc.so
+./jre/lib/sparcv9/libattach.so
+./jre/lib/sparcv9/libawt.so
+./jre/lib/sparcv9/libawt_headless.so
+./jre/lib/sparcv9/libawt_xawt.so
+./jre/lib/sparcv9/libdcpr.so
+./jre/lib/sparcv9/libdt_socket.so
+./jre/lib/sparcv9/libfontmanager.so
+./jre/lib/sparcv9/libhprof.so
+./jre/lib/sparcv9/libinstrument.so
+./jre/lib/sparcv9/libj2gss.so
+./jre/lib/sparcv9/libj2pcsc.so
+./jre/lib/sparcv9/libj2pkcs11.so
+./jre/lib/sparcv9/libj2ucrypto.so
+./jre/lib/sparcv9/libjaas_unix.so
+./jre/lib/sparcv9/libjava.so
+./jre/lib/sparcv9/libjava_crw_demo.so
+./jre/lib/sparcv9/libjawt.so
+./jre/lib/sparcv9/libjdwp.so
+./jre/lib/sparcv9/libjfr.so
+./jre/lib/sparcv9/libjpeg.so
+./jre/lib/sparcv9/libjsdt.so
+./jre/lib/sparcv9/libjsound.so
+./jre/lib/sparcv9/libkcms.so
+./jre/lib/sparcv9/liblcms.so
+./jre/lib/sparcv9/libmanagement.so
+./jre/lib/sparcv9/libmlib_image.so
+./jre/lib/sparcv9/libmlib_image_v.so
+./jre/lib/sparcv9/libnet.so
+./jre/lib/sparcv9/libnio.so
+./jre/lib/sparcv9/libnpt.so
+./jre/lib/sparcv9/libsctp.so
+./jre/lib/sparcv9/libsplashscreen.so
+./jre/lib/sparcv9/libsunec.so
+./jre/lib/sparcv9/libsunwjdga.so
+./jre/lib/sparcv9/libt2k.so
+./jre/lib/sparcv9/libunpack.so
+./jre/lib/sparcv9/libverify.so
+./jre/lib/sparcv9/libzip.so
+./jre/lib/sparcv9/server/libjvm.so
+./bin/sparcv9/appletviewer
+./bin/sparcv9/extcheck
+./bin/sparcv9/idlj
+./bin/sparcv9/jar
+./bin/sparcv9/jarsigner
+./bin/sparcv9/java
+./bin/sparcv9/javac
+./bin/sparcv9/javadoc
+./bin/sparcv9/javah
+./bin/sparcv9/javap
+./bin/sparcv9/jcmd
+./bin/sparcv9/jconsole
+./bin/sparcv9/jdb
+./bin/sparcv9/jhat
+./bin/sparcv9/jinfo
+./bin/sparcv9/jmap
+./bin/sparcv9/jps
+./bin/sparcv9/jrunscript
+./bin/sparcv9/jsadebugd
+./bin/sparcv9/jstack
+./bin/sparcv9/jstat
+./bin/sparcv9/jstatd
+./bin/sparcv9/keytool
+./bin/sparcv9/native2ascii
+./bin/sparcv9/orbd
+./bin/sparcv9/pack200
+./bin/sparcv9/policytool
+./bin/sparcv9/rmic
+./bin/sparcv9/rmid
+./bin/sparcv9/rmiregistry
+./bin/sparcv9/schemagen
+./bin/sparcv9/serialver
+./bin/sparcv9/servertool
+./bin/sparcv9/tnameserv
+./bin/sparcv9/unpack200
+./bin/sparcv9/wsgen
+./bin/sparcv9/wsimport
+./bin/sparcv9/xjc
+./jre/bin/sparcv9/java
+./jre/bin/sparcv9/keytool
+./jre/bin/sparcv9/orbd
+./jre/bin/sparcv9/pack200
+./jre/bin/sparcv9/policytool
+./jre/bin/sparcv9/rmid
+./jre/bin/sparcv9/rmiregistry
+./jre/bin/sparcv9/servertool
+./jre/bin/sparcv9/tnameserv
+./jre/bin/sparcv9/unpack200
+"
+
+# Filter random C++ symbol strings.
+# Some numbers differ randomly.
+DIS_DIFF_FILTER="$SED -e s/\$[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g -e s/[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f]/<NUMS>/g -e s/\(%g1,.0x\)[0-9a-f]*\(,.%g1\)/\1<HEX>\2/g -e s/\(!.\)[0-9a-f]*\(.<SUNWprivate_1.1+0x\)[0-9a-f]*/\1<NUM>\2<HEX>/g"
+
+# Some xor instructions end up with different args in the lib but not in the object files.
+ACCEPTED_DIS_DIFF="
+./demo/jvmti/waiters/lib/sparcv9/libwaiters.so
+"
+
+SKIP_FULLDUMP_DIFF="true"
+
+fi
+
+
+if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+
+# Probably should add all libs here
+ACCEPTED_SMALL_SIZE_DIFF="
+./demo/jvmti/gctest/lib/gctest.dll
+./demo/jvmti/heapTracker/lib/heapTracker.dll
+./demo/jvmti/minst/lib/minst.dll
+./jre/bin/attach.dll
+./jre/bin/java_crw_demo.dll
+./jre/bin/jsoundds.dll
+./bin/appletviewer.exe
+./bin/extcheck.exe
+./bin/idlj.exe
+./bin/jar.exe
+./bin/jarsigner.exe
+./bin/java-rmi.exe
+./bin/java.exe
+./bin/javac.exe
+./bin/javadoc.exe
+./bin/javah.exe
+./bin/javap.exe
+./bin/javaw.exe
+./bin/jcmd.exe
+./bin/jconsole.exe
+./bin/jdb.exe
+./bin/jhat.exe
+./bin/jinfo.exe
+./bin/jmap.exe
+./bin/jps.exe
+./bin/jrunscript.exe
+./bin/jsadebugd.exe
+./bin/jstack.exe
+./bin/jstat.exe
+./bin/jstatd.exe
+./bin/keytool.exe
+./bin/kinit.exe
+./bin/klist.exe
+./bin/ktab.exe
+./bin/native2ascii.exe
+./bin/orbd.exe
+./bin/pack200.exe
+./bin/policytool.exe
+./bin/rmic.exe
+./bin/rmid.exe
+./bin/rmiregistry.exe
+./bin/schemagen.exe
+./bin/serialver.exe
+./bin/servertool.exe
+./bin/tnameserv.exe
+./bin/unpack200.exe
+./bin/wsgen.exe
+./bin/wsimport.exe
+./bin/xjc.exe
+./jre/bin/java-rmi.exe
+./jre/bin/java.exe
+./jre/bin/javaw.exe
+./jre/bin/keytool.exe
+./jre/bin/kinit.exe
+./jre/bin/klist.exe
+./jre/bin/ktab.exe
+./jre/bin/orbd.exe
+./jre/bin/pack200.exe
+./jre/bin/policytool.exe
+./jre/bin/rmid.exe
+./jre/bin/rmiregistry.exe
+./jre/bin/servertool.exe
+./jre/bin/tnameserv.exe
+./jre/bin/unpack200.exe
+"
+
+# On windows, there are unavoidable allignment issues making
+# a perfect disasm diff impossible. Filter out the following:
+# * Random parts of C++ symbols (this is a bit greedy, but does the trick)
+# @XXXXX
+# * Hexadecimal addresses that are sometimes alligned differently.
+# * Dates in version strings XXXX_XX_XX.
+DIS_DIFF_FILTER="$SED -e s/[@?][A-Z0-9_]\{1,25\}/<SYM>/g -e s/^.\{2,2\}[0-9A-F]\{16,16\}.\{2,2\}//g -e s/[0-9A-F]\{4,16\}h/<HEXSTR>/g -e s/_[0-9]\{4,4\}_[0-9][0-9]_[0-9][0-9]/<DATE>/g"
+
+SKIP_BIN_DIFF="true"
+SKIP_FULLDUMP_DIFF="true"
+
+fi
+
+
+if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
+ACCEPTED_JARZIP_CONTENTS="
+/META-INF/INDEX.LIST
+"
+
+KNOWN_BIN_DIFF="
+./jre/lib/libJObjC.dylib
+"
+
+ACCEPTED_BIN_DIFF="
+./bin/appletviewer
+./bin/extcheck
+./bin/idlj
+./bin/jar
+./bin/jarsigner
+./bin/java
+./bin/javac
+./bin/javadoc
+./bin/javah
+./bin/javap
+./bin/jcmd
+./bin/jconsole
+./bin/jdb
+./bin/jhat
+./bin/jinfo
+./bin/jmap
+./bin/jps
+./bin/jrunscript
+./bin/jsadebugd
+./bin/jstack
+./bin/jstat
+./bin/jstatd
+./bin/keytool
+./bin/native2ascii
+./bin/orbd
+./bin/pack200
+./bin/policytool
+./bin/rmic
+./bin/rmid
+./bin/rmiregistry
+./bin/schemagen
+./bin/serialver
+./bin/servertool
+./bin/tnameserv
+./bin/wsgen
+./bin/wsimport
+./bin/xjc
+./jre/bin/java
+./jre/bin/keytool
+./jre/bin/orbd
+./jre/bin/pack200
+./jre/bin/policytool
+./jre/bin/rmid
+./jre/bin/rmiregistry
+./jre/bin/servertool
+./jre/bin/tnameserv
+./jre/lib/libsaproc.dylib
+./jre/lib/server/libjvm.dylib
+"
+
+KNOWN_SIZE_DIFF="
+./jre/lib/libJObjC.dylib
+"
+
+SORT_SYMBOLS="
+./jre/lib/libJObjC.dylib
+"
+
+KNOWN_SYM_DIFF="
+./jre/lib/libJObjC.dylib
+"
+
+KNOWN_ELF_DIFF="
+./jre/lib/libJObjC.dylib
+"
+
+KNOWN_DIS_DIFF="
+./jre/lib/libJObjC.dylib
+"
+
+fi
diff --git a/common/bin/compareimage.sh b/common/bin/compareimage.sh
deleted file mode 100644
index 0e5d1f0..0000000
--- a/common/bin/compareimage.sh
+++ /dev/null
@@ -1,335 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# MANUAL
-#
-# ./common/bin/compareimages.sh old_jdk_image new_jdk_image
-#
-# Compare the directory structure.
-# Compare the filenames in the directories.
-# Compare the contents of the zip archives
-# Compare the contents of the jar archives
-# Compare the native libraries
-# Compare the native executables
-# Compare the remaining files
-#
-# ./common/bin/compareimages.sh old_jdk_image new_jdk_image [zips jars libs execs other]
-#
-# Compare only the selected subset of the images.
-#
-# ./common/bin/compareimages.sh old_jdk_image new_jdk_image CodePointIM.jar
-#
-# Compare only the CodePointIM.jar file
-# Can be used to compare zips, libraries and executables.
-#
-
-if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ "x$1" == "x" ]; then
- echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image"
- echo ""
- echo "Compare the directory structure."
- echo "Compare the filenames in the directories."
- echo "Compare the contents of the zip archives"
- echo "Compare the contents of the jar archives"
- echo "Compare the native libraries"
- echo "Compare the native executables"
- echo "Compare the remaining files"
- echo ""
- echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image [zips jars libs execs other]"
- echo ""
- echo "Compare only the selected subset of the images."
- echo ""
- echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image CodePointIM.jar"
- echo ""
- echo "Compare only the CodePointIM.jar file"
- echo "Can be used to compare zips, libraries and executables."
- exit 10
-fi
-
-OLD="$1"
-NEW="$2"
-CMD="$3"
-
-DIFF_RESULT=0
-
-CMP_ZIPS=false
-CMP_JARS=false
-CMP_LIBS=false
-CMP_EXECS=false
-CMP_OTHER=false
-
-FILTER="cat"
-
-if [ -n "$CMD" ]; then
- case "$CMD" in
- zips)
- CMP_ZIPS=true
- ;;
- jars)
- CMP_JARS=true
- ;;
- libs)
- CMP_LIBS=true
- ;;
- execs)
- CMP_EXECS=true
- ;;
- other)
- CMP_OTHER=true
- ;;
- *)
- CMP_ZIPS=true
- CMP_JARS=true
- CMP_LIBS=true
- CMP_EXECS=true
- CMP_OTHER=true
- FILTER="grep $3"
- ;;
- esac
-else
- CMP_ZIPS=true
- CMP_JARS=true
- CMP_LIBS=true
- CMP_EXECS=true
- CMP_OTHER=true
-fi
-
-DIFFJARZIP="/bin/bash `dirname $0`/diffjarzip.sh"
-DIFFLIB="/bin/bash `dirname $0`/difflib.sh"
-DIFFEXEC="/bin/bash `dirname $0`/diffexec.sh"
-export COMPARE_ROOT=/tmp/cimages.$USER
-mkdir -p $COMPARE_ROOT
-
-# Load the correct exception list.
-case "`uname -s`" in
- Linux)
- . `dirname $0`/exception_list_linux
- ;;
-esac
-
-echo
-echo Comparing $OLD to $NEW
-echo
-
-(cd $OLD && find . -type d | sort > $COMPARE_ROOT/from_dirs)
-(cd $NEW && find . -type d | sort > $COMPARE_ROOT/to_dirs)
-
-echo -n Directory structure...
-if diff $COMPARE_ROOT/from_dirs $COMPARE_ROOT/to_dirs > /dev/null; then
- echo Identical!
-else
- echo Differences found.
- DIFF_RESULT=1
- # Differences in directories found.
- ONLY_OLD=$(diff $COMPARE_ROOT/from_dirs $COMPARE_ROOT/to_dirs | grep '<')
- if [ "$ONLY_OLD" ]; then
- echo Only in $OLD
- echo $ONLY_OLD | sed 's|< ./|\t|g' | sed 's/ /\n/g'
- fi
- # Differences in directories found.
- ONLY_NEW=$(diff $COMPARE_ROOT/from_dirs $COMPARE_ROOT/to_dirs | grep '>')
- if [ "$ONLY_NEW" ]; then
- echo Only in $NEW
- echo $ONLY_NEW | sed 's|> ./|\t|g' | sed 's/ /\n/g'
- fi
-fi
-
-(cd $OLD && find . -type f | sort > $COMPARE_ROOT/from_files)
-(cd $NEW && find . -type f | sort > $COMPARE_ROOT/to_files)
-
-echo -n File names...
-if diff $COMPARE_ROOT/from_files $COMPARE_ROOT/to_files > /dev/null; then
- echo Identical!
-else
- echo Differences found.
- DIFF_RESULT=1
- # Differences in directories found.
- ONLY_OLD=$(diff $COMPARE_ROOT/from_files $COMPARE_ROOT/to_files | grep '<')
- if [ "$ONLY_OLD" ]; then
- echo Only in $OLD
- echo "$ONLY_OLD" | sed 's|< ./| |g'
- fi
- # Differences in directories found.
- ONLY_NEW=$(diff $COMPARE_ROOT/from_files $COMPARE_ROOT/to_files | grep '>')
- if [ "$ONLY_NEW" ]; then
- echo Only in $NEW
- echo "$ONLY_NEW" | sed 's|> ./| |g'
- fi
-fi
-
-echo -n Permissions...
-found=""
-for f in `cd $OLD && find . -type f`
-do
- if [ ! -f ${OLD}/$f ]; then continue; fi
- if [ ! -f ${NEW}/$f ]; then continue; fi
- OP=`ls -l ${OLD}/$f | awk '{printf("%.10s\n", $1);}'`
- NP=`ls -l ${NEW}/$f | awk '{printf("%.10s\n", $1);}'`
- if [ "$OP" != "$NP" ]
- then
- if [ -z "$found" ]; then echo ; found="yes"; fi
- printf "\told: ${OP} new: ${NP}\t$f\n"
- fi
-
- OF=`cd ${OLD} && file $f`
- NF=`cd ${NEW} && file $f`
- if [ "$f" = "./src.zip" ]
- then
- if [ "`echo $OF | grep -ic zip`" -gt 0 -a "`echo $NF | grep -ic zip`" -gt 0 ]
- then
- # the way we produces zip-files make it so that directories are stored in old file
- # but not in new (only files with full-path)
- # this makes file-5.09 report them as different
- continue;
- fi
- fi
-
- if [ "$OF" != "$NF" ]
- then
- if [ -z "$found" ]; then echo ; found="yes"; fi
- printf "\tFILE: old: ${OF} new: ${NF}\t$f\n"
- fi
-done
-if [ -z "$found" ]; then echo ; found="yes"; fi
-
-GENERAL_FILES=$(cd $OLD && find . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
- ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
- ! -name "ct.sym" ! -name "*.diz" \
- | grep -v "./bin/" | sort | $FILTER)
-echo General files...
-for f in $GENERAL_FILES
-do
- if [ -e $NEW/$f ]; then
- DIFF_OUT=$(diff $OLD/$f $NEW/$f 2>&1)
- if [ -n "$DIFF_OUT" ]; then
- echo $f
- echo "$DIFF_OUT"
- fi
- fi
-done
-
-
-if [ "x$CMP_ZIPS" == "xtrue" ]; then
- ZIPS=$(cd $OLD && find . -type f -name "*.zip" | sort | $FILTER)
-
- if [ -n "$ZIPS" ]; then
- echo Zip files...
-
- for f in $ZIPS
- do
- $DIFFJARZIP $OLD/$f $NEW/$f $OLD $NEW
- if [ "$?" != "0" ]; then
- DIFF_RESULT=1
- fi
- done
- fi
-fi
-
-if [ "x$CMP_JARS" == "xtrue" ]; then
- JARS=$(cd $OLD && find . -type f -name "*.jar" -o -name "ct.sym" | sort | $FILTER)
-
- if [ -n "$JARS" ]; then
- echo Jar files...
-
- for f in $JARS
- do
- DIFFJAR_OUTPUT=`$DIFFJARZIP $OLD/$f $NEW/$f $OLD $NEW`
- DIFFJAR_RESULT=$?
- if [ "$DIFFJAR_RESULT" != "0" ]; then
- for diff in $LIST_DIFF_JAR; do
- DIFFJAR_OUTPUT=`echo "$DIFFJAR_OUTPUT" | grep -v "$diff"`
- done
- if [ "`echo "$DIFFJAR_OUTPUT" | grep -v "Differing files in"`" != "" ]; then
- DIFF_RESULT=1
- echo "$DIFFJAR_OUTPUT"
- fi
- fi
- done
- fi
-fi
-
-if [ "x$FILTER" != "xcat" ]; then
- VIEW=view
-else
- VIEW=
-fi
-
-if [ "x$CMP_LIBS" == "xtrue" ]; then
- LIBS=$(cd $OLD && find . -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' | sort | $FILTER)
-
- if [ -n "$LIBS" ]; then
- echo Libraries...
- for f in $LIBS
- do
- DIFFLIB_OUTPUT=`$DIFFLIB $OLD/$f $NEW/$f $OLD $NEW $VIEW`
- DIFFLIB_RESULT=$?
- if [ "$DIFFLIB_RESULT" = "0" ]; then
- :
- #echo "OK: $DIFFLIB_OUTPUT"
- elif [ "$DIFFLIB_RESULT" = "2" ] && [[ "$LIST_DIFF_SIZE $LIST_DIFF_BYTE" == *"${f:2}"* ]]; then
- :
- #echo "OK: $DIFFLIB_OUTPUT"
- elif [ "$DIFFLIB_RESULT" = "1" ] && [[ "$LIST_DIFF_BYTE" == *"${f:2}"* ]]; then
- :
- #echo "OK: $DIFFLIB_OUTPUT"
- else
- echo "$DIFFLIB_OUTPUT"
- DIFF_RESULT=1
- fi
- done
- fi
-fi
-
-if [ "x$CMP_EXECS" == "xtrue" ]; then
- if [ $OSTYPE == "cygwin" ]; then
- EXECS=$(cd $OLD && find . -type f -name '*.exe' | sort | $FILTER)
- else
- EXECS=$(cd $OLD && find . -type f -perm -100 \! \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' \) | sort | $FILTER)
- fi
-
-
- if [ -n "$EXECS" ]; then
- echo Executables...
-
- for f in $EXECS
- do
- DIFFEXEC_OUTPUT=`$DIFFEXEC $OLD/$f $NEW/$f $OLD $NEW $VIEW`
- DIFFEXEC_RESULT=$?
- if [ "$DIFFEXEC_RESULT" = "0" ]; then
- :
- #echo "OK: $DIFFEXEC_OUTPUT"
- elif [ "$DIFFEXEC_RESULT" = "2" ] && [[ "$LIST_DIFF_SIZE $LIST_DIFF_BYTE" == *"${f:2}"* ]]; then
- :
- #echo "OK: $DIFFEXEC_OUTPUT"
- elif [ "$DIFFEXEC_RESULT" = "1" ] && [[ "$LIST_DIFF_BYTE" == *"${f:2}"* ]]; then
- :
- #echo "OK: $DIFFEXEC_OUTPUT"
- else
- echo "$DIFFEXEC_OUTPUT"
- DIFF_RESULT=1
- fi
- done
- fi
-fi
-
-exit $DIFF_RESULT
diff --git a/common/bin/diffexec.sh b/common/bin/diffexec.sh
deleted file mode 100644
index 85f7b67..0000000
--- a/common/bin/diffexec.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-if [ $# -lt 2 ]
-then
- echo "Diff two executables. Return codes:"
- echo "0 - no diff"
- echo "1 - Identical symbols AND size, BUT not bytewise identical"
- echo "2 - Identical symbols BUT NEW size"
- echo "3 - Differences, content BUT SAME size"
- echo "4 - Differences, content AND size"
- echo "10 - Could not perform diff"
- echo "Use 'quiet' to disable any output."
- echo "Syntax: $0 file1 file2 [quiet]"
- exit 10
-fi
-
-if [ ! -f $1 ]
-then
- echo $1 does not exist
- exit 10
-fi
-
-if [ ! -f $2 ]
-then
- echo $2 does not exist
- exit 10
-fi
-
-if [ "`uname`" == "SunOS" ]; then
- if [ -f "`which nm`" ]; then
- NM=nm
- elif [ -f "`which gnm`" ]; then
- NM=gnm
- else
- echo "No nm command found"
- exit 10
- fi
- LDD=ldd
-elif [ $OSTYPE == "cygwin" ]; then
- NM="$VS100COMNTOOLS/../../VC/bin/amd64/dumpbin.exe"
- NM_ARGS=/exports
- LDD=
-elif [ "`uname`" == "Darwin" ]; then
- NM=nm
- LDD="otool -L"
-else
- NM=nm
- LDD=ldd
-fi
-
-# Should the differences be viewed?
-VIEW=
-# You can do export DIFF=meld to view
-# any differences using meld instead.
-if [ -n "$DIFF" ]; then
- DIFF="$DIFF"
-else
- DIFF=diff
-fi
-OLD=$(cd $(dirname $1) && pwd)/$(basename $1)
-NEW=$(cd $(dirname $2) && pwd)/$(basename $2)
-
-OLD_SIZE=$(ls -l "$OLD" | awk '{ print $5 }')
-NEW_SIZE=$(ls -l "$NEW" | awk '{ print $5 }')
-
-if [ $# -gt 3 ]
-then
- ROOT1=$(cd $3 && pwd)
- ROOT2=$(cd $4 && pwd)
- OLD_NAME=$(echo $OLD | sed "s|$ROOT1/||")
- NEW_NAME=$(echo $NEW | sed "s|$ROOT2/||")
- if [ "x$5" == "xview" ]; then VIEW=view; fi
-else
- ROOT1=$(dirname $OLD)/
- ROOT2=$(dirname $NEW)/
- OLD_NAME=$OLD
- NEW_NAME=$NEW
- if [ "x$3" == "xview" ]; then VIEW=view; fi
-fi
-
-if cmp $OLD $NEW > /dev/null
-then
- # The files were bytewise identical.
- echo Identical: $OLD_NAME
- exit 0
-fi
-
-OLD_SYMBOLS=$COMPARE_ROOT/$OLD_NAME.old
-NEW_SYMBOLS=$COMPARE_ROOT/$NEW_NAME.new
-
-mkdir -p $(dirname $OLD_SYMBOLS)
-mkdir -p $(dirname $NEW_SYMBOLS)
-
-if [ $OSTYPE == "cygwin" ]; then
- "$NM" $NM_ARGS $OLD | grep " = " > $OLD_SYMBOLS
- "$NM" $NM_ARGS $NEW | grep " = " > $NEW_SYMBOLS
- "$NM" $NM_ARGS $OLD > $OLD_SYMBOLS.full
- "$NM" $NM_ARGS $NEW > $NEW_SYMBOLS.full
-else
- # Strip the addresses, just compare the ordering of the symbols.
- $NM $OLD | cut -f 2- -d ' ' > $OLD_SYMBOLS
- $NM $NEW | cut -f 2- -d ' ' > $NEW_SYMBOLS
- # But store the full information for easy diff access.
- $NM $OLD > $OLD_SYMBOLS.full
- $NM $NEW > $NEW_SYMBOLS.full
-fi
-
-DIFFS=$(LANG=C diff $OLD_SYMBOLS $NEW_SYMBOLS)
-
-if [ "${LDD}" ]
-then
- NAME=`basename $OLD`
- TMP=$COMPARE_ROOT/ldd/ldd.${NAME}
- rm -rf "${TMP}"
- mkdir -p "${TMP}"
-
- (cd "${TMP}" && cp $OLD . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.old | uniq > dep.uniq.old)
- (cd "${TMP}" && cp $NEW . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.new | uniq > dep.uniq.new)
- (cd "${TMP}" && rm -f ${NAME})
-
- DIFFS_DEP=$(LANG=C diff "${TMP}/dep.old" "${TMP}/dep.new")
- DIFFS_UNIQ_DEP=$(LANG=C diff "${TMP}/dep.uniq.old" "${TMP}/dep.uniq.new")
-
- DEP_MSG=
- if [ -z "${DIFFS_UNIQ_DEP}" -a -z "${DIFFS_DEP}" ]; then
- DEP_MSG="Identical dependencies"
- elif [ -z "${DIFFS_UNIQ_DEP}" ]; then
- DEP_MSG="Redundant duplicate dependencies added"
- RES=1
- else
- DEP_MSG="DIFFERENT dependencies"
- RES=1
- fi
-fi
-
-RESULT=0
-
-if [ -n "$DIFFS" ]; then
- if [ $OLD_SIZE -ne $NEW_SIZE ]
- then
- echo Differences, content AND size : $DEP_MSG : $OLD_NAME
- RESULT=4
- else
- echo Differences, content BUT SAME size: $DEP_MSG : $OLD_NAME
- RESULT=3
- fi
- if [ "x$VIEW" == "xview" ]; then
- LANG=C $DIFF $OLD_SYMBOLS $NEW_SYMBOLS
- fi
-else
- if [ $OLD_SIZE -ne $NEW_SIZE ]
- then
- echo Identical symbols BUT NEW size : $DEP_MSG : $OLD_NAME
- RESULT=2
- else
- echo Identical symbols AND size, BUT not bytewise identical: $DEP_MSG : $OLD_NAME
- RESULT=1
- fi
-fi
-
-exit $RESULT
-
-
-
diff --git a/common/bin/diffjarzip.sh b/common/bin/diffjarzip.sh
deleted file mode 100644
index 6ad0a42..0000000
--- a/common/bin/diffjarzip.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# Simple tool to diff two jar or zip files. It unpacks the jar/zip files and
-# reports if files differs and if files are new or missing.
-# Assumes gnu diff.
-
-# There are a few source files that have DOS line endings in the
-# jaxp/jaxws source drops, when the sources were added to the repository
-# the source files were converted to UNIX line endings.
-# For now we ignore these differences.
-DIFF_FLAGS="--strip-trailing-cr"
-#set -x
-
-if [ $# -lt 2 ]
-then
- echo "Diff two jar/zip files. Return codes: 0 - no diff, 1 - diff, 2 - couldn't perform diff"
- echo "Syntax: $0 old_archive new_archive [old_root new_root]"
- exit 2
-fi
-
-if [ ! -f $1 ]
-then
- echo $1 does not exist
- exit 2
-fi
-
-if [ ! -f $2 ]
-then
- echo $2 does not exist
- exit 2
-fi
-
-IGNORES="cat"
-OLD=$(cd $(dirname $1) && pwd)/$(basename $1)
-NEW=$(cd $(dirname $2) && pwd)/$(basename $2)
-
-if [ $# -gt 3 ]
-then
- ROOT1=$(cd $3 && pwd)
- ROOT2=$(cd $4 && pwd)
- OLD_NAME=$(echo $OLD | sed "s|$ROOT1/||")
- NEW_NAME=$(echo $NEW | sed "s|$ROOT2/||")
- if [ $# == 5 ]; then IGNORES="$5"; fi
-else
- ROOT1=$(dirname $OLD)/
- ROOT2=$(dirname $NEW)/
- OLD_NAME=$OLD
- NEW_NAME=$NEW
- if [ $# == 3 ]; then IGNORES="$3"; fi
-fi
-
-if [ "`uname`" == "SunOS" ]; then
- if [ -f "`which gdiff`" ]; then
- DIFF=gdiff
- else
- DIFF=diff
- fi
-else
- DIFF=diff
-fi
-
-OLD_SUFFIX="${OLD##*.}"
-NEW_SUFFIX="${NEW##*.}"
-if [ "$OLD_SUFFIX" != "$NEW_SUFFIX" ]; then
- echo The files do not have the same suffix type!
- exit 2
-fi
-
-if [ "$OLD_SUFFIX" != "zip" ] && [ "$OLD_SUFFIX" != "jar" ] && [ "$OLD_SUFFIX" != "sym" ]; then
- echo The files have to be zip, jar or sym! They are $OLD_SUFFIX
- exit 2
-fi
-
-UNARCHIVE="unzip -q"
-
-TYPE="$OLD_SUFFIX"
-
-if cmp $OLD $NEW > /dev/null
-then
- # The files were bytewise identical.
- exit 0
-fi
-
-# Not quite identical, the might still contain the same data.
-# Unpack the jar/zip files in temp dirs
-if test "x$COMPARE_ROOT" == "x"; then
- COMPARE_ROOT=/tmp/compare_root.$$
- REMOVE_COMPARE_ROOT=true
-fi
-OLD_TEMPDIR=$COMPARE_ROOT/$OLD_NAME.old
-NEW_TEMPDIR=$COMPARE_ROOT/$NEW_NAME.new
-mkdir -p $OLD_TEMPDIR
-mkdir -p $NEW_TEMPDIR
-(cd $OLD_TEMPDIR && rm -rf * ; $UNARCHIVE $OLD)
-(cd $NEW_TEMPDIR && rm -rf * ; $UNARCHIVE $NEW)
-
-ONLY1=$(LANG=C $DIFF -rq $OLD_TEMPDIR $NEW_TEMPDIR | grep "^Only in $OLD_TEMPDIR")
-
-if [ -n "$ONLY1" ]; then
- echo " Only the OLD $OLD_NAME contains:"
- LANG=C $DIFF -rq $DIFF_FLAGS $OLD_TEMPDIR $NEW_TEMPDIR | grep "^Only in $OLD_TEMPDIR" \
- | sed "s|Only in $OLD_TEMPDIR| |"g | sed 's|: |/|g'
-fi
-
-ONLY2=$(LANG=C $DIFF -rq $OLD_TEMPDIR $NEW_TEMPDIR | grep "^Only in $NEW_TEMPDIR")
-
-if [ -n "$ONLY2" ]; then
- echo " Only the NEW $NEW_NAME contains:"
- LANG=C $DIFF -rq $DIFF_FLAGS $OLD_TEMPDIR $NEW_TEMPDIR | grep "^Only in $NEW_TEMPDIR" \
- | sed "s|Only in $NEW_TEMPDIR| |"g | sed 's|: |/|g'
-fi
-
-DIFFTEXT="/bin/bash `dirname $0`/difftext.sh"
-
-LANG=C $DIFF -rq $DIFF_FLAGS $OLD_TEMPDIR $NEW_TEMPDIR | grep differ | cut -f 2,4 -d ' ' | \
- awk "{ print \"$DIFFTEXT \"\$1\" \"\$2 }" > $COMPARE_ROOT/diffing
-
-/bin/bash $COMPARE_ROOT/diffing > $COMPARE_ROOT/diffs
-
-if [ -s "$COMPARE_ROOT/diffs" ]; then
- echo " Differing files in $OLD_NAME"
- cat $COMPARE_ROOT/diffs | grep differ | $IGNORES | cut -f 2 -d ' ' | \
- sed "s|$OLD_TEMPDIR| |g"
-fi
-
-# Clean up
-
-if [ "x$REMOVE_COMPARE_ROOT" == xtrue ]; then
- rm -rf $REMOVE_COMPARE_ROOT
-fi
-
-exit 1
-
diff --git a/common/bin/difflib.sh b/common/bin/difflib.sh
deleted file mode 100644
index dc5eed1..0000000
--- a/common/bin/difflib.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# Simple tool to diff two shared libraries.
-# Criterias: two shared libraries are considered equal if:
-# the file sizes are the same AND the symbols outputs from the nm command are equal
-
-if [ $# -lt 2 ]
-then
- echo "Diff two shared libs. Return codes:"
- echo "0 - no diff"
- echo "1 - Identical symbols AND size, BUT not bytewise identical"
- echo "2 - Identical symbols BUT NEW size"
- echo "3 - Differences, content BUT SAME size"
- echo "4 - Differences, content AND size"
- echo "10 - Could not perform diff"
- echo "Use 'quiet' to disable any output."
- echo "Syntax: $0 file1 file2 [quiet]"
- exit 10
-fi
-
-if [ ! -f $1 ]
-then
- echo $1 does not exist
- exit 10
-fi
-
-if [ ! -f $2 ]
-then
- echo $2 does not exist
- exit 10
-fi
-
-if [ "`uname`" == "SunOS" ]; then
- if [ -f "`which gnm`" ]; then
- NM=gnm
-# Jonas 2012-05-29: solaris native nm produces radically different output than gnm
-# so if using that...we need different filter than "cut -f 2-"
-#
- elif [ -f "`which nm`" ]; then
- NM=nm
- else
- echo "No nm command found"
- exit 10
- fi
- LDD=ldd
-elif [ $OSTYPE == "cygwin" ]; then
- NM="$VS100COMNTOOLS/../../VC/bin/amd64/dumpbin.exe"
- NM_ARGS=/exports
- LDD=
-elif [ "`uname`" == "Darwin" ]; then
- NM=nm
- LDD="otool -L"
-else
- NM=nm
- LDD=ldd
-fi
-
-# Should the differences be viewed?
-VIEW=
-# You can do export DIFF=meld to view
-# any differences using meld instead.
-if [ -n "$DIFF" ]; then
- DIFF="$DIFF"
-else
- DIFF=diff
-fi
-OLD=$(cd $(dirname $1) && pwd)/$(basename $1)
-NEW=$(cd $(dirname $2) && pwd)/$(basename $2)
-
-OLD_SIZE=$(ls -l "$OLD" | awk '{ print $5 }')
-NEW_SIZE=$(ls -l "$NEW" | awk '{ print $5 }')
-
-if [ $# -gt 3 ]
-then
- ROOT1=$(cd $3 && pwd)
- ROOT2=$(cd $4 && pwd)
- OLD_NAME=$(echo $OLD | sed "s|$ROOT1/||")
- NEW_NAME=$(echo $NEW | sed "s|$ROOT2/||")
- if [ "x$5" == "xview" ]; then VIEW=view; fi
-else
- ROOT1=$(dirname $OLD)/
- ROOT2=$(dirname $NEW)/
- OLD_NAME=$OLD
- NEW_NAME=$NEW
- if [ "x$3" == "xview" ]; then VIEW=view; fi
-fi
-
-OLD_SUFFIX="${OLD##*.}"
-NEW_SUFFIX="${NEW##*.}"
-if [ "$OLD_SUFFIX" != "$NEW_SUFFIX" ]; then
- echo The files do not have the same suffix type!
- exit 10
-fi
-
-if [ "$OLD_SUFFIX" != "so" ] && [ "$OLD_SUFFIX" != "dylib" ] && [ "$OLD_SUFFIX" != "dll" ]; then
- echo The files have to be .so, .dylib or .dll! They are $OLD_SUFFIX
- exit 10
-fi
-
-TYPE="$OLD_SUFFIX"
-
-if cmp $OLD $NEW > /dev/null
-then
- # The files were bytewise identical.
- echo Identical: $OLD_NAME
- exit 0
-fi
-
-OLD_SYMBOLS=$COMPARE_ROOT/nm.$OLD_NAME.old
-NEW_SYMBOLS=$COMPARE_ROOT/nm.$NEW_NAME.new
-
-mkdir -p $(dirname $OLD_SYMBOLS)
-mkdir -p $(dirname $NEW_SYMBOLS)
-
-if [ $OSTYPE == "cygwin" ]; then
- "$NM" $NM_ARGS $OLD | grep " = " > $OLD_SYMBOLS
- "$NM" $NM_ARGS $NEW | grep " = " > $NEW_SYMBOLS
- "$NM" $NM_ARGS $OLD > $OLD_SYMBOLS.full
- "$NM" $NM_ARGS $NEW > $NEW_SYMBOLS.full
-else
- # Strip the addresses, just compare the ordering of the symbols.
- $NM $OLD | cut -f 2- -d ' ' > $OLD_SYMBOLS
- $NM $NEW | cut -f 2- -d ' ' > $NEW_SYMBOLS
- # But store the full information for easy diff access.
- $NM $OLD > $OLD_SYMBOLS.full
- $NM $NEW > $NEW_SYMBOLS.full
-fi
-
-DIFFS=$(LANG=C diff $OLD_SYMBOLS $NEW_SYMBOLS)
-
-RESULT=0
-
-if [ "${LDD}" ]
-then
- NAME=`basename $OLD`
- TMP=$COMPARE_ROOT/ldd/ldd.${NAME}
- rm -rf "${TMP}"
- mkdir -p "${TMP}"
-
- (cd "${TMP}" && cp $OLD . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.old | uniq > dep.uniq.old)
- (cd "${TMP}" && cp $NEW . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.new | uniq > dep.uniq.new)
- (cd "${TMP}" && rm -f ${NAME})
-
- DIFFS_DEP=$(LANG=C diff "${TMP}/dep.old" "${TMP}/dep.new")
- DIFFS_UNIQ_DEP=$(LANG=C diff "${TMP}/dep.uniq.old" "${TMP}/dep.uniq.new")
-
- DEP_MSG=
- if [ -z "${DIFFS_UNIQ_DEP}" -a -z "${DIFFS_DEP}" ]; then
- DEP_MSG="Identical dependencies"
- elif [ -z "${DIFFS_UNIQ_DEP}" ]; then
- DEP_MSG="Redundant duplicate dependencies added"
- RES=1
- else
- DEP_MSG="DIFFERENT dependencies"
- RES=1
- fi
-fi
-
-if [ -n "$DIFFS" ]; then
- if [ $OLD_SIZE -ne $NEW_SIZE ]
- then
- echo Differences, content AND size : $DEP_MSG : $OLD_NAME
- RESULT=4
- else
- echo Differences, content BUT SAME size: $DEP_MSG : $OLD_NAME
- RESULT=3
- fi
- if [ "x$VIEW" == "xview" ]; then
- LANG=C $DIFF $OLD_SYMBOLS $NEW_SYMBOLS
- fi
-else
- if [ $OLD_SIZE -ne $NEW_SIZE ]
- then
- echo Identical symbols BUT NEW size : $DEP_MSG : $OLD_NAME
- RESULT=2
- else
- echo Identical symbols AND size, BUT not bytewise identical: $DEP_MSG : $OLD_NAME
- RESULT=1
- fi
-fi
-
-exit $RESULT
-
-
-
diff --git a/common/bin/difftext.sh b/common/bin/difftext.sh
deleted file mode 100644
index ae90373..0000000
--- a/common/bin/difftext.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# The difftext.sh knows how to compare text files and
-# ignore some specific differences.
-# When difftext.sh is called, we already know that the
-# files differ. But if the tests below trigger, then
-# we ignore differences caused by:
-#
-# Timestamps in Java sources generated by idl2java
-# Sorting order and cleanup style in .properties files.
-
-OLD="$1"
-NEW="$2"
-SUF="${OLD##*.}"
-TMP=1
-if test "x$SUF" == "xjava"; then
- TMP=$(LANG=C diff $OLD $NEW | \
- grep '^[<>]' | \
- sed '/[<>] \* from.*\.idl/d' | \
- sed '/[<>] \*.*201[12].*/d' | \
- sed '/\/\/ Generated from input file.*/d' | \
- sed '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' | \
- sed '/\/\/ java GenerateCharacter.*/d')
-fi
-if test "x$SUF" == "xproperties"; then
- cat $OLD | sed -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
--e 's/\\u0020/\x20/g' \
--e 's/\\u003A/\x3A/g' \
--e 's/\\u006B/\x6B/g' \
--e 's/\\u0075/\x75/g' \
--e 's/\\u00A0/\xA0/g' \
--e 's/\\u00A3/\xA3/g' \
--e 's/\\u00B0/\xB0/g' \
--e 's/\\u00B7/\xB7/g' \
--e 's/\\u00BA/\xBA/g' \
--e 's/\\u00BF/\xBF/g' \
--e 's/\\u00C0/\xC0/g' \
--e 's/\\u00C1/\xC1/g' \
--e 's/\\u00C2/\xC2/g' \
--e 's/\\u00C4/\xC4/g' \
--e 's/\\u00C5/\xC5/g' \
--e 's/\\u00C8/\xC8/g' \
--e 's/\\u00C9/\xC9/g' \
--e 's/\\u00CA/\xCA/g' \
--e 's/\\u00CD/\xCD/g' \
--e 's/\\u00CE/\xCE/g' \
--e 's/\\u00D3/\xD3/g' \
--e 's/\\u00D4/\xD4/g' \
--e 's/\\u00D6/\xD6/g' \
--e 's/\\u00DA/\xDA/g' \
--e 's/\\u00DC/\xDC/g' \
--e 's/\\u00DD/\xDD/g' \
--e 's/\\u00DF/\xDF/g' \
--e 's/\\u00E0/\xE0/g' \
--e 's/\\u00E1/\xE1/g' \
--e 's/\\u00E2/\xE2/g' \
--e 's/\\u00E3/\xE3/g' \
--e 's/\\u00E4/\xE4/g' \
--e 's/\\u00E5/\xE5/g' \
--e 's/\\u00E6/\xE6/g' \
--e 's/\\u00E7/\xE7/g' \
--e 's/\\u00E8/\xE8/g' \
--e 's/\\u00E9/\xE9/g' \
--e 's/\\u00EA/\xEA/g' \
--e 's/\\u00EB/\xEB/g' \
--e 's/\\u00EC/\xEC/g' \
--e 's/\\u00ED/\xED/g' \
--e 's/\\u00EE/\xEE/g' \
--e 's/\\u00EF/\xEF/g' \
--e 's/\\u00F1/\xF1/g' \
--e 's/\\u00F2/\xF2/g' \
--e 's/\\u00F3/\xF3/g' \
--e 's/\\u00F4/\xF4/g' \
--e 's/\\u00F5/\xF5/g' \
--e 's/\\u00F6/\xF6/g' \
--e 's/\\u00F9/\xF9/g' \
--e 's/\\u00FA/\xFA/g' \
--e 's/\\u00FC/\xFC/g' \
--e 's/\\u0020/\x20/g' \
--e 's/\\u003f/\x3f/g' \
--e 's/\\u006f/\x6f/g' \
--e 's/\\u0075/\x75/g' \
--e 's/\\u00a0/\xa0/g' \
--e 's/\\u00a3/\xa3/g' \
--e 's/\\u00b0/\xb0/g' \
--e 's/\\u00ba/\xba/g' \
--e 's/\\u00bf/\xbf/g' \
--e 's/\\u00c1/\xc1/g' \
--e 's/\\u00c4/\xc4/g' \
--e 's/\\u00c5/\xc5/g' \
--e 's/\\u00c8/\xc8/g' \
--e 's/\\u00c9/\xc9/g' \
--e 's/\\u00ca/\xca/g' \
--e 's/\\u00cd/\xcd/g' \
--e 's/\\u00d6/\xd6/g' \
--e 's/\\u00dc/\xdc/g' \
--e 's/\\u00dd/\xdd/g' \
--e 's/\\u00df/\xdf/g' \
--e 's/\\u00e0/\xe0/g' \
--e 's/\\u00e1/\xe1/g' \
--e 's/\\u00e2/\xe2/g' \
--e 's/\\u00e3/\xe3/g' \
--e 's/\\u00e4/\xe4/g' \
--e 's/\\u00e5/\xe5/g' \
--e 's/\\u00e7/\xe7/g' \
--e 's/\\u00e8/\xe8/g' \
--e 's/\\u00e9/\xe9/g' \
--e 's/\\u00ea/\xea/g' \
--e 's/\\u00eb/\xeb/g' \
--e 's/\\u00ec/\xec/g' \
--e 's/\\u00ed/\xed/g' \
--e 's/\\u00ee/\xee/g' \
--e 's/\\u00ef/\xef/g' \
--e 's/\\u00f0/\xf0/g' \
--e 's/\\u00f1/\xf1/g' \
--e 's/\\u00f2/\xf2/g' \
--e 's/\\u00f3/\xf3/g' \
--e 's/\\u00f4/\xf4/g' \
--e 's/\\u00f5/\xf5/g' \
--e 's/\\u00f6/\xf6/g' \
--e 's/\\u00f7/\xf7/g' \
--e 's/\\u00f8/\xf8/g' \
--e 's/\\u00f9/\xf9/g' \
--e 's/\\u00fa/\xfa/g' \
--e 's/\\u00fc/\xfc/g' \
--e 's/\\u00ff/\xff/g' \
- | sed -e '/^#/d' -e '/^$/d' \
- -e :a -e '/\\$/N; s/\\\n//; ta' \
- -e 's/^[ \t]*//;s/[ \t]*$//' \
- -e 's/\\=/=/' | LANG=C sort > $OLD.cleaned
- TMP=$(LANG=C diff $OLD.cleaned $NEW)
-fi
-if test -n "$TMP"; then
- echo Files $OLD and $NEW differ
-fi
diff --git a/common/bin/exception_list_linux b/common/bin/exception_list_linux
deleted file mode 100644
index 4dcf272..0000000
--- a/common/bin/exception_list_linux
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# List of files inside jar archives that are ok if they differ.
-LIST_DIFF_JAR="
-/sun/misc/Version.class
-/sun/tools/jconsole/Version.class
-/com/sun/tools/javac/resources/version.class
-/com/sun/tools/javah/resources/version.class
-/com/sun/tools/javap/resources/version.class
-"
-
-# List of binaries that only need to match symbols
-LIST_DIFF_SIZE="
-jre/lib/amd64/libfontmanager.so
-jre/lib/amd64/libjdwp.so
-jre/lib/amd64/libt2k.so
-bin/unpack200
-jre/bin/unpack200
-jre/lib/amd64/libjsig.debuginfo
-jre/lib/amd64/libsaproc.debuginfo
-jre/lib/amd64/server/libjvm.debuginfo
-"
-
-# List of binares that need to match both symbols and size
-LIST_DIFF_BYTE="
-jre/lib/amd64/libdt_socket.so
-jre/lib/amd64/libattach.so
-jre/lib/amd64/libjaas_unix.so
-jre/lib/amd64/libjawt.so
-jre/lib/amd64/libjpeg.so
-jre/lib/amd64/libjsdt.so
-jre/lib/amd64/libjsig.so
-jre/lib/amd64/libsaproc.so
-jre/lib/amd64/libsctp.so
-jre/lib/amd64/libsunec.so
-jre/lib/amd64/libunpack.so
-jre/lib/amd64/libverify.so
-jre/lib/amd64/libzip.so
-jre/lib/amd64/server/libjsig.so
-jre/lib/amd64/server/libjvm.so
-jre/lib/amd64/liblcms.so
-demo/jvmti/heapTracker/lib/libheapTracker.so
-demo/jvmti/hprof/lib/libhprof.so
-demo/jvmti/minst/lib/libminst.so
-demo/jvmti/mtrace/lib/libmtrace.so
-demo/jvmti/waiters/lib/libwaiters.so
-bin/appletviewer
-bin/extcheck
-bin/idlj
-bin/jar
-bin/jarsigner
-bin/java
-bin/javac
-bin/javadoc
-bin/javah
-bin/javap
-bin/jcmd
-bin/jconsole
-bin/jdb
-bin/jhat
-bin/jinfo
-bin/jmap
-bin/jps
-bin/jrunscript
-bin/jsadebugd
-bin/jstack
-bin/jstat
-bin/jstatd
-bin/keytool
-bin/native2ascii
-bin/orbd
-bin/pack200
-bin/policytool
-bin/rmic
-bin/rmid
-bin/rmiregistry
-bin/schemagen
-bin/serialver
-bin/servertool
-bin/tnameserv
-bin/wsgen
-bin/wsimport
-bin/xjc
-jre/bin/java
-jre/bin/keytool
-jre/bin/orbd
-jre/bin/pack200
-jre/bin/policytool
-jre/bin/rmid
-jre/bin/rmiregistry
-jre/bin/servertool
-jre/bin/tnameserv
-"
diff --git a/common/bin/extractvcvars.sh b/common/bin/extractvcvars.sh
deleted file mode 100644
index 32e7d69..0000000
--- a/common/bin/extractvcvars.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-
-# Must be bash, but that is ok since we are running from cygwin.
-# The first argument is the vcvarsall.bat file to run.
-# The second argument is the arch arg to give to vcvars.
-VCVARSALL="$1"
-ARCH_ARG="$2"
-
-# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
-# but calculate the difference in Cygwin environment before/after running it and then
-# apply the diff.
-_vs10varsall=`cygpath -a -m -s "$VCVARSALL"`
-_dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
-_dosbash=`cygpath -a -w -s \`which bash\`.*`
-
-# generate the set of exported vars before/after the vs10 setup
-echo "@echo off" > localdevenvtmp.bat
-echo "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
-echo "call $_dosvs10varsall $ARCH_ARG" >> localdevenvtmp.bat
-echo "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
-cmd /c localdevenvtmp.bat
-
-# apply the diff (less some non-vs10 vars named by "!")
-sort localdevenvtmp.export0 |grep -v "!" > localdevenvtmp.export0.sort
-sort localdevenvtmp.export1 |grep -v "!" > localdevenvtmp.export1.sort
-comm -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
-cat localdevenv.sh | sed 's/declare -x /export /g' | sed 's/="/:="/g' | sed 's/\\\\/\\/g' | sed 's/"//g' | \
- sed 's/#/\$\(HASH\)/g' > localdevenv.gmk
-
-# cleanup
-rm -f localdevenvtmp*
diff --git a/common/bin/hide_important_warnings_from_javac.sh b/common/bin/hide_important_warnings_from_javac.sh
index 412c71a..0433635 100644
--- a/common/bin/hide_important_warnings_from_javac.sh
+++ b/common/bin/hide_important_warnings_from_javac.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/common/bin/logger.sh b/common/bin/logger.sh
index 70c3dab..46ab48ae 100644
--- a/common/bin/logger.sh
+++ b/common/bin/logger.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/common/bin/shell-tracer.sh b/common/bin/shell-tracer.sh
new file mode 100644
index 0000000..27a964c
--- /dev/null
+++ b/common/bin/shell-tracer.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Copyright (c) 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.
+#
+# 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.
+#
+
+# Usage: sh shell-tracer.sh <TIME_CMD> <OUTPUT_FILE> <OLD_SHELL> <shell command line>
+#
+# This shell script is supposed to be set as a replacement for SHELL in make,
+# causing it to be called whenever make wants to execute shell commands.
+# The <shell command line> is suitable for passing on to the old shell,
+# typically beginning with -c.
+#
+# This script will make sure the shell command line is executed with
+# OLD_SHELL -x, and it will also store a simple log of the the time it takes to
+# execute the command in the OUTPUT_FILE, using the "time" utility as pointed
+# to by TIME_CMD. If TIME_CMD is "-", no timestamp will be stored.
+
+TIME_CMD="$1"
+OUTPUT_FILE="$2"
+OLD_SHELL="$3"
+shift
+shift
+shift
+if [ "$TIME_CMD" != "-" ]; then
+"$TIME_CMD" -f "[TIME:%E] $*" -a -o "$OUTPUT_FILE" "$OLD_SHELL" -x "$@"
+else
+"$OLD_SHELL" -x "$@"
+fi
diff --git a/common/makefiles/HotspotWrapper.gmk b/common/makefiles/HotspotWrapper.gmk
index 48f1c38..8a1ae64 100644
--- a/common/makefiles/HotspotWrapper.gmk
+++ b/common/makefiles/HotspotWrapper.gmk
@@ -36,9 +36,12 @@
default: all
# Get all files except .hg in the hotspot directory.
-HOTSPOT_FILES := $(shell $(FIND) $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
+HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
+# The old build creates hotspot output dir before calling hotspot and
+# not doing it breaks builds on msys.
$(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
+ @$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
@($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
$(TOUCH) $@
diff --git a/common/makefiles/IdlCompilation.gmk b/common/makefiles/IdlCompilation.gmk
index 799c7d6..11f661a 100644
--- a/common/makefiles/IdlCompilation.gmk
+++ b/common/makefiles/IdlCompilation.gmk
@@ -59,7 +59,7 @@
$(MKDIR) -p $3/$$($4_TMPDIR)
$(RM) -rf $3/$$($4_TMPDIR)
$(MKDIR) -p $(dir $5)
- $(ECHO) Compiling IDL $(patsubst $2/%,%,$4)
+ $(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
$8 -td $3/$$($4_TMPDIR) \
-i $2/org/omg/CORBA \
-i $2/org/omg/PortableInterceptor \
@@ -79,15 +79,9 @@
# param 1 is for example BUILD_IDLS
# param 2,3,4,5,6,7,8 are named args.
# IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
-$(if $2,$1_$(strip $2))
-$(if $3,$1_$(strip $3))
-$(if $4,$1_$(strip $4))
-$(if $5,$1_$(strip $5))
-$(if $6,$1_$(strip $6))
-$(if $7,$1_$(strip $7))
-$(if $8,$1_$(strip $8))
-$(if $9,$1_$(strip $9))
-$(if $(10),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
+$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+$(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+$(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
# Remove any relative addressing in the paths.
$1_SRC := $$(abspath $$($1_SRC))
diff --git a/common/makefiles/JavaCompilation.gmk b/common/makefiles/JavaCompilation.gmk
index 1e8593f..8dd8899 100644
--- a/common/makefiles/JavaCompilation.gmk
+++ b/common/makefiles/JavaCompilation.gmk
@@ -50,27 +50,17 @@
# FLAGS:=Flags to be supplied to javac
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
# SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
- $(if $2,$1_$(strip $2))
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
- ifeq ($$(ENABLE_SJAVAC),yes)
- # The port file contains the tcp/ip on which the server listens
- # and the cookie necessary to talk to the server.
- $1_JAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
- # You can use a different JVM to run the background javac server.
- ifeq ($$($1_SERVER_JVM),)
- # It defaults to the same JVM that is used to start the javac command.
- $1_SERVER_JVM:=$$($1_JVM)
- endif
- # Set the $1_REMOTE to spawn a background javac server.
- $1_REMOTE:=-XDserver:portfile=$$($1_JAVAC_PORTFILE),poolsize=$(SJAVAC_SERVER_CORES),id=$1,javac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_JAVAC))))
+ # The port file contains the tcp/ip on which the server listens
+ # and the cookie necessary to talk to the server.
+ $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
+ # You can use a different JVM to run the background javac server.
+ ifeq ($$($1_SERVER_JVM),)
+ # It defaults to the same JVM that is used to start the javac command.
+ $1_SERVER_JVM:=$$($1_JVM)
endif
endef
@@ -92,19 +82,11 @@
# added to the archive.
# EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
# CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$1_$(strip $(10)))
- $(if $(11),$1_$(strip $(11)))
- $(if $(12),$1_$(strip $(12)))
- $(if $(13),$1_$(strip $(13)))
- $(if $(14),$1_$(strip $(14)))
- $(if $(15),$1_$(strip $(15)))
+
+ # NOTE: $2 is dependencies, not a named argument!
+ $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(findstring $(LOG),debug trace), $(info *[2] <dependencies> = $(strip $2)))
$(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
$1_JARMAIN:=$(strip $$($1_JARMAIN))
@@ -125,16 +107,28 @@
ifneq (,$$($1_INCLUDES))
$1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),\
$$(addprefix $$(src)/,$$($1_INCLUDES)))
- $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \
+ # If there are a lot of include patterns, output to file to shorten command lines
+ ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
+ $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
+ else
+ $$(shell $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include)
+ $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \
>> $$($1_BIN)/_the.$$($1_JARNAME)_include))
- $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
+ $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
+ endif
endif
ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
$1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,\
$$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
- $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \
+ # If there are a lot of include patterns, output to file to shorten command lines
+ ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
+ $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
+ else
+ $$(shell $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
+ $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \
>> $$($1_BIN)/_the.$$($1_JARNAME)_exclude))
- $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
+ $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
+ endif
endif
# Check if this jar needs to have its index generated.
@@ -149,11 +143,13 @@
ifneq (,$2)
$1_DEPS:=$2
else
- $1_DEPS:=$$(foreach src,$$($1_SRCS),$$(shell ($(FIND) $$(src) -type f \
- -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
- $$($1_GREP_EXCLUDES) && $(ECHO) $$(addprefix $$(src)/,$$($1_EXTRA_FILES)))))
+ # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
+ # lines, but not here for use in make dependencies.
+ $1_DEPS:=$$(shell $(FIND) $$($1_SRCS) -type f -a \( $$($1_FIND_PATTERNS) \) \
+ $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \
+ $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
ifeq (,$$($1_SKIP_METAINF))
- $1_DEPS+=$$(foreach src,$$($1_SRCS),$$(shell $(FIND) $$(src)/META-INF -type f 2> /dev/null))
+ $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null))
endif
endif
@@ -161,34 +157,39 @@
# The capture contents macro finds all files (matching the patterns, typically
# .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
- $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),(($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES) && $(ECHO) $$($1_EXTRA_FILES)) | $(SED) 's|$$(src)/||g' > $$(src)/_the.$$($1_JARNAME)_contents) && )
+ $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
+ (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
+ $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
+ $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
# The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
ifeq (,$$($1_SKIP_METAINF))
- $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) && )
+ $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
endif
# The capture deletes macro finds all deleted files and concatenates them. The resulting file
# tells us what to remove from the jar-file.
- $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) &&)
+ $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
# The update contents macro updates the jar file with the previously capture contents.
$1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
(cd $$(src) && \
if [ -s _the.$$($1_JARNAME)_contents ]; then \
$(ECHO) " updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
- fi) &&)
+ fi) $$(NEWLINE))
# The s-variants of the above macros are used when the jar is created from scratch.
$1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
(($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
- $$($1_GREP_EXCLUDES) && $(ECHO) $$($1_EXTRA_FILES)) | $(SED) 's|$$(src)/||g' > \
- $$(src)/_the.$$($1_JARNAME)_contents) && )
+ $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
+ $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
ifeq (,$$($1_SKIP_METAINF))
$1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS),\
($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
- $$(src)/_the.$$($1_JARNAME)_contents) && )
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
endif
$1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
- (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) &&)
+ (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
# Use a slightly shorter name for logging, but with enough path to identify this jar.
$1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
@@ -208,38 +209,32 @@
# Here is the rule that creates/updates the jar file.
$$($1_JAR) : $$($1_DEPS)
$(MKDIR) -p $$($1_BIN)
- if [ -n "$$($1_MANIFEST)" ]; then \
+ $$(if $$($1_MANIFEST),\
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE); \
- else \
- $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE); \
- fi
- if [ -n "$$(strip $$($1_JARMAIN))" ]; then \
- $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE); \
- fi
- if [ -n "$$($1_EXTRA_MANIFEST_ATTR)" ]; then \
- $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE); \
- fi
- +if [ -s $$@ ]; then \
- $(ECHO) Modifying $$($1_NAME) && \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
+ ,\
+ $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
+ $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
+ $$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
+ $$(if $$(wildcard $$@),\
+ $(ECHO) Modifying $$($1_NAME) $$(NEWLINE)\
$$($1_CAPTURE_CONTENTS) \
$$($1_CAPTURE_METAINF) \
- $(RM) $$($1_DELETES_FILE) && \
+ $(RM) $$($1_DELETES_FILE) $$(NEWLINE)\
$$($1_CAPTURE_DELETES) \
- $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) && \
+ $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE)\
if [ -s $$($1_DELETESS_FILE) ]; then \
$(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
$(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
- fi && \
- $$($1_UPDATE_CONTENTS) true && \
- $$($1_JARINDEX) && true ; \
- else \
- $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) && \
+ fi $$(NEWLINE) \
+ $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
+ $$($1_JARINDEX) && true \
+ ,\
+ $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
$$($1_SCAPTURE_CONTENTS) \
$$($1_SCAPTURE_METAINF) \
$$($1_SUPDATE_CONTENTS) \
- $$($1_JARINDEX) && true ; \
- fi;
+ $$($1_JARINDEX) && true )
endef
@@ -247,15 +242,9 @@
# param 1 is for example ZIP_MYSOURCE
# param 2,3,4,5,6,7,8,9 are named args.
# SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
- $(if $2,$1_$(strip $2))
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
# Find all files in the source tree.
$1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
@@ -274,7 +263,7 @@
ifneq ($$($1_EXCLUDES),)
$1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
$1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
- $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRC))
+ $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
endif
# Use a slightly shorter name for logging, but with enough path to identify this zip.
@@ -288,7 +277,7 @@
$$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
$(MKDIR) -p $$(@D)
$(ECHO) Updating $$($1_NAME)
- $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES)))) ;) true
+ $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true
$(TOUCH) $$@
endef
@@ -324,7 +313,7 @@
$$($1_BIN)$$($2_TARGET) : $2
$(MKDIR) -p $$(@D)
$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
- | $(SED) -f "$(SRC_ROOT)/common/bin/unicode2x.sed" \
+ | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
| $(SED) -e '/^#/d' -e '/^$$$$/d' \
-e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-e 's/^[ \t]*//;s/[ \t]*$$$$//' \
@@ -364,36 +353,27 @@
# Its only here until we cleanup some nasty source code pasta in the jdk.
# HEADERS:=path to directory where all generated c-headers are written.
# DEPENDS:=Extra dependecy
- $(if $2,$1_$(strip $2))
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$1_$(strip $(10)))
- $(if $(11),$1_$(strip $(11)))
- $(if $(12),$1_$(strip $(12)))
- $(if $(13),$1_$(strip $(13)))
- $(if $(14),$1_$(strip $(14)))
- $(if $(15),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
# Extract the info from the java compiler setup.
- $1_REMOTE := $$($$($1_SETUP)_REMOTE)
$1_JVM := $$($$($1_SETUP)_JVM)
$1_JAVAC := $$($$($1_SETUP)_JAVAC)
$1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
ifeq ($$($1_JAVAC),)
$$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
endif
+ $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
+ $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
# Handle addons and overrides.
$1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
# Make sure the dirs exist.
- $$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN))
+ $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
+ $$(eval $$(call MakeDir,$$($1_BIN)))
# Find all files in the source trees.
- $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(foreach i,$$($1_SRC),$$(shell $(FIND) $$i -type f)))
+ $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(shell $(FIND) $$($1_SRC) -type f))
# Extract the java files.
ifneq ($$($1_EXCLUDE_FILES),)
$1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
@@ -428,7 +408,7 @@
# Rewrite list of patterns into a find statement.
$1_COPY_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_COPY))
# Search for all files to be copied.
- $1_ALL_COPIES := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i \( $$($1_COPY_PATTERN) \) -a -type f))
+ $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
# Copy these explicitly
$1_ALL_COPIES += $$($1_COPY_FILES)
# Copy must also respect filters.
@@ -442,7 +422,7 @@
$1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
endif
# All files below META-INF are always copied.
- $1_ALL_COPIES += $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i/META-INF -type f 2> /dev/null))
+ $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
ifneq (,$$($1_ALL_COPIES))
# Yep, there are files to be copied!
$1_ALL_COPY_TARGETS:=
@@ -456,7 +436,7 @@
# Rewrite list of patterns into a find statement.
$1_CLEAN_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_CLEAN))
# Search for all files to be copied.
- $1_ALL_CLEANS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i \( $$($1_CLEAN_PATTERN) \) -a -type f))
+ $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
# Copy and clean must also respect filters.
ifneq (,$$($1_INCLUDES))
$1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
@@ -482,30 +462,59 @@
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
endif
- ifneq (,$$($1_HEADERS))
- $1_HEADERS_ARG := -h $$($1_HEADERS)
- endif
-
# Create a sed expression to remove the source roots and to replace / with .
# and remove .java at the end.
$1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
+ ifneq (,$$($1_HEADERS))
+ $1_HEADERS_ARG := -h $$($1_HEADERS)
+ endif
+
# Using sjavac to compile.
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
+ # Create SJAVAC variable,
+ # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar"
+ # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main"
+ $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main
+
+ # Set the $1_REMOTE to spawn a background javac server.
+ $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),poolsize=$(SJAVAC_SERVER_CORES),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
+
$$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
$(MKDIR) -p $$(@D)
$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
$(ECHO) Compiling $1
- $$($1_JVM) $$(word 1,$$($1_JAVAC)) com.sun.tools.sjavac.Main \
- $$($1_REMOTE) $$($1_SJAVAC_ARGS) --permit-unidentified-artifacts -mfl $$($1_BIN)/_the.batch.tmp \
+ $$($1_JVM) $$($1_SJAVAC) \
+ $$($1_REMOTE) $$($1_SJAVAC_ARGS) \
+ --permit-unidentified-artifacts \
+ --permit-sources-without-package \
+ --compare-found-sources $$($1_BIN)/_the.batch.tmp \
$$($1_FLAGS) \
-implicit:none -d $$($1_BIN) $$($1_HEADERS_ARG)
else
# Using plain javac to batch compile everything.
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch
+ # When buliding in batch, put headers in a temp dir to filter out those that actually
+ # changed before copying them to the real header dir.
+ ifneq (,$$($1_HEADERS))
+ $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
+
+ $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch
+ $(MKDIR) -p $$(@D)
+ for f in `ls $$($1_HEADERS).tmp`; do \
+ if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
+ $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
+ fi; \
+ done
+ $(RM) -r $$($1_HEADERS).tmp
+ $(TOUCH) $$@
+
+ $1 += $$($1_HEADERS)/_the.headers
+ endif
+
# When not using sjavac, pass along all sources to javac using an @file.
$$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS)
$(MKDIR) -p $$(@D)
@@ -516,6 +525,7 @@
-implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \
$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
+
endif
# Check if a jar file was specified, then setup the rules for the jar.
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
new file mode 100644
index 0000000..b9322ab
--- /dev/null
+++ b/common/makefiles/Main.gmk
@@ -0,0 +1,208 @@
+#
+# Copyright (c) 2011, 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.
+#
+
+### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
+
+# Now load the spec
+include $(SPEC)
+
+# Load the vital tools for all the makefiles.
+include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
+
+# Include the corresponding custom file, if present.
+-include $(CUSTOM_MAKE_DIR)/Main.gmk
+
+### Clean up from previous run
+
+# Remove any build.log from a previous run, if they exist
+ifneq (,$(BUILD_LOG))
+ ifneq (,$(BUILD_LOG_PREVIOUS))
+ # Rotate old log
+ $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+ $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+ else
+ $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
+ endif
+ $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
+endif
+# Remove any javac server logs and port files. This
+# prevents a new make run to reuse the previous servers.
+ifneq (,$(SJAVAC_SERVER_DIR))
+ $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+endif
+
+# Reset the build timers.
+$(eval $(call ResetAllTimers))
+
+# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
+# hence this workaround.
+ifeq ($(JOBS),)
+ JOBS=$(NUM_CORES)
+endif
+MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
+
+### Main targets
+
+all: jdk
+
+start-make:
+ @$(call AtMakeStart)
+
+langtools: langtools-only
+langtools-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
+ @$(call TargetExit)
+
+corba: langtools corba-only
+corba-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
+ @$(call TargetExit)
+
+jaxp: langtools jaxp-only
+jaxp-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
+ @$(call TargetExit)
+
+jaxws: langtools jaxp jaxws-only
+jaxws-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
+ @$(call TargetExit)
+
+hotspot: hotspot-only
+hotspot-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
+ @$(call TargetExit)
+
+jdk: langtools hotspot corba jaxp jaxws jdk-only
+jdk-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
+ @$(call TargetExit)
+
+demos: jdk demos-only
+demos-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
+ @$(call TargetExit)
+
+images: source-tips demos images-only
+images-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
+ @$(call TargetExit)
+
+overlay-images: source-tips demos overlay-images-only
+overlay-images-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
+ @$(call TargetExit)
+
+bundles: images bundles-only
+bundles-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk bundles)
+ @$(call TargetExit)
+
+install: images install-only
+install-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
+ @$(call TargetExit)
+
+docs: jdk docs-only
+docs-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+ @$(call TargetExit)
+
+bootcycle-images:
+ @$(ECHO) Boot cycle build step 1: Building the JDK image normally
+ @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
+ @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+ @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
+
+test: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
+ @$(call TargetExit)
+
+# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
+# used to track the exact sources used to build that image.
+source-tips: $(OUTPUT_ROOT)/source_tips
+$(OUTPUT_ROOT)/source_tips: FRC
+ @$(MKDIR) -p $(@D)
+ @$(RM) $@
+ @$(if $(HG),$(call GetSourceTips),$(ECHO) "hg not installed" > $@)
+
+
+# Remove everything, except the output from configure.
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
+ @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
+ @$(ECHO) Cleaned all build artifacts.
+
+# Remove everything, including configure configuration.
+# If the output directory was created by configure and now becomes empty, remove it as well.
+# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
+dist-clean: clean
+ @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp)
+ @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
+ if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
+ $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ;\
+ else \
+ ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
+ fi \
+ )
+ @$(ECHO) Cleaned everything, you will have to re-run configure.
+
+clean-langtools:
+ $(call CleanComponent,langtools)
+clean-corba:
+ $(call CleanComponent,corba)
+clean-jaxp:
+ $(call CleanComponent,jaxp)
+clean-jaxws:
+ $(call CleanComponent,jaxws)
+clean-hotspot:
+ $(call CleanComponent,hotspot)
+clean-jdk:
+ $(call CleanComponent,jdk)
+clean-images:
+ $(call CleanComponent,images)
+clean-overlay-images:
+ $(call CleanComponent,overlay-images)
+clean-bootcycle-build:
+ $(call CleanComponent,bootcycle-build)
+
+.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
+.PHONY: all test clean dist-clean bootcycle-images start-make
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
+
+FRC: # Force target
diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk
index e9caaa8..c139a77 100644
--- a/common/makefiles/MakeBase.gmk
+++ b/common/makefiles/MakeBase.gmk
@@ -33,129 +33,13 @@
ifndef _MAKEBASE_GMK
_MAKEBASE_GMK := 1
-ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
- ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
- $(error This version of GNU Make is too low ($(MAKE_VERSION)). Please upgrade to 3.81 or newer.)
- endif
-endif
-
-ifneq (,$(CYGPATH))
- # Cygwin styff, if needed but most is going to be
- # done in configure!
- ifeq (yes,$(CHECK_FOR_VCINSTALLDIR))
- ifeq (,$(VCINSTALLDIR))
- $(info Could not find compiler paths!)
- $(info You probably configured the build from within a)
- $(info VS command prompt, but you are not using such a)
- $(info prompt right now.)
- $(info If you instead run configure from a plain cygwin shell, it)
- $(info will attempt to setup VS for you! Please try that.)
- $(error Giving up for now.)
- endif
- endif
-endif
-
-# The build times report is turned off by setting REPORT_BUILD_TIMES to nothing.
-# This is necessary for the target clean which will erase the
-# directories where the buildtimes are stored.
-REPORT_BUILD_TIMES=1
-# Store the build times in this directory.
-BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-$(MKDIR) -p $(BUILDTIMESDIR)
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Indicate that we started to build a sub repository and record starting time.
-define MakeStart
-$(call RecordStartTime,$1)
-$(BUILD_LOG_WRAPPER) $(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"########################################################################" \
-"Entering $1 for target(s) $2" \
-"########################################################################"
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
- $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
- M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
- > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Check if the current target is the final target, as specified by
-# the user on the command line. If so, call PrintEndMessage.
-define CheckIfFinished
-$(if $(filter $@,$(MAKECMDGOALS)),$(call PrintEndMessage))
-# If no taget is given, "all" is default. Check for that, too.
-# At most one of the tests can be true.
-$(if $(MAKECMDGOALS),,$(if $(filter $@,all),$(call PrintEndMessage)))
-endef
-
-# Indicate that we are done.
-# Record ending time and print out the total time it took to build.
-define MakeFinish
-$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,$1),)
-$(BUILD_LOG_WRAPPER) $(PRINTF) "%s\n##### %-60.60s #####\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"Leaving $1 for target(s) $2" \
-"########################################################################" \
-$(if $(REPORT_BUILD_TIMES),"Build time `$(CAT) $(BUILDTIMESDIR)/build_time_diff_$1` for target(s) $2","") \
-"########################################################################"
-$(call CheckIfFinished)
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-$(BUILD_LOG_WRAPPER) $(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
-"$1" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-"`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-define ResetTimers
-$$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
-endef
-
-define StartTimer
- $(call RecordStartTime,TOTAL)
-endef
-
-define StopTimer
- $(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),)
-endef
-
-# Hook to be called as the very first thing when running a normal build
-define AtRootMakeStart
- $(if $(findstring --jobserver,$(MAKEFLAGS)), $(error make -j is not supported, use make JOBS=n))
- $(call PrintStartMessage)
- $(call StartTimer)
-endef
-
-# Hook to be called as the very last thing for targets that are "top level" targets
-define AtRootMakeEnd
- $(call StopTimer)
- $(call CheckIfFinished)
-endef
-
# If the variable that you want to send to stdout for piping into a file or otherwise,
# is potentially long, for example the a list of file paths, eg a list of all package directories.
# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
# calls as well as use compression on recurrent file paths segments, to get around the potential
# command line length problem that exists in cygwin and other shells.
-compress_pre:=$(strip $(shell cat $(SRC_ROOT)/common/makefiles/compress.pre))
-compress_post:=$(strip $(shell cat $(SRC_ROOT)/common/makefiles/compress.post))
+compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-pre-compress.incl))
+compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-post-compress.incl))
compress_paths=$(compress_pre)\
$(subst $(SRC_ROOT),X97,\
$(subst $(OUTPUT_ROOT),X98,\
@@ -163,7 +47,7 @@
$(subst $(SPACE),\n,$(strip $1)))))\
$(compress_post)
-decompress_paths=sed -f $(SRC_ROOT)/common/makefiles/uncompress.sed -e 's|X99|\\n|g' \
+decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
-e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-e 's|X00|X|g' | tr '\n' '$2'
@@ -384,14 +268,67 @@
endef
define SetupLogging
- ifneq ($(findstring $(LOG),debug trace),)
+ ifeq ($$(LOG), trace)
# Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
+ # For each target executed, will print
+ # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
+ # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much (and causing a crash on Cygwin).
OLD_SHELL:=$$(SHELL)
- SHELL = $$(warning Building $$@$$(if $$<, (from $$<))$(if $$?, ($$? newer)))$$(OLD_SHELL) -x
+ WRAPPER_SHELL:=$$(OLD_SHELL) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(TIME),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(OLD_SHELL)
+ SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
+ endif
+ # Never remove warning messages; this is just for completeness
+ LOG_WARN=
+ ifneq ($$(findstring $$(LOG),info debug trace),)
+ LOG_INFO=
+ else
+ LOG_INFO=> /dev/null
+ endif
+ ifneq ($$(findstring $$(LOG),debug trace),)
+ LOG_DEBUG=
+ else
+ LOG_DEBUG=> /dev/null
+ endif
+ ifneq ($$(findstring $$(LOG),trace),)
+ LOG_TRACE=
+ else
+ LOG_TRACE=> /dev/null
endif
endef
# Make sure logging is setup for everyone that includes MakeBase.gmk.
$(eval $(call SetupLogging))
+# This is to be called by all SetupFoo macros
+define LogSetupMacroEntry
+ $(if $(26),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
+ $(if $(findstring $(LOG),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
+endef
+
+# Make directory without forking mkdir if not needed
+define MakeDir
+ ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
+ $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
+ endif
+endef
+
+ifeq ($(OPENJDK_TARGET_OS),solaris)
+# On Solaris, if the target is a symlink and exists, cp won't overwrite.
+define install-file
+ $(MKDIR) -p $(@D)
+ $(RM) '$@'
+ $(CP) -f -r -P '$<' '$(@D)'
+endef
+else ifeq ($(OPENJDK_TARGET_OS),macosx)
+define install-file
+ $(MKDIR) -p $(@D)
+ $(CP) -fpRP '$<' '$@'
+endef
+else
+define install-file
+ $(MKDIR) -p $(@D)
+ $(CP) -fP '$<' '$@'
+endef
+endif
+
endif # _MAKEBASE_GMK
diff --git a/common/makefiles/MakeHelpers.gmk b/common/makefiles/MakeHelpers.gmk
index ef84463..9910311 100644
--- a/common/makefiles/MakeHelpers.gmk
+++ b/common/makefiles/MakeHelpers.gmk
@@ -45,13 +45,130 @@
list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
+# Store the build times in this directory.
+BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
+
+# Global targets are possible to run either with or without a SPEC. The prototypical
+# global target is "help".
+global_targets=help configure
+
##############################
# Functions
##############################
-define fatal-error
+define CheckEnvironment
+ # Find all environment or command line variables that begin with ALT.
+ $(if $(list_alt_overrides),
+ @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
+ @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
+ @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
+ )
+endef
+
+### Functions for timers
+
+# Record starting time for build of a sub repository.
+define RecordStartTime
+ $(MKDIR) -p $(BUILDTIMESDIR)
+ $(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
+ $(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
+endef
+
+# Record ending time and calculate the difference and store it in a
+# easy to read format. Handles builds that cross midnight. Expects
+# that a build will never take 24 hours or more.
+define RecordEndTime
+ $(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
+ $(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
+ $(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
+ $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
+ M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
+ > $(BUILDTIMESDIR)/build_time_diff_$1
+endef
+
+# Find all build_time_* files and print their contents in a list sorted
+# on the name of the sub repository.
+define ReportBuildTimes
+ $(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
+ "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
+endef
+
+define ResetAllTimers
+ $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
+endef
+
+define StartGlobalTimer
+ $(call RecordStartTime,TOTAL)
+endef
+
+define StopGlobalTimer
+ $(call RecordEndTime,TOTAL)
+endef
+
+### Functions for managing makefile structure (start/end of makefile and individual targets)
+
+# Do not indent this function, this will add whitespace at the start which the caller won't handle
+define GetRealTarget
+$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all))
+endef
+
+# Do not indent this function, this will add whitespace at the start which the caller won't handle
+define LastGoal
+$(strip $(lastword $(call GetRealTarget)))
+endef
+
+# Check if the current target is the final target, as specified by
+# the user on the command line. If so, call AtRootMakeEnd.
+define CheckIfMakeAtEnd
+ # Check if the current target is the last goal
+ $(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
+ # If the target is 'foo-only', check if our goal was stated as 'foo'
+ $(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd))
+ # If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too.
+ # At most one of the tests can be true.
+ $(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd)))
+endef
+
+# Hook to be called when starting to execute a top-level target
+define TargetEnter
+ $(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
+ $(call RecordStartTime,$(patsubst %-only,%,$@))
+endef
+
+# Hook to be called when finish executing a top-level target
+define TargetExit
+ $(call RecordEndTime,$(patsubst %-only,%,$@))
+ $(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d " "`"
+ $(call CheckIfMakeAtEnd)
+endef
+
+# Hook to be called as the very first thing when running a normal build
+define AtMakeStart
+ $(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
+ $(call CheckEnvironment)
+ @$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
+ @$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
+ $(call StartGlobalTimer)
+endef
+
+# Hook to be called as the very last thing for targets that are "top level" targets
+define AtMakeEnd
+ $(if $(SJAVAC_SERVER_DIR),@$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
+ $(call StopGlobalTimer)
+ $(call ReportBuildTimes)
+ @$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
+ $(call CheckEnvironment)
+endef
+
+### Functions for parsing and setting up make options from command-line
+
+define FatalError
# If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
- $$(if $$(findstring help,$$(MAKECMDGOALS)),,$$(error Cannot continue))
+ $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
endef
define ParseLogLevel
@@ -80,14 +197,14 @@
ifeq ($$(LOG),warn)
VERBOSE=-s
else ifeq ($$(LOG),info)
- VERBOSE=
+ VERBOSE=-s
else ifeq ($$(LOG),debug)
VERBOSE=
else ifeq ($$(LOG),trace)
- VERBOSE=-d -p
+ VERBOSE=
else
$$(info Error: LOG must be one of: warn, info, debug or trace.)
- $$(eval $$(call fatal-error))
+ $$(eval $$(call FatalError))
endif
else
ifneq ($$(LOG),)
@@ -95,108 +212,84 @@
# but complain if this is the top-level make call.
ifeq ($$(MAKELEVEL),0)
$$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
- $$(eval $$(call fatal-error))
+ $$(eval $$(call FatalError))
endif
endif
endif
endef
-# TODO: Fix duplication in MakeBase.gmk
-define SetupLogging
- ifneq ($(findstring $(LOG),debug trace),)
- # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
- OLD_SHELL:=$$(SHELL)
- SHELL = $$(warning Building $$@$$(if $$<, (from $$<))$(if $$?, ($$? newer)))$$(OLD_SHELL) -x
- endif
-endef
-
define ParseConfAndSpec
- ifneq ($$(origin SPEC),undefined)
- # We have been given a SPEC, check that it works out properly
- ifeq ($$(wildcard $$(SPEC)),)
- $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
- $$(eval $$(call fatal-error))
- endif
- ifneq ($$(origin CONF),undefined)
- # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
- # but complain if this is the top-level make call.
- ifeq ($$(MAKELEVEL),0)
- $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
- $$(eval $$(call fatal-error))
+ ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
+ # If we only have global targets, no need to bother with SPEC or CONF
+ ifneq ($$(origin SPEC),undefined)
+ # We have been given a SPEC, check that it works out properly
+ ifeq ($$(wildcard $$(SPEC)),)
+ $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
+ $$(eval $$(call FatalError))
endif
- endif
- # ... OK, we're satisfied, we'll use this SPEC later on
- else
- # Find all spec.gmk files in the build output directory
- output_dir=$$(root_dir)/build
- all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
- ifeq ($$(all_spec_files),)
- $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
- $$(eval $$(call fatal-error))
- endif
- # Extract the configuration names from the path
- all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
-
- ifneq ($$(origin CONF),undefined)
- # User have given a CONF= argument.
- ifeq ($$(CONF),)
- # If given CONF=, match all configurations
- matching_confs=$$(strip $$(all_confs))
- else
- # Otherwise select those that contain the given CONF string
- matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
- endif
- ifeq ($$(matching_confs),)
- $$(info No configurations found matching CONF=$$(CONF))
- $$(info Available configurations:)
- $$(foreach var,$$(all_confs),$$(info * $$(var)))
- $$(eval $$(call fatal-error))
- else
- ifeq ($$(words $$(matching_confs)),1)
- $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
- else
- $$(info Building the following configurations (matching CONF=$$(CONF)):)
- $$(foreach var,$$(matching_confs),$$(info * $$(var)))
+ ifneq ($$(origin CONF),undefined)
+ # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
+ # but complain if this is the top-level make call.
+ ifeq ($$(MAKELEVEL),0)
+ $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
+ $$(eval $$(call FatalError))
endif
endif
-
- # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
- SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
+ # ... OK, we're satisfied, we'll use this SPEC later on
else
- # No CONF or SPEC given, check the available configurations
- ifneq ($$(words $$(all_spec_files)),1)
- $$(info No CONF or SPEC given, but more than one spec.gmk found in $$(output_dir).)
- $$(info Available configurations:)
- $$(foreach var,$$(all_confs),$$(info * $$(var)))
- $$(info Please retry building with CONF=<config> or SPEC=<specfile>)
- $$(eval $$(call fatal-error))
+ # Find all spec.gmk files in the build output directory
+ output_dir=$$(root_dir)/build
+ all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
+ ifeq ($$(all_spec_files),)
+ $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
+ $$(eval $$(call FatalError))
endif
+ # Extract the configuration names from the path
+ all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
- # We found exactly one configuration, use it
- SPEC=$$(strip $$(all_spec_files))
+ ifneq ($$(origin CONF),undefined)
+ # User have given a CONF= argument.
+ ifeq ($$(CONF),)
+ # If given CONF=, match all configurations
+ matching_confs=$$(strip $$(all_confs))
+ else
+ # Otherwise select those that contain the given CONF string
+ matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
+ endif
+ ifeq ($$(matching_confs),)
+ $$(info No configurations found matching CONF=$$(CONF))
+ $$(info Available configurations:)
+ $$(foreach var,$$(all_confs),$$(info * $$(var)))
+ $$(eval $$(call FatalError))
+ else
+ ifeq ($$(words $$(matching_confs)),1)
+ $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
+ else
+ $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
+ $$(foreach var,$$(matching_confs),$$(info * $$(var)))
+ endif
+ endif
+
+ # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
+ SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
+ else
+ # No CONF or SPEC given, check the available configurations
+ ifneq ($$(words $$(all_spec_files)),1)
+ $$(info No CONF given, but more than one configuration found in $$(output_dir).)
+ $$(info Available configurations:)
+ $$(foreach var,$$(all_confs),$$(info * $$(var)))
+ $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
+ $$(eval $$(call FatalError))
+ endif
+
+ # We found exactly one configuration, use it
+ SPEC=$$(strip $$(all_spec_files))
+ endif
endif
endif
endef
-define CheckEnvironment
- # Find all environment or command line variables that begin with ALT.
- $(if $(list_alt_overrides),
- @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
- @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
- @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
- )
-endef
-
-define PrintStartMessage
- $(if $(VERBOSE),,@$(ECHO) Running make as $(MAKE) $(MFLAGS) $(MAKE_ARGS))
- $(call CheckEnvironment)
- @$(ECHO) "Building OpenJDK for target $(if $(MAKECMDGOALS),'$(MAKECMDGOALS)','all') in configuration '$(CONF_NAME)'"
-endef
-
-define PrintEndMessage
- @$(ECHO) "Finished building OpenJDK for target '$@'"
- $(call CheckEnvironment)
-endef
+### Convenience functions from Main.gmk
# Cleans the component given as $1
define CleanComponent
diff --git a/common/makefiles/Makefile b/common/makefiles/Makefile
index 9672bb4..cd5a9bf 100644
--- a/common/makefiles/Makefile
+++ b/common/makefiles/Makefile
@@ -24,13 +24,24 @@
#
# This must be the first rule
-default: all
+all:
# Inclusion of this pseudo-target will cause make to execute this file
# serially, regardless of -j. Recursively called makefiles will not be
# affected, however. This is required for correct dependency management.
.NOTPARALLEL:
+# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
+# /usr/ccs/bin/make lacks basically every other flow control mechanism.
+TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
+
+# Assume we have GNU make, but check version.
+ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
+ ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
+ $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
+ endif
+endif
+
# Locate this Makefile
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
@@ -43,202 +54,32 @@
include $(dir $(makefile_path))/MakeHelpers.gmk
$(eval $(call ParseLogLevel))
-$(eval $(call SetupLogging))
$(eval $(call ParseConfAndSpec))
-ifneq ($(words $(SPEC)),1)
-### We have multiple configurations to build, call make repeatedly
-all clean dist-clean:
-langtools corba jaxp jaxws hotspot jdk images overlay-images install:
-langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only:
-clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images:
+# Now determine if we have zero, one or several configurations to build.
+ifeq ($(SPEC),)
+ # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
+else
+ ifeq ($(words $(SPEC)),1)
+ # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
+ include $(dir $(makefile_path))/Main.gmk
+ else
+ # We are building multiple configurations.
+ # First, find out the valid targets
+ # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
+ # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+ all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
+ $(MAKE) -p -q -f $(makefile_path) SPEC=$(firstword $(SPEC)) | \
+ grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
+
+$(all_phony_targets):
@$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
-.PHONY: all clean dist-clean
-.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images
-
-else
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
-
-# Now load the spec
-include $(SPEC)
-
-# Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
-
-### Clean up from previous run
-
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
- ifneq (,$(BUILD_LOG_PREVIOUS))
- # Rotate old log
- $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- else
- $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
endif
endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
- $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
-# Clean out any notifications from the previous build.
-$(shell $(FIND) $(OUTPUT_ROOT) -name "_the.*.notify" $(FIND_DELETE))
-
-# Reset the build timers.
-$(eval $(call ResetTimers))
-
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-ifeq ($(JOBS),)
- JOBS=$(NUM_CORES)
-endif
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-
-### Main targets
-
-all: jdk
- @$(if $(SJAVAC_SERVER_DIR),$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
- @$(call AtRootMakeEnd)
-.PHONY: all
-
-langtools: start-make langtools-only
-langtools-only:
- @$(call MakeStart,langtools,all)
- @($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS))
- @$(call MakeFinish,langtools,all)
-
-corba: langtools corba-only
-corba-only:
- @$(call MakeStart,corba,all)
- @($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS))
- @$(call MakeFinish,corba,all)
-
-jaxp: langtools jaxp-only
-jaxp-only:
- @$(call MakeStart,jaxp,all)
- @($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS))
- @$(call MakeFinish,jaxp,all)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only:
- @$(call MakeStart,jaxws,all)
- @($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS))
- @$(call MakeFinish,jaxws,all)
-
-hotspot: langtools hotspot-only
-hotspot-only:
- @$(call MakeStart,hotspot,all)
- @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
- @$(call MakeFinish,hotspot,all)
-
-jdk: langtools corba jaxp jaxws hotspot jdk-only
-jdk-only:
- @$(call MakeStart,jdk,all)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) $(JDK_TARGET))
- @$(call MakeFinish,jdk,all)
-
-images: source-tips start-make jdk langtools corba jaxp jaxws hotspot images-only
-images-only:
- @$(call MakeStart,jdk-images,$@)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) images)
- @$(call MakeFinish,jdk-images,$@)
- @$(if $(SJAVAC_SERVER_DIR),$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
- @$(call AtRootMakeEnd)
-
-overlay-images: source-tips start-make jdk langtools corba jaxp jaxws hotspot overlay-images-only
-overlay-images-only:
- @$(call MakeStart,jdk-overlay-images,$@)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) overlay-images)
- @$(call MakeFinish,jdk-overlay-images,$@)
- @$(if $(SJAVAC_SERVER_DIR),$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
- @$(call AtRootMakeEnd)
-
-install: source-tips start-make jdk langtools corba jaxp jaxws hotspot install-only
-install-only:
- @$(call MakeStart,jdk-images,$@)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) install)
- @$(call MakeFinish,jdk-images,$@)
- @$(if $(SJAVAC_SERVER_DIR),$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
- @$(call AtRootMakeEnd)
-
-docs: start-make jdk docs-only
-docs-only:
- @$(call MakeStart,docs,$@)
- @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
- @$(call MakeFinish,docs,$@)
- @$(if $(SJAVAC_SERVER_DIR),$(RM) -rf $(SJAVAC_SERVER_DIR)/*.port)
- @$(call AtRootMakeEnd)
-
-
-.PHONY: langtools corba jaxp jaxws hotspot jdk images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only install-only
-
-start-make:
- @$(call AtRootMakeStart)
-.PHONY: start-make
-
-bootcycle-images:
- @$(ECHO) Boot cycle build step 1: Building the JDK image normally
- @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
- @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
- @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: start-make
- @$(call MakeStart,test,$(if $(TEST),$(TEST),all))
- @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
- @$(call MakeFinish,test,$(if $(TEST),$(TEST),all))
- @$(call AtRootMakeEnd)
-.PHONY: test
-
-
-# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
-# used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
- @$(MKDIR) -p $(@D)
- @$(RM) $@
- @$(call GetSourceTips)
-
-
-# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-bootcycle-build
- @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log*)
- @$(ECHO) Cleaned everything except the build configuration.
-.PHONY: clean
-
-# Remove everything, you have to rerun configure.
-dist-clean:
- @$(RM) -r $(OUTPUT_ROOT)
- @$(ECHO) Cleaned everything, you will have to re-run configure.
-.PHONY: dist-clean
-
-clean-langtools:
- $(call CleanComponent,langtools)
-clean-corba:
- $(call CleanComponent,corba)
-clean-jaxp:
- $(call CleanComponent,jaxp)
-clean-jaxws:
- $(call CleanComponent,jaxws)
-clean-hotspot:
- $(call CleanComponent,hotspot)
-clean-jdk:
- $(call CleanComponent,jdk)
-clean-images:
- $(call CleanComponent,images)
-clean-bootcycle-build:
- $(call CleanComponent,bootcycle-build)
-
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images
-
-endif
# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the fatal-error macro.
+# If you addd more global targets, please update the variable global_targets in MakeHelpers.
help:
$(info )
@@ -258,7 +99,7 @@
$(info . make test # Run tests, default is all tests (see TEST below))
$(info )
$(info Targets for specific components)
- $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk or images))
+ $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
$(info . make <component> # Build <component> and everything it depends on. )
$(info . make <component>-only # Build <component> only, without dependencies. This)
$(info . # is faster but can result in incorrect build results!)
@@ -272,7 +113,7 @@
$(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>)
$(info . # Available log levels are:)
$(info . # 'warn' (default), 'info', 'debug' and 'trace')
- $(info . # To see executed command lines, use LOG=info)
+ $(info . # To see executed command lines, use LOG=debug)
$(info )
$(info . make JOBS=<n> # Run <n> parallel make jobs)
$(info . # Note that -jN does not work as expected!)
@@ -280,5 +121,11 @@
$(info . make test TEST=<test> # Only run the given test or tests, e.g.)
$(info . # make test TEST="jdk_lang jdk_net")
$(info )
-.PHONY: help
-FRC: # Force target
+
+configure:
+ @$(SHELL) $(root_dir)/configure $(CONFIGURE_ARGS)
+ @echo ====================================================
+ @echo "Note: This is a non-recommended way of running configure."
+ @echo "Instead, run 'sh configure' in the top-level directory"
+
+.PHONY: help configure
diff --git a/common/makefiles/NativeCompilation.gmk b/common/makefiles/NativeCompilation.gmk
index d93af0b..441dfaf 100644
--- a/common/makefiles/NativeCompilation.gmk
+++ b/common/makefiles/NativeCompilation.gmk
@@ -32,10 +32,10 @@
endif
ifeq ($(COMPILER_TYPE),CC)
- COMPILING_MSG=echo Compiling $1
- LINKING_MSG=echo Linking $1
- LINKING_EXE_MSG=echo Linking executable $1
- ARCHIVING_MSG=echo Archiving $1
+ COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
+ LINKING_MSG=echo $(LOG_INFO) "Linking $1"
+ LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
+ ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
else
COMPILING_MSG=
LINKING_MSG=
@@ -94,7 +94,7 @@
$$($1_$2_OBJ) : $2
ifeq ($(COMPILER_TYPE),CC)
- $$(call COMPILING_MSG,$$(notdir $2))
+ $$(call COMPILING_MSG,$2,$$($1_TARGET))
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
endif
ifeq ($(COMPILER_TYPE),CL)
@@ -129,30 +129,8 @@
# CC the compiler to use, default is $(CC)
# LDEXE the linker to use for linking executables, default is $(LDEXE)
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
- $(if $2,$1_$(strip $2))
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$1_$(strip $(10)))
- $(if $(11),$1_$(strip $(11)))
- $(if $(12),$1_$(strip $(12)))
- $(if $(13),$1_$(strip $(13)))
- $(if $(14),$1_$(strip $(14)))
- $(if $(15),$1_$(strip $(15)))
- $(if $(16),$1_$(strip $(16)))
- $(if $(17),$1_$(strip $(17)))
- $(if $(18),$1_$(strip $(18)))
- $(if $(19),$1_$(strip $(19)))
- $(if $(20),$1_$(strip $(20)))
- $(if $(21),$1_$(strip $(21)))
- $(if $(22),$1_$(strip $(22)))
- $(if $(23),$1_$(strip $(23)))
- $(if $(24),$1_$(strip $(24)))
- $(if $(25),$1_$(strip $(25)))
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25))
$(if $(26),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
ifneq (,$$($1_BIN))
@@ -236,9 +214,9 @@
$$(error You have to specify LANG for native compilation $1)
endif
ifeq (C,$$($1_LANG))
- ifeq ($$($1_LDEXE),)
+ ifeq ($$($1_LDEXE),)
$1_LDEXE:=$(LDEXE)
- endif
+ endif
$1_LD:=$(LD)
else
ifeq (C++,$$($1_LANG))
@@ -254,9 +232,11 @@
endif
# Make sure the dirs exist.
- $$(shell $(MKDIR) -p $$($1_SRC) $$($1_OBJECT_DIR) $$($1_OUTPUT_DIR))
+ $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
+ $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
+
# Find all files in the source trees. Sort to remove duplicates.
- $1_ALL_SRCS := $$(sort $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f)))
+ $1_ALL_SRCS := $$(sort $$(shell $(FIND) $$($1_SRC) -type f))
# Extract the C/C++ files.
$1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
@@ -291,7 +271,9 @@
# Are there too many object files on disk? Perhaps because some source file was removed?
$1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
# Clean out the superfluous object files.
- $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
+ ifneq ($$($1_SUPERFLUOUS_OBJS),)
+ $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
+ endif
# Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
$1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
@@ -358,11 +340,6 @@
$$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
endif
- # Now create a list of the packages that are about to compile. Used when sending source
- # in a batch to the compiler.
- $$(shell $(RM) $$($1_OBJECT_DIR)/_the.list_of_sources)
- $$(eval $$(call ListPathsSafelyNow,$1_SRCS,\n, >> $$($1_OBJECT_DIR)/_the.list_of_sources))
-
# Now call add_native_source for each source file we are going to compile.
$$(foreach p,$$($1_SRCS),\
$$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR),\
@@ -385,8 +362,6 @@
endif
# mapfile doesnt seem to be implemented on macosx (yet??)
- ifneq ($(OPENJDK_TARGET_CPU),ppc)
- ifneq ($(OPENJDK_TARGET_CPU),arm)
ifneq ($(OPENJDK_TARGET_OS),macosx)
ifneq ($(OPENJDK_TARGET_OS),windows)
$1_REAL_MAPFILE:=$$($1_MAPFILE)
@@ -401,8 +376,6 @@
endif
endif
endif
- endif
- endif
# Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
# for LDFLAGS and LDFLAGS_SUFFIX
@@ -445,9 +418,9 @@
$$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
$(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
$(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $$(@F) $$<
+ $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
else # not solaris
$$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
$(RM) $$@
@@ -523,9 +496,9 @@
$$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
$(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $$<
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
$(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $$(@F) $$<
+ $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
else # not solaris
$$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
$(RM) $$@
@@ -564,7 +537,7 @@
$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
$$($1_EXTRA_LDFLAGS_SUFFIX)
ifneq (,$$($1_GEN_MANIFEST))
- $(MT) -nologo /manifest $$($1_GEN_MANIFEST) /outputresource:$$@;#1
+ $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
endif
endif
diff --git a/common/makefiles/RMICompilation.gmk b/common/makefiles/RMICompilation.gmk
index 65ba9e6..fd332b4 100644
--- a/common/makefiles/RMICompilation.gmk
+++ b/common/makefiles/RMICompilation.gmk
@@ -34,16 +34,9 @@
# RUN_IIOP:=Set to run rmic with -iiop
# RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
# KEEP_GENERATED:=Set to keep generated sources around
- $(if $2,$1_$(strip $2))
- $(if $3,$1_$(strip $3))
- $(if $4,$1_$(strip $4))
- $(if $5,$1_$(strip $5))
- $(if $6,$1_$(strip $6))
- $(if $7,$1_$(strip $7))
- $(if $8,$1_$(strip $8))
- $(if $9,$1_$(strip $9))
- $(if $(10),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
-
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
$1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/$1_rmic
@@ -86,12 +79,12 @@
$$($1_DEP_FILE): $$($1_CLASS_FILES)
$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
if [ "x$$($1_ARGS)" != "x" ]; then \
- $(ECHO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) &&\
+ $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) &&\
$(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
-d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
fi;
if [ "x$$($1_ARGS2)" != "x" ]; then \
- $(ECHO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) &&\
+ $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) &&\
$(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
-d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
fi;
diff --git a/common/makefiles/compress.post b/common/makefiles/support/ListPathsSafely-post-compress.incl
similarity index 97%
rename from common/makefiles/compress.post
rename to common/makefiles/support/ListPathsSafely-post-compress.incl
index 06b44c4..d8ccf22 100644
--- a/common/makefiles/compress.post
+++ b/common/makefiles/support/ListPathsSafely-post-compress.incl
@@ -1 +1 @@
-))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
\ No newline at end of file
+))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
diff --git a/common/makefiles/compress.pre b/common/makefiles/support/ListPathsSafely-pre-compress.incl
similarity index 99%
rename from common/makefiles/compress.pre
rename to common/makefiles/support/ListPathsSafely-pre-compress.incl
index ff41134..7230c6c 100644
--- a/common/makefiles/compress.pre
+++ b/common/makefiles/support/ListPathsSafely-pre-compress.incl
@@ -1 +1 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
\ No newline at end of file
+$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
diff --git a/common/makefiles/uncompress.sed b/common/makefiles/support/ListPathsSafely-uncompress.sed
similarity index 100%
rename from common/makefiles/uncompress.sed
rename to common/makefiles/support/ListPathsSafely-uncompress.sed
diff --git a/common/bin/unicode2x.sed b/common/makefiles/support/unicode2x.sed
similarity index 100%
rename from common/bin/unicode2x.sed
rename to common/makefiles/support/unicode2x.sed
diff --git a/common/src/uncygdrive.c b/common/src/fixpath.c
similarity index 66%
rename from common/src/uncygdrive.c
rename to common/src/fixpath.c
index 438e214..835f6b7 100644
--- a/common/src/uncygdrive.c
+++ b/common/src/fixpath.c
@@ -58,7 +58,7 @@
* Works in place since drive letter is always
* shorter than /cygdrive/
*/
-char *replace_cygdrive(char *in)
+char *replace_cygdrive_cygwin(char *in)
{
int len = strlen(in);
char *out = malloc(len+1);
@@ -119,6 +119,61 @@
return out;
}
+char* msys_path_list; // @-separated list of paths prefix to look for
+char* msys_path_list_end; // Points to last \0 in msys_path_list.
+
+void setup_msys_path_list(char* argument)
+{
+ char* p;
+ char* drive_letter_pos;
+
+ msys_path_list = strdup(&argument[2]);
+ msys_path_list_end = &msys_path_list[strlen(msys_path_list)];
+
+ // Convert all at-sign (@) in path list to \0.
+ // @ was chosen as separator to minimize risk of other tools messing around with it
+ p = msys_path_list;
+ do {
+ if (p[1] == ':') {
+ // msys has mangled our path list, restore it from c:/... to /c/...
+ drive_letter_pos = p+1;
+ *drive_letter_pos = *p;
+ *p = '/';
+ }
+
+ // Look for an @ in the list
+ p = strchr(p, '@');
+ if (p != NULL) {
+ *p = '\0';
+ p++;
+ }
+ } while (p != NULL);
+}
+
+char *replace_cygdrive_msys(char *in)
+{
+ char* str;
+ char* prefix;
+ char* p;
+
+ str = strdup(in);
+
+ // For each prefix in the path list, search for it and replace /c/... with c:/...
+ for (prefix = msys_path_list; prefix < msys_path_list_end && prefix != NULL; prefix += strlen(prefix)+1) {
+ p=str;
+ while ((p = strstr(p, prefix))) {
+ char* drive_letter = p+1;
+ *p = *drive_letter;
+ *drive_letter = ':';
+ p++;
+ }
+ }
+
+ return str;
+}
+
+char*(*replace_cygdrive)(char *in) = NULL;
+
char *files_to_delete[1024];
int num_files_to_delete = 0;
@@ -158,7 +213,7 @@
atout = fopen(name, "w");
if (atout == NULL) {
- fprintf(stderr, "Could open temporary file for writing! %s\n", name);
+ fprintf(stderr, "Could not open temporary file for writing! %s\n", name);
exit(-1);
}
@@ -167,7 +222,13 @@
append(&buffer, &buflen, &used, block, blocklen);
}
buffer[used] = 0;
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "fixpath input from @-file %s: %s\n", &in[1], buffer);
+ }
fixed = replace_cygdrive(buffer);
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "fixpath converted to @-file %s is: %s\n", name, fixed);
+ }
fwrite(fixed, strlen(fixed), 1, atout);
fclose(atin);
fclose(atout);
@@ -194,12 +255,31 @@
int i;
DWORD exitCode;
- if (argc<2) {
- fprintf(stderr, "Usage: uncygdrive.exe /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt");
+ if (argc<3 || argv[1][0] != '-' || (argv[1][1] != 'c' && argv[1][1] != 'm')) {
+ fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt");
exit(0);
}
- line = replace_cygdrive(strstr(GetCommandLine(), argv[1]));
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "fixpath input line >%s<\n", strstr(GetCommandLine(), argv[1]));
+ }
+
+ if (argv[1][1] == 'c' && argv[1][2] == '\0') {
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "using cygwin mode\n");
+ }
+ replace_cygdrive = replace_cygdrive_cygwin;
+ } else if (argv[1][1] == 'm') {
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "using msys mode, with path list: %s\n", &argv[1][2]);
+ }
+ setup_msys_path_list(argv[1]);
+ replace_cygdrive = replace_cygdrive_msys;
+ } else {
+ fprintf(stderr, "Unknown mode: %s\n", argv[1]);
+ exit(-1);
+ }
+ line = replace_cygdrive(strstr(GetCommandLine(), argv[2]));
for (i=1; i<argc; ++i) {
if (argv[i][0] == '@') {
@@ -210,8 +290,8 @@
}
}
- if (getenv("DEBUG_UNCYGDRIVE") != NULL) {
- fprintf(stderr, "uncygdrive >%s<\n", line);
+ if (getenv("DEBUG_FIXPATH") != NULL) {
+ fprintf(stderr, "fixpath converted line >%s<\n", line);
}
ZeroMemory(&si,sizeof(si));
@@ -238,9 +318,9 @@
WaitForSingleObject(pi.hProcess,INFINITE);
GetExitCodeProcess(pi.hProcess,&exitCode);
- if (getenv("DEBUG_UNCYGDRIVE") != NULL) {
+ if (getenv("DEBUG_FIXPATH") != NULL) {
for (i=0; i<num_files_to_delete; ++i) {
- fprintf(stderr, "Not deleting temporary uncygdrive file %s\n",
+ fprintf(stderr, "Not deleting temporary fixpath file %s\n",
files_to_delete[i]);
}
}
diff --git a/configure b/configure
new file mode 100644
index 0000000..dbb1da1
--- /dev/null
+++ b/configure
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 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.
+#
+# 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 is a thin wrapper which will call the real configure script, and
+# make sure that is called using bash.
+
+this_script_dir=`dirname $0`
+bash $this_script_dir/common/autoconf/configure "$@"
diff --git a/corba/.hgtags b/corba/.hgtags
index 68fb974..112110c 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -183,3 +183,4 @@
d54dc53e223ed9ce7d5f4d2cd02ad9d5def3c2db jdk8-b59
207ef43ba69ead6cbbab415d81834545e4d46747 jdk8-b60
0e08ba7648fb3faa0986cb217887d7c4990977f3 jdk8-b61
+08afb9c6f44f11c3595b01fd0985db64b29834dd jdk8-b62
diff --git a/corba/make/common/Defs-bsd.gmk b/corba/make/common/Defs-bsd.gmk
index 44b5011..99b3737 100644
--- a/corba/make/common/Defs-bsd.gmk
+++ b/corba/make/common/Defs-bsd.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
diff --git a/corba/make/common/internal/Resources.gmk b/corba/make/common/internal/Resources.gmk
index d9bc99b..e7ccb1b 100644
--- a/corba/make/common/internal/Resources.gmk
+++ b/corba/make/common/internal/Resources.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
diff --git a/corba/make/common/shared/Defs-bsd.gmk b/corba/make/common/shared/Defs-bsd.gmk
index 2869149..2d48947 100644
--- a/corba/make/common/shared/Defs-bsd.gmk
+++ b/corba/make/common/shared/Defs-bsd.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
diff --git a/corba/make/common/shared/Defs-utils.gmk b/corba/make/common/shared/Defs-utils.gmk
index 1de3dde..00fab5b 100644
--- a/corba/make/common/shared/Defs-utils.gmk
+++ b/corba/make/common/shared/Defs-utils.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
diff --git a/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java b/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java
index 4ff1ca1..b5c7ecb 100644
--- a/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java
+++ b/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
diff --git a/corba/make/tools/strip_properties/Makefile b/corba/make/tools/strip_properties/Makefile
index 75eb2f1..e74d44c 100644
--- a/corba/make/tools/strip_properties/Makefile
+++ b/corba/make/tools/strip_properties/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
diff --git a/corba/makefiles/BuildCorba.gmk b/corba/makefiles/BuildCorba.gmk
new file mode 100644
index 0000000..246c5b9
--- /dev/null
+++ b/corba/makefiles/BuildCorba.gmk
@@ -0,0 +1,253 @@
+#
+# Copyright (c) 2007, 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.
+#
+
+#
+# Makefile for building the corba workspace.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include IdlCompilation.gmk
+
+JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+# The Corba sources are old and generates a LOT of warnings.
+# Disable these using Xlint, until someone cares to fix them.
+DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
+
+# The "generate old bytecode" javac setup uses the new compiler to compile for the
+# boot jdk to generate tools that need to be run with the boot jdk.
+# Thus we force the target bytecode to the boot jdk bytecode.
+$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
+ JVM:=$(JAVA),\
+ JAVAC:=$(JAVAC_JARS),\
+ FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+# The "generate new bytecode" uses the new compiler to generate bytecode
+# for the new jdk that is being built. The code compiled by this setup
+# cannot necessarily be run with the boot jdk.
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
+ JVM:=$(JAVA),\
+ JAVAC:=$(JAVAC_JARS),\
+ FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\
+ SETUP:=GENERATE_OLDBYTECODE,\
+ SRC:=$(CORBA_TOPDIR)/make/tools/src,\
+ BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
+
+$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\
+ SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\
+ JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\
+ JARMAIN:=build.tools.stripproperties.StripPropertiesCorba))
+
+$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\
+ SETUP:=GENERATE_OLDBYTECODE,\
+ SRC:=$(CORBA_TOPDIR)/src/share/classes,\
+ BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
+ COPY:=.prp,\
+ INCLUDES:=com/sun/tools/corba/se/idl,\
+ EXCLUDE_FILES:=ResourceBundleUtil.java))
+
+$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\
+ SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
+ SUFFIXES:=.class .prp,\
+ JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
+ JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile))
+
+$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\
+ SETUP:=GENERATE_OLDBYTECODE,\
+ SRC:=$(CORBA_TOPDIR)/src/share/classes,\
+ BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
+ INCLUDES:=com/sun/tools/corba/se/logutil))
+
+$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\
+ SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
+ JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\
+ JARMAIN:=com.sun.tools.corba.se.logutil.MC))
+
+# Generate LogWrapper classes
+$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
+ $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+ $(CORBA_OUTPUTDIR)/btjars/logutil.jar
+ $(MKDIR) -p $(@D)
+ $(RM) -f $(@D)/_the_wrappers.d
+ $(ECHO) $(LOG_INFO) Generating class file from $*.mc
+ $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
+
+# Generate LogWrapper properties file by concatening resource files
+$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
+ $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
+ $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
+ $(MKDIR) -p $(@D)
+ $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F)
+ $(CAT) $^ > $@
+
+# The resources files are generated from lisp-like .mc files.
+$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
+ $(MKDIR) -p $(@D)
+ $(RM) -f $(@D)/_the_wrappers.d
+ $(ECHO) $(LOG_INFO) Generating resource file from $*.mc
+ $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
+
+
+$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
+ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
+ $(MKDIR) -p $(@D)
+ $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@
+
+# Trigger the generation of the logwrappers. After the logwrapper classes and
+# resources have been created, then the makefile will restart and the newly
+# created java files will become part of the build further along in the makefile.
+-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
+
+ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
+ $(eval $(call SetupIdlCompilation,BUILD_IDLS,\
+ IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
+ SRC:=$(CORBA_TOPDIR)/src/share/classes,\
+ BIN:=$(CORBA_OUTPUTDIR)/gensrc,\
+ EXCLUDES:=com/sun/tools/corba/se/idl/% \
+ org/omg/CORBA/% \
+ com/sun/corba/se/GiopIDL/% \
+ org/omg/PortableServer/corba.idl,\
+ INCLUDES:=%,\
+ OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \
+ com/sun/corba/se/spi/activation/activation.idl,\
+ DELETES:=DYNANYDELETEFILES org/omg/DynamicAny/*POA* org/omg/DynamicAny/*Holder* org/omg/DynamicAny/DynValueBoxHelper.java org/omg/DynamicAny/DynValueCommonHelper.java org/omg/DynamicAny/_DynValueCommonStub.java org/omg/DynamicAny/_DynValueBoxStub.java org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java IOPDELETEFILES org/omg/IOP/BI_DIR_IIOP.java org/omg/IOP/ChainBypassCheck.java org/omg/IOP/ChainBypassInfo.java org/omg/IOP/FORWARDED_IDENTITY.java org/omg/IOP/INVOCATION_POLICIES.java org/omg/IOP/LogicalThreadId.java org/omg/IOP/SendingContextRunTime.java org/omg/IOP/UnknownExceptionInfo.java org/omg/IOP/TaggedComponentSeqHolder.java POAHELHOLFILES org/omg/PortableServer/CurrentPackage/NoContextHolder.java org/omg/PortableServer/ForwardRequestHolder.java org/omg/PortableServer/IdAssignmentPolicyValueHelper.java org/omg/PortableServer/IdAssignmentPolicyValueHolder.java org/omg/PortableServer/IdUniquenessPolicyValueHelper.java org/omg/PortableServer/IdUniquenessPolicyValueHolder.java org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java org/omg/PortableServer/LifespanPolicyValueHelper.java org/omg/PortableServer/LifespanPolicyValueHolder.java org/omg/PortableServer/ServantRetentionPolicyValueHelper.java org/omg/PortableServer/ServantRetentionPolicyValueHolder.java org/omg/PortableServer/ObjectIdHelper.java org/omg/PortableServer/ObjectIdHolder.java org/omg/PortableServer/POAListHelper.java org/omg/PortableServer/POAListHolder.java org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java org/omg/PortableServer/POAManagerPackage/StateHelper.java org/omg/PortableServer/POAManagerPackage/StateHolder.java org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java org/omg/PortableServer/POAPackage/NoServantHolder.java org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java org/omg/PortableServer/POAPackage/WrongAdapterHolder.java org/omg/PortableServer/POAPackage/WrongPolicyHolder.java org/omg/PortableServer/RequestProcessingPolicyValueHelper.java org/omg/PortableServer/RequestProcessingPolicyValueHolder.java org/omg/PortableServer/ServantActivatorHolder.java org/omg/PortableServer/ServantLocatorHolder.java org/omg/PortableServer/ThreadPolicyValueHelper.java org/omg/PortableServer/ThreadPolicyValueHolder.java PIHELHOLFILES org/omg/PortableInterceptor/ClientRequestInfoHelper.java org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java org/omg/PortableInterceptor/IORInfoHelper.java org/omg/PortableInterceptor/IORInterceptorHelper.java org/omg/PortableInterceptor/InterceptorHelper.java org/omg/PortableInterceptor/ORBInitInfoHelper.java org/omg/PortableInterceptor/ORBInitializerHelper.java org/omg/PortableInterceptor/PolicyFactoryHelper.java org/omg/PortableInterceptor/ReplyStatusHelper.java org/omg/PortableInterceptor/RequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java org/omg/PortableInterceptor/SlotIdHelper.java org/omg/PortableInterceptor/ClientRequestInfoHolder.java org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java org/omg/PortableInterceptor/CurrentHolder.java org/omg/PortableInterceptor/ForwardRequestHolder.java org/omg/PortableInterceptor/IORInfoHolder.java org/omg/PortableInterceptor/IORInterceptorHolder.java org/omg/PortableInterceptor/InterceptorHolder.java org/omg/PortableInterceptor/InvalidSlotHolder.java org/omg/PortableInterceptor/ORBInitInfoHolder.java org/omg/PortableInterceptor/ORBInitializerHolder.java org/omg/PortableInterceptor/PolicyFactoryHolder.java org/omg/PortableInterceptor/RequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java org/omg/PortableInterceptor/TaggedComponentSeqHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java org/omg/IOP/CodecPackage/FormatMismatchHolder.java org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java org/omg/IOP/CodecPackage/TypeMismatchHolder.java org/omg/IOP/CodecHelper.java org/omg/IOP/EncodingFormatHelper.java org/omg/IOP/EncodingHelper.java org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java org/omg/IOP/CodecFactoryHolder.java org/omg/IOP/CodecHolder.java org/omg/IOP/EncodingHolder.java org/omg/IOP/TaggedComponentSeqHelper.java org/omg/Dynamic/ContextListHelper.java org/omg/Dynamic/ExceptionListHelper.java org/omg/Dynamic/ParameterHolder.java org/omg/Dynamic/ParameterListHolder.java org/omg/Dynamic/ExceptionListHolder.java org/omg/Dynamic/ParameterHelper.java org/omg/Dynamic/ParameterListHelper.java org/omg/Dynamic/RequestContextHelper.java CORBAX org/omg/CORBA/OctetSeqHelper.java org/omg/CORBA/OctetSeqHolder.java org/omg/CORBA/PolicyError.java org/omg/CORBA/RepositoryIdHelper.java))
+
+ $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
+
+ $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
+ $(MKDIR) -p $(@D)
+ $(ECHO) IDLS_ARE_CREATED=yes > $@
+
+ -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
+
+ ifeq ($(IDLS_ARE_CREATED),yes)
+ $(eval $(call SetupJavaCompilation,BUILD_CORBA,\
+ SETUP:=GENERATE_NEWBYTECODE,\
+ SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
+ EXCLUDES:=com/sun/corba/se/PortableActivationIDL\
+ com/sun/tools/corba/se/logutil,\
+ EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
+ com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
+ com/sun/org/omg/CORBA/IDLTypeOperations.java \
+ com/sun/org/omg/CORBA/IRObjectOperations.java \
+ org/omg/PortableInterceptor/UNKNOWN.java \
+ com/sun/tools/corba/se/idl/ResourceBundleUtil.java\
+ com/sun/corba/se/impl/presentation/rmi/jndi.properties,\
+ COPY:=.prp LogStrings.properties,\
+ BIN:=$(CORBA_OUTPUTDIR)/classes))
+
+ # Separate src.zip call to include sources that were excluded in the build to
+ # mimic behavior in old build system.
+ $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\
+ SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
+ ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip))
+
+ $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
+
+ # Run stripproperties on all sunorb resource files.
+ STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
+ STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\
+ $(STRIP_PROP_SRC_FILES))
+ # Simple delivery of zh_HK properties files just copies zh_TW properties files
+ STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\
+ $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\
+ $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
+ STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
+ STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\
+ $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \
+ $(addprefix _SPACE_,$(STRIP_PROP_FILES))))
+
+ $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
+ $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
+ $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
+ $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
+ $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
+ @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
+ $(TOUCH) $@
+
+ $(eval $(call SetupArchive,ARCHIVE_CORBA,\
+ $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\
+ SRCS:=$(CORBA_OUTPUTDIR)/classes,\
+ SUFFIXES:=.class .prp .properties,\
+ JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
+
+ # The created classes.jar now contains Corba compiled to run on the target JDK
+ # and is ready for inclusion in jdk rt.jar.
+
+ # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
+ # and is ready for inclusion into the jdk src.zip
+
+ BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
+ $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
+
+ $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
+ $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
+ $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
+ $(RM) -f $@
+ $(ECHO) Creating `basename $@`
+ $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
+ $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
+ (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
+
+ # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
+
+ all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
+ $(CORBA_OUTPUTDIR)/btjars/idlj.jar \
+ $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+ $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
+ $(CORBA_OUTPUTDIR)/dist/lib/src.zip \
+ $(CORBA_OUTPUTDIR)/dist/lib/bin.zip
+ endif
+endif
+
+clean:
+ $(RM) -rf $(CORBA_OUTPUTDIR)
+
+.PHONY: default all clean clobber
diff --git a/corba/makefiles/Makefile b/corba/makefiles/Makefile
index ee07ded..9539fe0 100644
--- a/corba/makefiles/Makefile
+++ b/corba/makefiles/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,231 +23,27 @@
# questions.
#
-#
-# Makefile for building the corba workspace.
-#
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
-# This must be the first rule
-default: all
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include IdlCompilation.gmk
-
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-# The Corba sources are old and generates a LOT of warnings.
-# Disable these using Xlint, until someone cares to fix them.
-DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
-
-# The "generate old bytecode" javac setup uses the new compiler to compile for the
-# boot jdk to generate tools that need to be run with the boot jdk.
-# Thus we force the target bytecode to the boot jdk bytecode.
-$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
- JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
-
-# The "generate new bytecode" uses the new compiler to generate bytecode
-# for the new jdk that is being built. The code compiled by this setup
-# cannot necessarily be run with the boot jdk.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
- JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
-
-$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\
- SETUP:=GENERATE_OLDBYTECODE,\
- SRC:=$(CORBA_TOPDIR)/make/tools/src,\
- BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
-
-$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\
- SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\
- JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\
- JARMAIN:=build.tools.stripproperties.StripPropertiesCorba))
-
-$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\
- SETUP:=GENERATE_OLDBYTECODE,\
- SRC:=$(CORBA_TOPDIR)/src/share/classes,\
- BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
- COPY:=.prp,\
- INCLUDES:=com/sun/tools/corba/se/idl,\
- EXCLUDE_FILES:=ResourceBundleUtil.java))
-
-$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\
- SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
- SUFFIXES:=.class .prp,\
- JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
- JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile))
-
-$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\
- SETUP:=GENERATE_OLDBYTECODE,\
- SRC:=$(CORBA_TOPDIR)/src/share/classes,\
- BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
- INCLUDES:=com/sun/tools/corba/se/logutil))
-
-$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\
- SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
- JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\
- JARMAIN:=com.sun.tools.corba.se.logutil.MC))
-
-# Generate LogWrapper classes
-$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
- $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
- $(CORBA_OUTPUTDIR)/btjars/logutil.jar
- $(MKDIR) -p $(@D)
- $(RM) -f $(@D)/_the_wrappers.d
- $(ECHO) Generating class file from $*.mc
- $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
-
-# Generate LogWrapper properties file by concatening resource files
-$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
- $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
- $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
- $(MKDIR) -p $(@D)
- $(ECHO) Concatenating 8 resource files into $(@F)
- $(CAT) $^ > $@
-
-# The resources files are generated from lisp-like .mc files.
-$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
- $(MKDIR) -p $(@D)
- $(RM) -f $(@D)/_the_wrappers.d
- $(ECHO) Generating resource file from $*.mc
- $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
-
-
-$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
- $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
- $(MKDIR) -p $(@D)
- $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@
-
-# Trigger the generation of the logwrappers. After the logwrapper classes and
-# resources have been created, then the makefile will restart and the newly
-# created java files will become part of the build further along in the makefile.
--include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
-
-ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
- $(eval $(call SetupIdlCompilation,BUILD_IDLS,\
- IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
- SRC:=$(CORBA_TOPDIR)/src/share/classes,\
- BIN:=$(CORBA_OUTPUTDIR)/gensrc,\
- EXCLUDES:=com/sun/tools/corba/se/idl/% \
- org/omg/CORBA/% \
- com/sun/corba/se/GiopIDL/% \
- org/omg/PortableServer/corba.idl,\
- INCLUDES:=%,\
- OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \
- com/sun/corba/se/spi/activation/activation.idl,\
- DELETES:=DYNANYDELETEFILES org/omg/DynamicAny/*POA* org/omg/DynamicAny/*Holder* org/omg/DynamicAny/DynValueBoxHelper.java org/omg/DynamicAny/DynValueCommonHelper.java org/omg/DynamicAny/_DynValueCommonStub.java org/omg/DynamicAny/_DynValueBoxStub.java org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java IOPDELETEFILES org/omg/IOP/BI_DIR_IIOP.java org/omg/IOP/ChainBypassCheck.java org/omg/IOP/ChainBypassInfo.java org/omg/IOP/FORWARDED_IDENTITY.java org/omg/IOP/INVOCATION_POLICIES.java org/omg/IOP/LogicalThreadId.java org/omg/IOP/SendingContextRunTime.java org/omg/IOP/UnknownExceptionInfo.java org/omg/IOP/TaggedComponentSeqHolder.java POAHELHOLFILES org/omg/PortableServer/CurrentPackage/NoContextHolder.java org/omg/PortableServer/ForwardRequestHolder.java org/omg/PortableServer/IdAssignmentPolicyValueHelper.java org/omg/PortableServer/IdAssignmentPolicyValueHolder.java org/omg/PortableServer/IdUniquenessPolicyValueHelper.java org/omg/PortableServer/IdUniquenessPolicyValueHolder.java org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java org/omg/PortableServer/LifespanPolicyValueHelper.java org/omg/PortableServer/LifespanPolicyValueHolder.java org/omg/PortableServer/ServantRetentionPolicyValueHelper.java org/omg/PortableServer/ServantRetentionPolicyValueHolder.java org/omg/PortableServer/ObjectIdHelper.java org/omg/PortableServer/ObjectIdHolder.java org/omg/PortableServer/POAListHelper.java org/omg/PortableServer/POAListHolder.java org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java org/omg/PortableServer/POAManagerPackage/StateHelper.java org/omg/PortableServer/POAManagerPackage/StateHolder.java org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java org/omg/PortableServer/POAPackage/NoServantHolder.java org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java org/omg/PortableServer/POAPackage/WrongAdapterHolder.java org/omg/PortableServer/POAPackage/WrongPolicyHolder.java org/omg/PortableServer/RequestProcessingPolicyValueHelper.java org/omg/PortableServer/RequestProcessingPolicyValueHolder.java org/omg/PortableServer/ServantActivatorHolder.java org/omg/PortableServer/ServantLocatorHolder.java org/omg/PortableServer/ThreadPolicyValueHelper.java org/omg/PortableServer/ThreadPolicyValueHolder.java PIHELHOLFILES org/omg/PortableInterceptor/ClientRequestInfoHelper.java org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java org/omg/PortableInterceptor/IORInfoHelper.java org/omg/PortableInterceptor/IORInterceptorHelper.java org/omg/PortableInterceptor/InterceptorHelper.java org/omg/PortableInterceptor/ORBInitInfoHelper.java org/omg/PortableInterceptor/ORBInitializerHelper.java org/omg/PortableInterceptor/PolicyFactoryHelper.java org/omg/PortableInterceptor/ReplyStatusHelper.java org/omg/PortableInterceptor/RequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java org/omg/PortableInterceptor/SlotIdHelper.java org/omg/PortableInterceptor/ClientRequestInfoHolder.java org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java org/omg/PortableInterceptor/CurrentHolder.java org/omg/PortableInterceptor/ForwardRequestHolder.java org/omg/PortableInterceptor/IORInfoHolder.java org/omg/PortableInterceptor/IORInterceptorHolder.java org/omg/PortableInterceptor/InterceptorHolder.java org/omg/PortableInterceptor/InvalidSlotHolder.java org/omg/PortableInterceptor/ORBInitInfoHolder.java org/omg/PortableInterceptor/ORBInitializerHolder.java org/omg/PortableInterceptor/PolicyFactoryHolder.java org/omg/PortableInterceptor/RequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java org/omg/PortableInterceptor/TaggedComponentSeqHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java org/omg/IOP/CodecPackage/FormatMismatchHolder.java org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java org/omg/IOP/CodecPackage/TypeMismatchHolder.java org/omg/IOP/CodecHelper.java org/omg/IOP/EncodingFormatHelper.java org/omg/IOP/EncodingHelper.java org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java org/omg/IOP/CodecFactoryHolder.java org/omg/IOP/CodecHolder.java org/omg/IOP/EncodingHolder.java org/omg/IOP/TaggedComponentSeqHelper.java org/omg/Dynamic/ContextListHelper.java org/omg/Dynamic/ExceptionListHelper.java org/omg/Dynamic/ParameterHolder.java org/omg/Dynamic/ParameterListHolder.java org/omg/Dynamic/ExceptionListHolder.java org/omg/Dynamic/ParameterHelper.java org/omg/Dynamic/ParameterListHelper.java org/omg/Dynamic/RequestContextHelper.java CORBAX org/omg/CORBA/OctetSeqHelper.java org/omg/CORBA/OctetSeqHolder.java org/omg/CORBA/PolicyError.java org/omg/CORBA/RepositoryIdHelper.java))
-
- $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
-
- $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
- $(MKDIR) -p $(@D)
- $(ECHO) IDLS_ARE_CREATED=yes > $@
-
- -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
-
- ifeq ($(IDLS_ARE_CREATED),yes)
- $(eval $(call SetupJavaCompilation,BUILD_CORBA,\
- SETUP:=GENERATE_NEWBYTECODE,\
- SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
- EXCLUDES:=com/sun/corba/se/PortableActivationIDL\
- com/sun/tools/corba/se/logutil,\
- EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
- com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
- com/sun/org/omg/CORBA/IDLTypeOperations.java \
- com/sun/org/omg/CORBA/IRObjectOperations.java \
- org/omg/PortableInterceptor/UNKNOWN.java \
- com/sun/tools/corba/se/idl/ResourceBundleUtil.java\
- com/sun/corba/se/impl/presentation/rmi/jndi.properties,\
- COPY:=.prp LogStrings.properties,\
- BIN:=$(CORBA_OUTPUTDIR)/classes))
-
- # Separate src.zip call to include sources that were excluded in the build to
- # mimic behavior in old build system.
- $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\
- SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
- ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip))
-
- $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
-
- # Run stripproperties on all sunorb resource files.
- STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
- STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\
- $(STRIP_PROP_SRC_FILES))
- # Simple delivery of zh_HK properties files just copies zh_TW properties files
- STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\
- $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\
- $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
- STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
- STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\
- $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \
- $(addprefix _SPACE_,$(STRIP_PROP_FILES))))
-
- $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
- $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
- $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
- $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
- $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
- @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
- $(TOUCH) $@
-
- $(eval $(call SetupArchive,ARCHIVE_CORBA,\
- $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\
- SRCS:=$(CORBA_OUTPUTDIR)/classes,\
- SUFFIXES:=.class .prp .properties,\
- JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
-
- # The created classes.jar now contains Corba compiled to run on the target JDK
- # and is ready for inclusion in jdk rt.jar.
-
- # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
- # and is ready for inclusion into the jdk src.zip
-
- BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
- $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
-
- $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
- $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
- $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
- $(RM) -f $@
- $(ECHO) Creating `basename $@`
- $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
- $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
- (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
-
- # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
-
- all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
- $(CORBA_OUTPUTDIR)/btjars/idlj.jar \
- $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
- $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
- $(CORBA_OUTPUTDIR)/dist/lib/src.zip \
- $(CORBA_OUTPUTDIR)/dist/lib/bin.zip
- endif
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+ $(info Will run $(subsystem_name) target on top-level Makefile)
+ $(info WARNING: This is a non-recommended way of building!)
+ $(info ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-clean:
- $(RM) -rf $(CORBA_OUTPUTDIR)
-
-.PHONY: default all clean clobber
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 0da4f9d..e4f8bc7 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -287,3 +287,5 @@
b261523fe66c40a02968f0aa7e73602491bb3386 hs25-b05
4547dc71db765276e027b0c2780b724bae0a07d3 jdk8-b61
d0337c31c8be7716369b4e7c3bd5f352983c6a06 hs25-b06
+dccd40de8db1fa96f186e6179907818d75320440 jdk8-b62
+dc16fe422c535ecd4e9f80fb814a1bb9704da6f5 hs25-b07
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java
index 1ba20f7..3f09ee3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java
@@ -272,9 +272,10 @@
public static final int _fast_aldc = 229;
public static final int _fast_aldc_w = 230;
public static final int _return_register_finalizer = 231;
- public static final int _shouldnotreachhere = 232; // For debugging
+ public static final int _invokehandle = 232;
+ public static final int _shouldnotreachhere = 233; // For debugging
- public static final int number_of_codes = 233;
+ public static final int number_of_codes = 234;
// Flag bits derived from format strings, can_trap, can_rewrite, etc.:
// semantic flags:
@@ -787,20 +788,22 @@
def(_fast_aaccess_0 , "fast_aaccess_0" , "b_JJ" , null , BasicType.getTObject() , 1, true , _aload_0 );
def(_fast_faccess_0 , "fast_faccess_0" , "b_JJ" , null , BasicType.getTObject() , 1, true , _aload_0 );
- def(_fast_iload , "fast_iload" , "bi" , null , BasicType.getTInt() , 1, false, _iload);
- def(_fast_iload2 , "fast_iload2" , "bi_i" , null , BasicType.getTInt() , 2, false, _iload);
- def(_fast_icaload , "fast_icaload" , "bi_" , null , BasicType.getTInt() , 0, false, _iload);
+ def(_fast_iload , "fast_iload" , "bi" , null , BasicType.getTInt() , 1, false, _iload );
+ def(_fast_iload2 , "fast_iload2" , "bi_i" , null , BasicType.getTInt() , 2, false, _iload );
+ def(_fast_icaload , "fast_icaload" , "bi_" , null , BasicType.getTInt() , 0, false, _iload );
// Faster method invocation.
- def(_fast_invokevfinal , "fast_invokevfinal" , "bJJ" , null , BasicType.getTIllegal(), -1, true, _invokevirtual);
+ def(_fast_invokevfinal , "fast_invokevfinal" , "bJJ" , null , BasicType.getTIllegal(), -1, true, _invokevirtual );
def(_fast_linearswitch , "fast_linearswitch" , "" , null , BasicType.getTVoid() , -1, false, _lookupswitch );
def(_fast_binaryswitch , "fast_binaryswitch" , "" , null , BasicType.getTVoid() , -1, false, _lookupswitch );
+ def(_fast_aldc , "fast_aldc" , "bj" , null , BasicType.getTObject(), 1, true, _ldc );
+ def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w );
def(_return_register_finalizer, "return_register_finalizer", "b" , null , BasicType.getTVoid() , 0, true, _return );
- def(_fast_aldc , "fast_aldc" , "bj" , null , BasicType.getTObject(), 1, true, _ldc );
- def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w );
+ // special handling of signature-polymorphic methods
+ def(_invokehandle , "invokehandle" , "bJJ" , null , BasicType.getTIllegal(), -1, true, _invokevirtual );
def(_shouldnotreachhere , "_shouldnotreachhere" , "b" , null , BasicType.getTVoid() , 0, false);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java
index a8df441..b0cc278 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java
@@ -30,24 +30,10 @@
/** Encapsulates some byte-swapping operations defined in the VM */
public class Bytes {
- // swap if client platform is different from server's.
private boolean swap;
public Bytes(MachineDescription machDesc) {
- String cpu = PlatformInfo.getCPU();
- if (cpu.equals("sparc")) {
- if (machDesc.isBigEndian()) {
- swap = false;
- } else {
- swap = true;
- }
- } else { // intel
- if (machDesc.isBigEndian()) {
- swap = true;
- } else {
- swap = false;
- }
- }
+ swap = !machDesc.isBigEndian();
}
/** Should only swap if the hardware's underlying byte order is
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
index 2a3fa02..40dc912 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
@@ -29,6 +29,11 @@
import sun.jvm.hotspot.utilities.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.runtime.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.AccessControlContext;
+import java.security.PrivilegedExceptionAction;
+import java.security.PrivilegedActionException;
public class ByteCodeRewriter
{
@@ -38,8 +43,20 @@
private byte[] code;
private Bytes bytes;
- public static final boolean DEBUG = false;
private static final int jintSize = 4;
+ public static final boolean DEBUG;
+
+ static {
+ String debug = (String) AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+ return System.getProperty("sun.jvm.hotspot.tools.jcore.ByteCodeRewriter.DEBUG");
+ }
+ }
+ );
+ DEBUG = (debug != null ? debug.equalsIgnoreCase("true") : false);
+ }
+
protected void debugMessage(String message) {
System.out.println(message);
@@ -54,6 +71,18 @@
}
+ protected short getConstantPoolIndexFromRefMap(int rawcode, int bci) {
+ int refIndex;
+ String fmt = Bytecodes.format(rawcode);
+ switch (fmt.length()) {
+ case 2: refIndex = 0xFF & method.getBytecodeByteArg(bci); break;
+ case 3: refIndex = 0xFFFF & bytes.swapShort(method.getBytecodeShortArg(bci)); break;
+ default: throw new IllegalArgumentException();
+ }
+
+ return (short)cpool.objectToCPIndex(refIndex);
+ }
+
protected short getConstantPoolIndex(int rawcode, int bci) {
// get ConstantPool index from ConstantPoolCacheIndex at given bci
String fmt = Bytecodes.format(rawcode);
@@ -95,6 +124,12 @@
int hotspotcode = Bytecodes._illegal;
int len = 0;
+ if (DEBUG) {
+ String msg = method.getMethodHolder().getName().asString() + "." +
+ method.getName().asString() +
+ method.getSignature().asString();
+ debugMessage(msg);
+ }
for (int bci = 0; bci < code.length;) {
hotspotcode = Bytecodes.codeAt(method, bci);
bytecode = Bytecodes.javaCode(hotspotcode);
@@ -133,15 +168,15 @@
case Bytecodes._ldc_w:
if (hotspotcode != bytecode) {
- // fast_aldc_w puts constant in CP cache
- cpoolIndex = getConstantPoolIndex(hotspotcode, bci + 1);
+ // fast_aldc_w puts constant in reference map
+ cpoolIndex = getConstantPoolIndexFromRefMap(hotspotcode, bci + 1);
writeShort(code, bci + 1, cpoolIndex);
}
break;
case Bytecodes._ldc:
if (hotspotcode != bytecode) {
- // fast_aldc puts constant in CP cache
- cpoolIndex = getConstantPoolIndex(hotspotcode, bci + 1);
+ // fast_aldc puts constant in reference map
+ cpoolIndex = getConstantPoolIndexFromRefMap(hotspotcode, bci + 1);
code[bci + 1] = (byte)(cpoolIndex);
}
break;
diff --git a/hotspot/make/excludeSrc.make b/hotspot/make/excludeSrc.make
index 00a1e3a..721aea5 100644
--- a/hotspot/make/excludeSrc.make
+++ b/hotspot/make/excludeSrc.make
@@ -79,10 +79,10 @@
CXXFLAGS += -DSERIALGC
CFLAGS += -DSERIALGC
Src_Files_EXCLUDE += \
- binaryTreeDictionary.cpp cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \
+ cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \
cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp cmsPermGen.cpp compactibleFreeListSpace.cpp \
- concurrentMarkSweepGeneration.cpp concurrentMarkSweepThread.cpp freeBlockDictionary.cpp \
- freeChunk.cpp freeList.cpp promotionInfo.cpp vmCMSOperations.cpp collectionSetChooser.cpp \
+ concurrentMarkSweepGeneration.cpp concurrentMarkSweepThread.cpp \
+ freeChunk.cpp adaptiveFreeList.cpp promotionInfo.cpp vmCMSOperations.cpp collectionSetChooser.cpp \
concurrentG1Refine.cpp concurrentG1RefineThread.cpp concurrentMark.cpp concurrentMarkThread.cpp \
dirtyCardQueue.cpp g1AllocRegion.cpp g1BlockOffsetTable.cpp g1CollectedHeap.cpp g1GCPhaseTimes.cpp \
g1CollectorPolicy.cpp g1ErgoVerbose.cpp g1_globals.cpp g1HRPrinter.cpp g1MarkSweep.cpp \
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 14577a1..1f72e22 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=06
+HS_BUILD_NUMBER=07
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index 378c1f8..6b9677d 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -1007,6 +1007,67 @@
emit_simd_arith(0x58, dst, src, VEX_SIMD_F3);
}
+void Assembler::aesdec(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_aes(), "");
+ InstructionMark im(this);
+ simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xde);
+ emit_operand(dst, src);
+}
+
+void Assembler::aesdec(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_aes(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xde);
+ emit_byte(0xC0 | encode);
+}
+
+void Assembler::aesdeclast(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_aes(), "");
+ InstructionMark im(this);
+ simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdf);
+ emit_operand(dst, src);
+}
+
+void Assembler::aesdeclast(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_aes(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdf);
+ emit_byte(0xC0 | encode);
+}
+
+void Assembler::aesenc(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_aes(), "");
+ InstructionMark im(this);
+ simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdc);
+ emit_operand(dst, src);
+}
+
+void Assembler::aesenc(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_aes(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdc);
+ emit_byte(0xC0 | encode);
+}
+
+void Assembler::aesenclast(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_aes(), "");
+ InstructionMark im(this);
+ simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdd);
+ emit_operand(dst, src);
+}
+
+void Assembler::aesenclast(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_aes(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0xdd);
+ emit_byte(0xC0 | encode);
+}
+
+
void Assembler::andl(Address dst, int32_t imm32) {
InstructionMark im(this);
prefix(dst);
@@ -2307,6 +2368,22 @@
a_byte(p);
}
+void Assembler::pshufb(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_ssse3(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0x00);
+ emit_byte(0xC0 | encode);
+}
+
+void Assembler::pshufb(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_ssse3(), "");
+ assert((UseAVX > 0), "SSE mode requires address alignment 16 bytes");
+ InstructionMark im(this);
+ simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_38);
+ emit_byte(0x00);
+ emit_operand(dst, src);
+}
+
void Assembler::pshufd(XMMRegister dst, XMMRegister src, int mode) {
assert(isByte(mode), "invalid value");
NOT_LP64(assert(VM_Version::supports_sse2(), ""));
@@ -8067,6 +8144,15 @@
LP64_ONLY(movq(dst, src)) NOT_LP64(movl(dst, src));
}
+void MacroAssembler::movdqu(XMMRegister dst, AddressLiteral src) {
+ if (reachable(src)) {
+ Assembler::movdqu(dst, as_Address(src));
+ } else {
+ lea(rscratch1, src);
+ Assembler::movdqu(dst, Address(rscratch1, 0));
+ }
+}
+
void MacroAssembler::movsd(XMMRegister dst, AddressLiteral src) {
if (reachable(src)) {
Assembler::movsd(dst, as_Address(src));
@@ -8357,6 +8443,17 @@
}
}
+void MacroAssembler::pshufb(XMMRegister dst, AddressLiteral src) {
+ // Used in sign-bit flipping with aligned address.
+ assert((UseAVX > 0) || (((intptr_t)src.target() & 15) == 0), "SSE mode requires address alignment 16 bytes");
+ if (reachable(src)) {
+ Assembler::pshufb(dst, as_Address(src));
+ } else {
+ lea(rscratch1, src);
+ Assembler::pshufb(dst, Address(rscratch1, 0));
+ }
+}
+
// AVX 3-operands instructions
void MacroAssembler::vaddsd(XMMRegister dst, XMMRegister nds, AddressLiteral src) {
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
index c936e13..8a9bbaf 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
@@ -875,6 +875,17 @@
void addss(XMMRegister dst, Address src);
void addss(XMMRegister dst, XMMRegister src);
+ // AES instructions
+ void aesdec(XMMRegister dst, Address src);
+ void aesdec(XMMRegister dst, XMMRegister src);
+ void aesdeclast(XMMRegister dst, Address src);
+ void aesdeclast(XMMRegister dst, XMMRegister src);
+ void aesenc(XMMRegister dst, Address src);
+ void aesenc(XMMRegister dst, XMMRegister src);
+ void aesenclast(XMMRegister dst, Address src);
+ void aesenclast(XMMRegister dst, XMMRegister src);
+
+
void andl(Address dst, int32_t imm32);
void andl(Register dst, int32_t imm32);
void andl(Register dst, Address src);
@@ -1424,6 +1435,10 @@
void prefetcht2(Address src);
void prefetchw(Address src);
+ // Shuffle Bytes
+ void pshufb(XMMRegister dst, XMMRegister src);
+ void pshufb(XMMRegister dst, Address src);
+
// Shuffle Packed Doublewords
void pshufd(XMMRegister dst, XMMRegister src, int mode);
void pshufd(XMMRegister dst, Address src, int mode);
@@ -2611,6 +2626,12 @@
void divss(XMMRegister dst, Address src) { Assembler::divss(dst, src); }
void divss(XMMRegister dst, AddressLiteral src);
+ // Move Unaligned Double Quadword
+ void movdqu(Address dst, XMMRegister src) { Assembler::movdqu(dst, src); }
+ void movdqu(XMMRegister dst, Address src) { Assembler::movdqu(dst, src); }
+ void movdqu(XMMRegister dst, XMMRegister src) { Assembler::movdqu(dst, src); }
+ void movdqu(XMMRegister dst, AddressLiteral src);
+
void movsd(XMMRegister dst, XMMRegister src) { Assembler::movsd(dst, src); }
void movsd(Address dst, XMMRegister src) { Assembler::movsd(dst, src); }
void movsd(XMMRegister dst, Address src) { Assembler::movsd(dst, src); }
@@ -2658,6 +2679,10 @@
void xorps(XMMRegister dst, Address src) { Assembler::xorps(dst, src); }
void xorps(XMMRegister dst, AddressLiteral src);
+ // Shuffle Bytes
+ void pshufb(XMMRegister dst, XMMRegister src) { Assembler::pshufb(dst, src); }
+ void pshufb(XMMRegister dst, Address src) { Assembler::pshufb(dst, src); }
+ void pshufb(XMMRegister dst, AddressLiteral src);
// AVX 3-operands instructions
void vaddsd(XMMRegister dst, XMMRegister nds, XMMRegister src) { Assembler::vaddsd(dst, nds, src); }
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
index f149fde..d8b61e0 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
@@ -2137,6 +2137,529 @@
}
}
+ // AES intrinsic stubs
+ enum {AESBlockSize = 16};
+
+ address generate_key_shuffle_mask() {
+ __ align(16);
+ StubCodeMark mark(this, "StubRoutines", "key_shuffle_mask");
+ address start = __ pc();
+ __ emit_data(0x00010203, relocInfo::none, 0 );
+ __ emit_data(0x04050607, relocInfo::none, 0 );
+ __ emit_data(0x08090a0b, relocInfo::none, 0 );
+ __ emit_data(0x0c0d0e0f, relocInfo::none, 0 );
+ return start;
+ }
+
+ // Utility routine for loading a 128-bit key word in little endian format
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ __ movdqu(xmmdst, Address(key, offset));
+ if (xmm_shuf_mask != NULL) {
+ __ pshufb(xmmdst, xmm_shuf_mask);
+ } else {
+ __ pshufb(xmmdst, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ }
+ }
+
+ // aesenc using specified key+offset
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void aes_enc_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ load_key(xmmtmp, key, offset, xmm_shuf_mask);
+ __ aesenc(xmmdst, xmmtmp);
+ }
+
+ // aesdec using specified key+offset
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void aes_dec_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ load_key(xmmtmp, key, offset, xmm_shuf_mask);
+ __ aesdec(xmmdst, xmmtmp);
+ }
+
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ //
+ address generate_aescrypt_encryptBlock() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "aescrypt_encryptBlock");
+ Label L_doLast;
+ address start = __ pc();
+
+ const Register from = rsi; // source array address
+ const Register to = rdx; // destination array address
+ const Register key = rcx; // key array address
+ const Register keylen = rax;
+ const Address from_param(rbp, 8+0);
+ const Address to_param (rbp, 8+4);
+ const Address key_param (rbp, 8+8);
+
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ const XMMRegister xmm_key_shuf_mask = xmm2;
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+ __ push(rsi);
+ __ movptr(from , from_param);
+ __ movptr(to , to_param);
+ __ movptr(key , key_param);
+
+ __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ // keylen = # of 32-bit words, convert to 128-bit words
+ __ shrl(keylen, 2);
+ __ subl(keylen, 11); // every key has at least 11 128-bit words, some have more
+
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ __ movdqu(xmm_result, Address(from, 0)); // get 16 bytes of input
+
+ // For encryption, the java expanded key ordering is just what we need
+
+ load_key(xmm_temp, key, 0x00, xmm_key_shuf_mask);
+ __ pxor(xmm_result, xmm_temp);
+ for (int offset = 0x10; offset <= 0x90; offset += 0x10) {
+ aes_enc_key(xmm_result, xmm_temp, key, offset, xmm_key_shuf_mask);
+ }
+ load_key (xmm_temp, key, 0xa0, xmm_key_shuf_mask);
+ __ cmpl(keylen, 0);
+ __ jcc(Assembler::equal, L_doLast);
+ __ aesenc(xmm_result, xmm_temp); // only in 192 and 256 bit keys
+ aes_enc_key(xmm_result, xmm_temp, key, 0xb0, xmm_key_shuf_mask);
+ load_key(xmm_temp, key, 0xc0, xmm_key_shuf_mask);
+ __ subl(keylen, 2);
+ __ jcc(Assembler::equal, L_doLast);
+ __ aesenc(xmm_result, xmm_temp); // only in 256 bit keys
+ aes_enc_key(xmm_result, xmm_temp, key, 0xd0, xmm_key_shuf_mask);
+ load_key(xmm_temp, key, 0xe0, xmm_key_shuf_mask);
+
+ __ BIND(L_doLast);
+ __ aesenclast(xmm_result, xmm_temp);
+ __ movdqu(Address(to, 0), xmm_result); // store the result
+ __ xorptr(rax, rax); // return 0
+ __ pop(rsi);
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ return start;
+ }
+
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ //
+ address generate_aescrypt_decryptBlock() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "aescrypt_decryptBlock");
+ Label L_doLast;
+ address start = __ pc();
+
+ const Register from = rsi; // source array address
+ const Register to = rdx; // destination array address
+ const Register key = rcx; // key array address
+ const Register keylen = rax;
+ const Address from_param(rbp, 8+0);
+ const Address to_param (rbp, 8+4);
+ const Address key_param (rbp, 8+8);
+
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ const XMMRegister xmm_key_shuf_mask = xmm2;
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+ __ push(rsi);
+ __ movptr(from , from_param);
+ __ movptr(to , to_param);
+ __ movptr(key , key_param);
+
+ __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ // keylen = # of 32-bit words, convert to 128-bit words
+ __ shrl(keylen, 2);
+ __ subl(keylen, 11); // every key has at least 11 128-bit words, some have more
+
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ __ movdqu(xmm_result, Address(from, 0));
+
+ // for decryption java expanded key ordering is rotated one position from what we want
+ // so we start from 0x10 here and hit 0x00 last
+ // we don't know if the key is aligned, hence not using load-execute form
+ load_key(xmm_temp, key, 0x10, xmm_key_shuf_mask);
+ __ pxor (xmm_result, xmm_temp);
+ for (int offset = 0x20; offset <= 0xa0; offset += 0x10) {
+ aes_dec_key(xmm_result, xmm_temp, key, offset, xmm_key_shuf_mask);
+ }
+ __ cmpl(keylen, 0);
+ __ jcc(Assembler::equal, L_doLast);
+ // only in 192 and 256 bit keys
+ aes_dec_key(xmm_result, xmm_temp, key, 0xb0, xmm_key_shuf_mask);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xc0, xmm_key_shuf_mask);
+ __ subl(keylen, 2);
+ __ jcc(Assembler::equal, L_doLast);
+ // only in 256 bit keys
+ aes_dec_key(xmm_result, xmm_temp, key, 0xd0, xmm_key_shuf_mask);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xe0, xmm_key_shuf_mask);
+
+ __ BIND(L_doLast);
+ // for decryption the aesdeclast operation is always on key+0x00
+ load_key(xmm_temp, key, 0x00, xmm_key_shuf_mask);
+ __ aesdeclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, 0), xmm_result); // store the result
+
+ __ xorptr(rax, rax); // return 0
+ __ pop(rsi);
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ return start;
+ }
+
+ void handleSOERegisters(bool saving) {
+ const int saveFrameSizeInBytes = 4 * wordSize;
+ const Address saved_rbx (rbp, -3 * wordSize);
+ const Address saved_rsi (rbp, -2 * wordSize);
+ const Address saved_rdi (rbp, -1 * wordSize);
+
+ if (saving) {
+ __ subptr(rsp, saveFrameSizeInBytes);
+ __ movptr(saved_rsi, rsi);
+ __ movptr(saved_rdi, rdi);
+ __ movptr(saved_rbx, rbx);
+ } else {
+ // restoring
+ __ movptr(rsi, saved_rsi);
+ __ movptr(rdi, saved_rdi);
+ __ movptr(rbx, saved_rbx);
+ }
+ }
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ // c_rarg3 - r vector byte array address
+ // c_rarg4 - input length
+ //
+ address generate_cipherBlockChaining_encryptAESCrypt() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_encryptAESCrypt");
+ address start = __ pc();
+
+ Label L_exit, L_key_192_256, L_key_256, L_loopTop_128, L_loopTop_192, L_loopTop_256;
+ const Register from = rsi; // source array address
+ const Register to = rdx; // destination array address
+ const Register key = rcx; // key array address
+ const Register rvec = rdi; // r byte array initialized from initvector array address
+ // and left with the results of the last encryption block
+ const Register len_reg = rbx; // src len (must be multiple of blocksize 16)
+ const Register pos = rax;
+
+ // xmm register assignments for the loops below
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ // first 6 keys preloaded into xmm2-xmm7
+ const int XMM_REG_NUM_KEY_FIRST = 2;
+ const int XMM_REG_NUM_KEY_LAST = 7;
+ const XMMRegister xmm_key0 = as_XMMRegister(XMM_REG_NUM_KEY_FIRST);
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+ handleSOERegisters(true /*saving*/);
+
+ // load registers from incoming parameters
+ const Address from_param(rbp, 8+0);
+ const Address to_param (rbp, 8+4);
+ const Address key_param (rbp, 8+8);
+ const Address rvec_param (rbp, 8+12);
+ const Address len_param (rbp, 8+16);
+ __ movptr(from , from_param);
+ __ movptr(to , to_param);
+ __ movptr(key , key_param);
+ __ movptr(rvec , rvec_param);
+ __ movptr(len_reg , len_param);
+
+ const XMMRegister xmm_key_shuf_mask = xmm_temp; // used temporarily to swap key bytes up front
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ // load up xmm regs 2 thru 7 with keys 0-5
+ for (int rnum = XMM_REG_NUM_KEY_FIRST, offset = 0x00; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ load_key(as_XMMRegister(rnum), key, offset, xmm_key_shuf_mask);
+ offset += 0x10;
+ }
+
+ __ movdqu(xmm_result, Address(rvec, 0x00)); // initialize xmm_result with r vec
+
+ // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
+ __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ __ cmpl(rax, 44);
+ __ jcc(Assembler::notEqual, L_key_192_256);
+
+ // 128 bit code follows here
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_128);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = 0x60; key_offset <= 0x90; key_offset += 0x10) {
+ aes_enc_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0xa0);
+ __ aesenclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_128);
+
+ __ BIND(L_exit);
+ __ movdqu(Address(rvec, 0), xmm_result); // final value of r stored in rvec of CipherBlockChaining object
+
+ handleSOERegisters(false /*restoring*/);
+ __ movl(rax, 0); // return 0 (why?)
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ __ BIND(L_key_192_256);
+ // here rax = len in ints of AESCrypt.KLE array (52=192, or 60=256)
+ __ cmpl(rax, 52);
+ __ jcc(Assembler::notEqual, L_key_256);
+
+ // 192-bit code follows here (could be changed to use more xmm registers)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_192);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = 0x60; key_offset <= 0xb0; key_offset += 0x10) {
+ aes_enc_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0xc0);
+ __ aesenclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_192);
+ __ jmp(L_exit);
+
+ __ BIND(L_key_256);
+ // 256-bit code follows here (could be changed to use more xmm registers)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_256);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = 0x60; key_offset <= 0xd0; key_offset += 0x10) {
+ aes_enc_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0xe0);
+ __ aesenclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_256);
+ __ jmp(L_exit);
+
+ return start;
+ }
+
+
+ // CBC AES Decryption.
+ // In 32-bit stub, because of lack of registers we do not try to parallelize 4 blocks at a time.
+ //
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ // c_rarg3 - r vector byte array address
+ // c_rarg4 - input length
+ //
+
+ address generate_cipherBlockChaining_decryptAESCrypt() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_decryptAESCrypt");
+ address start = __ pc();
+
+ Label L_exit, L_key_192_256, L_key_256;
+ Label L_singleBlock_loopTop_128;
+ Label L_singleBlock_loopTop_192, L_singleBlock_loopTop_256;
+ const Register from = rsi; // source array address
+ const Register to = rdx; // destination array address
+ const Register key = rcx; // key array address
+ const Register rvec = rdi; // r byte array initialized from initvector array address
+ // and left with the results of the last encryption block
+ const Register len_reg = rbx; // src len (must be multiple of blocksize 16)
+ const Register pos = rax;
+
+ // xmm register assignments for the loops below
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ // first 6 keys preloaded into xmm2-xmm7
+ const int XMM_REG_NUM_KEY_FIRST = 2;
+ const int XMM_REG_NUM_KEY_LAST = 7;
+ const int FIRST_NON_REG_KEY_offset = 0x70;
+ const XMMRegister xmm_key_first = as_XMMRegister(XMM_REG_NUM_KEY_FIRST);
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+ handleSOERegisters(true /*saving*/);
+
+ // load registers from incoming parameters
+ const Address from_param(rbp, 8+0);
+ const Address to_param (rbp, 8+4);
+ const Address key_param (rbp, 8+8);
+ const Address rvec_param (rbp, 8+12);
+ const Address len_param (rbp, 8+16);
+ __ movptr(from , from_param);
+ __ movptr(to , to_param);
+ __ movptr(key , key_param);
+ __ movptr(rvec , rvec_param);
+ __ movptr(len_reg , len_param);
+
+ // the java expanded key ordering is rotated one position from what we want
+ // so we start from 0x10 here and hit 0x00 last
+ const XMMRegister xmm_key_shuf_mask = xmm1; // used temporarily to swap key bytes up front
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ // load up xmm regs 2 thru 6 with first 5 keys
+ for (int rnum = XMM_REG_NUM_KEY_FIRST, offset = 0x10; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ load_key(as_XMMRegister(rnum), key, offset, xmm_key_shuf_mask);
+ offset += 0x10;
+ }
+
+ // inside here, use the rvec register to point to previous block cipher
+ // with which we xor at the end of each newly decrypted block
+ const Register prev_block_cipher_ptr = rvec;
+
+ // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
+ __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ __ cmpl(rax, 44);
+ __ jcc(Assembler::notEqual, L_key_192_256);
+
+
+ // 128-bit code follows here, parallelized
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_128);
+ __ cmpptr(len_reg, 0); // any blocks left??
+ __ jcc(Assembler::equal, L_exit);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = FIRST_NON_REG_KEY_offset; key_offset <= 0xa0; key_offset += 0x10) { // 128-bit runs up to key offset a0
+ aes_dec_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0x00); // final key is stored in java expanded array at offset 0
+ __ aesdeclast(xmm_result, xmm_temp);
+ __ movdqu(xmm_temp, Address(prev_block_cipher_ptr, 0x00));
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ lea(prev_block_cipher_ptr, Address(from, pos, Address::times_1, 0)); // set up new ptr
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jmp(L_singleBlock_loopTop_128);
+
+
+ __ BIND(L_exit);
+ __ movdqu(xmm_temp, Address(prev_block_cipher_ptr, 0x00));
+ __ movptr(rvec , rvec_param); // restore this since used in loop
+ __ movdqu(Address(rvec, 0), xmm_temp); // final value of r stored in rvec of CipherBlockChaining object
+ handleSOERegisters(false /*restoring*/);
+ __ movl(rax, 0); // return 0 (why?)
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+
+ __ BIND(L_key_192_256);
+ // here rax = len in ints of AESCrypt.KLE array (52=192, or 60=256)
+ __ cmpl(rax, 52);
+ __ jcc(Assembler::notEqual, L_key_256);
+
+ // 192-bit code follows here (could be optimized to use parallelism)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_192);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = FIRST_NON_REG_KEY_offset; key_offset <= 0xc0; key_offset += 0x10) { // 192-bit runs up to key offset c0
+ aes_dec_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0x00); // final key is stored in java expanded array at offset 0
+ __ aesdeclast(xmm_result, xmm_temp);
+ __ movdqu(xmm_temp, Address(prev_block_cipher_ptr, 0x00));
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ lea(prev_block_cipher_ptr, Address(from, pos, Address::times_1, 0)); // set up new ptr
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual,L_singleBlock_loopTop_192);
+ __ jmp(L_exit);
+
+ __ BIND(L_key_256);
+ // 256-bit code follows here (could be optimized to use parallelism)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_256);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ for (int key_offset = FIRST_NON_REG_KEY_offset; key_offset <= 0xe0; key_offset += 0x10) { // 256-bit runs up to key offset e0
+ aes_dec_key(xmm_result, xmm_temp, key, key_offset);
+ }
+ load_key(xmm_temp, key, 0x00); // final key is stored in java expanded array at offset 0
+ __ aesdeclast(xmm_result, xmm_temp);
+ __ movdqu(xmm_temp, Address(prev_block_cipher_ptr, 0x00));
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ lea(prev_block_cipher_ptr, Address(from, pos, Address::times_1, 0)); // set up new ptr
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual,L_singleBlock_loopTop_256);
+ __ jmp(L_exit);
+
+ return start;
+ }
+
+
public:
// Information about frame layout at time of blocking runtime call.
// Note that we only have to preserve callee-saved registers since
@@ -2332,6 +2855,16 @@
generate_arraycopy_stubs();
generate_math_stubs();
+
+ // don't bother generating these AES intrinsic stubs unless global flag is set
+ if (UseAESIntrinsics) {
+ StubRoutines::x86::_key_shuffle_mask_addr = generate_key_shuffle_mask(); // might be needed by the others
+
+ StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
+ StubRoutines::_aescrypt_decryptBlock = generate_aescrypt_decryptBlock();
+ StubRoutines::_cipherBlockChaining_encryptAESCrypt = generate_cipherBlockChaining_encryptAESCrypt();
+ StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt();
+ }
}
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
index 8ae595a..3e22338 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
@@ -2941,6 +2941,548 @@
}
}
+ // AES intrinsic stubs
+ enum {AESBlockSize = 16};
+
+ address generate_key_shuffle_mask() {
+ __ align(16);
+ StubCodeMark mark(this, "StubRoutines", "key_shuffle_mask");
+ address start = __ pc();
+ __ emit_data64( 0x0405060700010203, relocInfo::none );
+ __ emit_data64( 0x0c0d0e0f08090a0b, relocInfo::none );
+ return start;
+ }
+
+ // Utility routine for loading a 128-bit key word in little endian format
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ __ movdqu(xmmdst, Address(key, offset));
+ if (xmm_shuf_mask != NULL) {
+ __ pshufb(xmmdst, xmm_shuf_mask);
+ } else {
+ __ pshufb(xmmdst, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ }
+ }
+
+ // aesenc using specified key+offset
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void aes_enc_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ load_key(xmmtmp, key, offset, xmm_shuf_mask);
+ __ aesenc(xmmdst, xmmtmp);
+ }
+
+ // aesdec using specified key+offset
+ // can optionally specify that the shuffle mask is already in an xmmregister
+ void aes_dec_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+ load_key(xmmtmp, key, offset, xmm_shuf_mask);
+ __ aesdec(xmmdst, xmmtmp);
+ }
+
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ //
+ address generate_aescrypt_encryptBlock() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "aescrypt_encryptBlock");
+ Label L_doLast;
+ address start = __ pc();
+
+ const Register from = c_rarg0; // source array address
+ const Register to = c_rarg1; // destination array address
+ const Register key = c_rarg2; // key array address
+ const Register keylen = rax;
+
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ const XMMRegister xmm_key_shuf_mask = xmm2;
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+ __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ // keylen = # of 32-bit words, convert to 128-bit words
+ __ shrl(keylen, 2);
+ __ subl(keylen, 11); // every key has at least 11 128-bit words, some have more
+
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ __ movdqu(xmm_result, Address(from, 0)); // get 16 bytes of input
+
+ // For encryption, the java expanded key ordering is just what we need
+ // we don't know if the key is aligned, hence not using load-execute form
+
+ load_key(xmm_temp, key, 0x00, xmm_key_shuf_mask);
+ __ pxor(xmm_result, xmm_temp);
+ for (int offset = 0x10; offset <= 0x90; offset += 0x10) {
+ aes_enc_key(xmm_result, xmm_temp, key, offset, xmm_key_shuf_mask);
+ }
+ load_key (xmm_temp, key, 0xa0, xmm_key_shuf_mask);
+ __ cmpl(keylen, 0);
+ __ jcc(Assembler::equal, L_doLast);
+ __ aesenc(xmm_result, xmm_temp); // only in 192 and 256 bit keys
+ aes_enc_key(xmm_result, xmm_temp, key, 0xb0, xmm_key_shuf_mask);
+ load_key(xmm_temp, key, 0xc0, xmm_key_shuf_mask);
+ __ subl(keylen, 2);
+ __ jcc(Assembler::equal, L_doLast);
+ __ aesenc(xmm_result, xmm_temp); // only in 256 bit keys
+ aes_enc_key(xmm_result, xmm_temp, key, 0xd0, xmm_key_shuf_mask);
+ load_key(xmm_temp, key, 0xe0, xmm_key_shuf_mask);
+
+ __ BIND(L_doLast);
+ __ aesenclast(xmm_result, xmm_temp);
+ __ movdqu(Address(to, 0), xmm_result); // store the result
+ __ xorptr(rax, rax); // return 0
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ return start;
+ }
+
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ //
+ address generate_aescrypt_decryptBlock() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "aescrypt_decryptBlock");
+ Label L_doLast;
+ address start = __ pc();
+
+ const Register from = c_rarg0; // source array address
+ const Register to = c_rarg1; // destination array address
+ const Register key = c_rarg2; // key array address
+ const Register keylen = rax;
+
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ const XMMRegister xmm_key_shuf_mask = xmm2;
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+ __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ // keylen = # of 32-bit words, convert to 128-bit words
+ __ shrl(keylen, 2);
+ __ subl(keylen, 11); // every key has at least 11 128-bit words, some have more
+
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ __ movdqu(xmm_result, Address(from, 0));
+
+ // for decryption java expanded key ordering is rotated one position from what we want
+ // so we start from 0x10 here and hit 0x00 last
+ // we don't know if the key is aligned, hence not using load-execute form
+ load_key(xmm_temp, key, 0x10, xmm_key_shuf_mask);
+ __ pxor (xmm_result, xmm_temp);
+ for (int offset = 0x20; offset <= 0xa0; offset += 0x10) {
+ aes_dec_key(xmm_result, xmm_temp, key, offset, xmm_key_shuf_mask);
+ }
+ __ cmpl(keylen, 0);
+ __ jcc(Assembler::equal, L_doLast);
+ // only in 192 and 256 bit keys
+ aes_dec_key(xmm_result, xmm_temp, key, 0xb0, xmm_key_shuf_mask);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xc0, xmm_key_shuf_mask);
+ __ subl(keylen, 2);
+ __ jcc(Assembler::equal, L_doLast);
+ // only in 256 bit keys
+ aes_dec_key(xmm_result, xmm_temp, key, 0xd0, xmm_key_shuf_mask);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xe0, xmm_key_shuf_mask);
+
+ __ BIND(L_doLast);
+ // for decryption the aesdeclast operation is always on key+0x00
+ load_key(xmm_temp, key, 0x00, xmm_key_shuf_mask);
+ __ aesdeclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, 0), xmm_result); // store the result
+
+ __ xorptr(rax, rax); // return 0
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ return start;
+ }
+
+
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ // c_rarg3 - r vector byte array address
+ // c_rarg4 - input length
+ //
+ address generate_cipherBlockChaining_encryptAESCrypt() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_encryptAESCrypt");
+ address start = __ pc();
+
+ Label L_exit, L_key_192_256, L_key_256, L_loopTop_128, L_loopTop_192, L_loopTop_256;
+ const Register from = c_rarg0; // source array address
+ const Register to = c_rarg1; // destination array address
+ const Register key = c_rarg2; // key array address
+ const Register rvec = c_rarg3; // r byte array initialized from initvector array address
+ // and left with the results of the last encryption block
+#ifndef _WIN64
+ const Register len_reg = c_rarg4; // src len (must be multiple of blocksize 16)
+#else
+ const Address len_mem(rsp, 6 * wordSize); // length is on stack on Win64
+ const Register len_reg = r10; // pick the first volatile windows register
+#endif
+ const Register pos = rax;
+
+ // xmm register assignments for the loops below
+ const XMMRegister xmm_result = xmm0;
+ const XMMRegister xmm_temp = xmm1;
+ // keys 0-10 preloaded into xmm2-xmm12
+ const int XMM_REG_NUM_KEY_FIRST = 2;
+ const int XMM_REG_NUM_KEY_LAST = 12;
+ const XMMRegister xmm_key0 = as_XMMRegister(XMM_REG_NUM_KEY_FIRST);
+ const XMMRegister xmm_key10 = as_XMMRegister(XMM_REG_NUM_KEY_LAST);
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+#ifdef _WIN64
+ // on win64, fill len_reg from stack position
+ __ movl(len_reg, len_mem);
+ // save the xmm registers which must be preserved 6-12
+ __ subptr(rsp, -rsp_after_call_off * wordSize);
+ for (int i = 6; i <= XMM_REG_NUM_KEY_LAST; i++) {
+ __ movdqu(xmm_save(i), as_XMMRegister(i));
+ }
+#endif
+
+ const XMMRegister xmm_key_shuf_mask = xmm_temp; // used temporarily to swap key bytes up front
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ // load up xmm regs 2 thru 12 with key 0x00 - 0xa0
+ for (int rnum = XMM_REG_NUM_KEY_FIRST, offset = 0x00; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ load_key(as_XMMRegister(rnum), key, offset, xmm_key_shuf_mask);
+ offset += 0x10;
+ }
+
+ __ movdqu(xmm_result, Address(rvec, 0x00)); // initialize xmm_result with r vec
+
+ // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
+ __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ __ cmpl(rax, 44);
+ __ jcc(Assembler::notEqual, L_key_192_256);
+
+ // 128 bit code follows here
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_128);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST - 1; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ __ aesenclast(xmm_result, xmm_key10);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_128);
+
+ __ BIND(L_exit);
+ __ movdqu(Address(rvec, 0), xmm_result); // final value of r stored in rvec of CipherBlockChaining object
+
+#ifdef _WIN64
+ // restore xmm regs belonging to calling function
+ for (int i = 6; i <= XMM_REG_NUM_KEY_LAST; i++) {
+ __ movdqu(as_XMMRegister(i), xmm_save(i));
+ }
+#endif
+ __ movl(rax, 0); // return 0 (why?)
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+ __ BIND(L_key_192_256);
+ // here rax = len in ints of AESCrypt.KLE array (52=192, or 60=256)
+ __ cmpl(rax, 52);
+ __ jcc(Assembler::notEqual, L_key_256);
+
+ // 192-bit code follows here (could be changed to use more xmm registers)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_192);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ aes_enc_key(xmm_result, xmm_temp, key, 0xb0);
+ load_key(xmm_temp, key, 0xc0);
+ __ aesenclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_192);
+ __ jmp(L_exit);
+
+ __ BIND(L_key_256);
+ // 256-bit code follows here (could be changed to use more xmm registers)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loopTop_256);
+ __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of input
+ __ pxor (xmm_result, xmm_temp); // xor with the current r vector
+
+ __ pxor (xmm_result, xmm_key0); // do the aes rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ __ aesenc(xmm_result, as_XMMRegister(rnum));
+ }
+ aes_enc_key(xmm_result, xmm_temp, key, 0xb0);
+ aes_enc_key(xmm_result, xmm_temp, key, 0xc0);
+ aes_enc_key(xmm_result, xmm_temp, key, 0xd0);
+ load_key(xmm_temp, key, 0xe0);
+ __ aesenclast(xmm_result, xmm_temp);
+
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual, L_loopTop_256);
+ __ jmp(L_exit);
+
+ return start;
+ }
+
+
+
+ // This is a version of CBC/AES Decrypt which does 4 blocks in a loop at a time
+ // to hide instruction latency
+ //
+ // Arguments:
+ //
+ // Inputs:
+ // c_rarg0 - source byte array address
+ // c_rarg1 - destination byte array address
+ // c_rarg2 - K (key) in little endian int array
+ // c_rarg3 - r vector byte array address
+ // c_rarg4 - input length
+ //
+
+ address generate_cipherBlockChaining_decryptAESCrypt_Parallel() {
+ assert(UseAES && (UseAVX > 0), "need AES instructions and misaligned SSE support");
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_decryptAESCrypt");
+ address start = __ pc();
+
+ Label L_exit, L_key_192_256, L_key_256;
+ Label L_singleBlock_loopTop_128, L_multiBlock_loopTop_128;
+ Label L_singleBlock_loopTop_192, L_singleBlock_loopTop_256;
+ const Register from = c_rarg0; // source array address
+ const Register to = c_rarg1; // destination array address
+ const Register key = c_rarg2; // key array address
+ const Register rvec = c_rarg3; // r byte array initialized from initvector array address
+ // and left with the results of the last encryption block
+#ifndef _WIN64
+ const Register len_reg = c_rarg4; // src len (must be multiple of blocksize 16)
+#else
+ const Address len_mem(rsp, 6 * wordSize); // length is on stack on Win64
+ const Register len_reg = r10; // pick the first volatile windows register
+#endif
+ const Register pos = rax;
+
+ // xmm register assignments for the loops below
+ const XMMRegister xmm_result = xmm0;
+ // keys 0-10 preloaded into xmm2-xmm12
+ const int XMM_REG_NUM_KEY_FIRST = 5;
+ const int XMM_REG_NUM_KEY_LAST = 15;
+ const XMMRegister xmm_key_first = as_XMMRegister(XMM_REG_NUM_KEY_FIRST);
+ const XMMRegister xmm_key_last = as_XMMRegister(XMM_REG_NUM_KEY_LAST);
+
+ __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+#ifdef _WIN64
+ // on win64, fill len_reg from stack position
+ __ movl(len_reg, len_mem);
+ // save the xmm registers which must be preserved 6-15
+ __ subptr(rsp, -rsp_after_call_off * wordSize);
+ for (int i = 6; i <= XMM_REG_NUM_KEY_LAST; i++) {
+ __ movdqu(xmm_save(i), as_XMMRegister(i));
+ }
+#endif
+ // the java expanded key ordering is rotated one position from what we want
+ // so we start from 0x10 here and hit 0x00 last
+ const XMMRegister xmm_key_shuf_mask = xmm1; // used temporarily to swap key bytes up front
+ __ movdqu(xmm_key_shuf_mask, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
+ // load up xmm regs 5 thru 15 with key 0x10 - 0xa0 - 0x00
+ for (int rnum = XMM_REG_NUM_KEY_FIRST, offset = 0x10; rnum <= XMM_REG_NUM_KEY_LAST; rnum++) {
+ if (rnum == XMM_REG_NUM_KEY_LAST) offset = 0x00;
+ load_key(as_XMMRegister(rnum), key, offset, xmm_key_shuf_mask);
+ offset += 0x10;
+ }
+
+ const XMMRegister xmm_prev_block_cipher = xmm1; // holds cipher of previous block
+ // registers holding the four results in the parallelized loop
+ const XMMRegister xmm_result0 = xmm0;
+ const XMMRegister xmm_result1 = xmm2;
+ const XMMRegister xmm_result2 = xmm3;
+ const XMMRegister xmm_result3 = xmm4;
+
+ __ movdqu(xmm_prev_block_cipher, Address(rvec, 0x00)); // initialize with initial rvec
+
+ // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
+ __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+ __ cmpl(rax, 44);
+ __ jcc(Assembler::notEqual, L_key_192_256);
+
+
+ // 128-bit code follows here, parallelized
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_multiBlock_loopTop_128);
+ __ cmpptr(len_reg, 4*AESBlockSize); // see if at least 4 blocks left
+ __ jcc(Assembler::less, L_singleBlock_loopTop_128);
+
+ __ movdqu(xmm_result0, Address(from, pos, Address::times_1, 0*AESBlockSize)); // get next 4 blocks into xmmresult registers
+ __ movdqu(xmm_result1, Address(from, pos, Address::times_1, 1*AESBlockSize));
+ __ movdqu(xmm_result2, Address(from, pos, Address::times_1, 2*AESBlockSize));
+ __ movdqu(xmm_result3, Address(from, pos, Address::times_1, 3*AESBlockSize));
+
+#define DoFour(opc, src_reg) \
+ __ opc(xmm_result0, src_reg); \
+ __ opc(xmm_result1, src_reg); \
+ __ opc(xmm_result2, src_reg); \
+ __ opc(xmm_result3, src_reg);
+
+ DoFour(pxor, xmm_key_first);
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST - 1; rnum++) {
+ DoFour(aesdec, as_XMMRegister(rnum));
+ }
+ DoFour(aesdeclast, xmm_key_last);
+ // for each result, xor with the r vector of previous cipher block
+ __ pxor(xmm_result0, xmm_prev_block_cipher);
+ __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 0*AESBlockSize));
+ __ pxor(xmm_result1, xmm_prev_block_cipher);
+ __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 1*AESBlockSize));
+ __ pxor(xmm_result2, xmm_prev_block_cipher);
+ __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 2*AESBlockSize));
+ __ pxor(xmm_result3, xmm_prev_block_cipher);
+ __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 3*AESBlockSize)); // this will carry over to next set of blocks
+
+ __ movdqu(Address(to, pos, Address::times_1, 0*AESBlockSize), xmm_result0); // store 4 results into the next 64 bytes of output
+ __ movdqu(Address(to, pos, Address::times_1, 1*AESBlockSize), xmm_result1);
+ __ movdqu(Address(to, pos, Address::times_1, 2*AESBlockSize), xmm_result2);
+ __ movdqu(Address(to, pos, Address::times_1, 3*AESBlockSize), xmm_result3);
+
+ __ addptr(pos, 4*AESBlockSize);
+ __ subptr(len_reg, 4*AESBlockSize);
+ __ jmp(L_multiBlock_loopTop_128);
+
+ // registers used in the non-parallelized loops
+ const XMMRegister xmm_prev_block_cipher_save = xmm2;
+ const XMMRegister xmm_temp = xmm3;
+
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_128);
+ __ cmpptr(len_reg, 0); // any blocks left??
+ __ jcc(Assembler::equal, L_exit);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ movdqa(xmm_prev_block_cipher_save, xmm_result); // save for next r vector
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST - 1; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ __ aesdeclast(xmm_result, xmm_key_last);
+ __ pxor (xmm_result, xmm_prev_block_cipher); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ movdqa(xmm_prev_block_cipher, xmm_prev_block_cipher_save); // set up next r vector with cipher input from this block
+
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jmp(L_singleBlock_loopTop_128);
+
+
+ __ BIND(L_exit);
+ __ movdqu(Address(rvec, 0), xmm_prev_block_cipher); // final value of r stored in rvec of CipherBlockChaining object
+#ifdef _WIN64
+ // restore regs belonging to calling function
+ for (int i = 6; i <= XMM_REG_NUM_KEY_LAST; i++) {
+ __ movdqu(as_XMMRegister(i), xmm_save(i));
+ }
+#endif
+ __ movl(rax, 0); // return 0 (why?)
+ __ leave(); // required for proper stackwalking of RuntimeStub frame
+ __ ret(0);
+
+
+ __ BIND(L_key_192_256);
+ // here rax = len in ints of AESCrypt.KLE array (52=192, or 60=256)
+ __ cmpl(rax, 52);
+ __ jcc(Assembler::notEqual, L_key_256);
+
+ // 192-bit code follows here (could be optimized to use parallelism)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_192);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ movdqa(xmm_prev_block_cipher_save, xmm_result); // save for next r vector
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST - 1; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ aes_dec_key(xmm_result, xmm_temp, key, 0xb0); // 192-bit key goes up to c0
+ aes_dec_key(xmm_result, xmm_temp, key, 0xc0);
+ __ aesdeclast(xmm_result, xmm_key_last); // xmm15 always came from key+0
+ __ pxor (xmm_result, xmm_prev_block_cipher); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ movdqa(xmm_prev_block_cipher, xmm_prev_block_cipher_save); // set up next r vector with cipher input from this block
+
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual,L_singleBlock_loopTop_192);
+ __ jmp(L_exit);
+
+ __ BIND(L_key_256);
+ // 256-bit code follows here (could be optimized to use parallelism)
+ __ movptr(pos, 0);
+ __ align(OptoLoopAlignment);
+ __ BIND(L_singleBlock_loopTop_256);
+ __ movdqu(xmm_result, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
+ __ movdqa(xmm_prev_block_cipher_save, xmm_result); // save for next r vector
+ __ pxor (xmm_result, xmm_key_first); // do the aes dec rounds
+ for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum <= XMM_REG_NUM_KEY_LAST - 1; rnum++) {
+ __ aesdec(xmm_result, as_XMMRegister(rnum));
+ }
+ aes_dec_key(xmm_result, xmm_temp, key, 0xb0); // 256-bit key goes up to e0
+ aes_dec_key(xmm_result, xmm_temp, key, 0xc0);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xd0);
+ aes_dec_key(xmm_result, xmm_temp, key, 0xe0);
+ __ aesdeclast(xmm_result, xmm_key_last); // xmm15 came from key+0
+ __ pxor (xmm_result, xmm_prev_block_cipher); // xor with the current r vector
+ __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result); // store into the next 16 bytes of output
+ // no need to store r to memory until we exit
+ __ movdqa(xmm_prev_block_cipher, xmm_prev_block_cipher_save); // set up next r vector with cipher input from this block
+
+ __ addptr(pos, AESBlockSize);
+ __ subptr(len_reg, AESBlockSize);
+ __ jcc(Assembler::notEqual,L_singleBlock_loopTop_256);
+ __ jmp(L_exit);
+
+ return start;
+ }
+
+
+
#undef __
#define __ masm->
@@ -3135,6 +3677,16 @@
generate_arraycopy_stubs();
generate_math_stubs();
+
+ // don't bother generating these AES intrinsic stubs unless global flag is set
+ if (UseAESIntrinsics) {
+ StubRoutines::x86::_key_shuffle_mask_addr = generate_key_shuffle_mask(); // needed by the others
+
+ StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
+ StubRoutines::_aescrypt_decryptBlock = generate_aescrypt_decryptBlock();
+ StubRoutines::_cipherBlockChaining_encryptAESCrypt = generate_cipherBlockChaining_encryptAESCrypt();
+ StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt_Parallel();
+ }
}
public:
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
index 6ec4121..cfd4f33 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
@@ -44,3 +44,4 @@
address StubRoutines::x86::_verify_mxcsr_entry = NULL;
address StubRoutines::x86::_verify_fpu_cntrl_wrd_entry = NULL;
+address StubRoutines::x86::_key_shuffle_mask_addr = NULL;
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp
index 64767c8..d53124f 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp
@@ -41,10 +41,14 @@
private:
static address _verify_mxcsr_entry;
static address _verify_fpu_cntrl_wrd_entry;
+ // shuffle mask for fixing up 128-bit words consisting of big-endian 32-bit integers
+ static address _key_shuffle_mask_addr;
public:
static address verify_mxcsr_entry() { return _verify_mxcsr_entry; }
static address verify_fpu_cntrl_wrd_entry() { return _verify_fpu_cntrl_wrd_entry; }
+ static address key_shuffle_mask_addr() { return _key_shuffle_mask_addr; }
+
};
static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
index 084bbf8..cf8ec5d 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
@@ -56,3 +56,4 @@
address StubRoutines::x86::_double_sign_mask = NULL;
address StubRoutines::x86::_double_sign_flip = NULL;
address StubRoutines::x86::_mxcsr_std = NULL;
+address StubRoutines::x86::_key_shuffle_mask_addr = NULL;
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
index 9b9cede..c3efeec 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
@@ -54,6 +54,8 @@
static address _double_sign_mask;
static address _double_sign_flip;
static address _mxcsr_std;
+ // shuffle mask for fixing up 128-bit words consisting of big-endian 32-bit integers
+ static address _key_shuffle_mask_addr;
public:
@@ -116,6 +118,9 @@
{
return _mxcsr_std;
}
+
+ static address key_shuffle_mask_addr() { return _key_shuffle_mask_addr; }
+
};
#endif // CPU_X86_VM_STUBROUTINES_X86_64_HPP
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
index bf7b3c2..182b0ab 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
@@ -419,13 +419,16 @@
if (UseAVX < 1)
_cpuFeatures &= ~CPU_AVX;
+ if (!UseAES && !FLAG_IS_DEFAULT(UseAES))
+ _cpuFeatures &= ~CPU_AES;
+
if (logical_processors_per_package() == 1) {
// HT processor could be installed on a system which doesn't support HT.
_cpuFeatures &= ~CPU_HT;
}
char buf[256];
- jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
cores_per_cpu(), threads_per_core(),
cpu_family(), _model, _stepping,
(supports_cmov() ? ", cmov" : ""),
@@ -441,6 +444,7 @@
(supports_popcnt() ? ", popcnt" : ""),
(supports_avx() ? ", avx" : ""),
(supports_avx2() ? ", avx2" : ""),
+ (supports_aes() ? ", aes" : ""),
(supports_mmx_ext() ? ", mmxext" : ""),
(supports_3dnow_prefetch() ? ", 3dnowpref" : ""),
(supports_lzcnt() ? ", lzcnt": ""),
@@ -472,6 +476,29 @@
if (!supports_avx ()) // Drop to 0 if no AVX support
UseAVX = 0;
+ // Use AES instructions if available.
+ if (supports_aes()) {
+ if (FLAG_IS_DEFAULT(UseAES)) {
+ UseAES = true;
+ }
+ } else if (UseAES) {
+ if (!FLAG_IS_DEFAULT(UseAES))
+ warning("AES instructions not available on this CPU");
+ FLAG_SET_DEFAULT(UseAES, false);
+ }
+
+ // The AES intrinsic stubs require AES instruction support (of course)
+ // but also require AVX mode for misaligned SSE access
+ if (UseAES && (UseAVX > 0)) {
+ if (FLAG_IS_DEFAULT(UseAESIntrinsics)) {
+ UseAESIntrinsics = true;
+ }
+ } else if (UseAESIntrinsics) {
+ if (!FLAG_IS_DEFAULT(UseAESIntrinsics))
+ warning("AES intrinsics not available on this CPU");
+ FLAG_SET_DEFAULT(UseAESIntrinsics, false);
+ }
+
#ifdef COMPILER2
if (UseFPUForSpilling) {
if (UseSSE < 2) {
@@ -714,6 +741,9 @@
if (UseAVX > 0) {
tty->print(" UseAVX=%d",UseAVX);
}
+ if (UseAES) {
+ tty->print(" UseAES=1");
+ }
tty->cr();
tty->print("Allocation");
if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) {
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
index 92cdbd3..12bd3b7 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
@@ -78,7 +78,9 @@
sse4_2 : 1,
: 2,
popcnt : 1,
- : 3,
+ : 1,
+ aes : 1,
+ : 1,
osxsave : 1,
avx : 1,
: 3;
@@ -244,7 +246,8 @@
CPU_TSC = (1 << 15),
CPU_TSCINV = (1 << 16),
CPU_AVX = (1 << 17),
- CPU_AVX2 = (1 << 18)
+ CPU_AVX2 = (1 << 18),
+ CPU_AES = (1 << 19)
} cpuFeatureFlags;
enum {
@@ -420,6 +423,8 @@
result |= CPU_TSC;
if (_cpuid_info.ext_cpuid7_edx.bits.tsc_invariance != 0)
result |= CPU_TSCINV;
+ if (_cpuid_info.std_cpuid1_ecx.bits.aes != 0)
+ result |= CPU_AES;
// AMD features.
if (is_amd()) {
@@ -544,6 +549,7 @@
static bool supports_avx() { return (_cpuFeatures & CPU_AVX) != 0; }
static bool supports_avx2() { return (_cpuFeatures & CPU_AVX2) != 0; }
static bool supports_tsc() { return (_cpuFeatures & CPU_TSC) != 0; }
+ static bool supports_aes() { return (_cpuFeatures & CPU_AES) != 0; }
// Intel features
static bool is_intel_family_core() { return is_intel() &&
diff --git a/hotspot/src/cpu/x86/vm/x86.ad b/hotspot/src/cpu/x86/vm/x86.ad
index a2cf6f7..c49d0e6 100644
--- a/hotspot/src/cpu/x86/vm/x86.ad
+++ b/hotspot/src/cpu/x86/vm/x86.ad
@@ -4102,9 +4102,158 @@
// ----------------------- LogicalRightShift -----------------------------------
-// Shorts/Chars vector logical right shift produces incorrect Java result
+// Shorts vector logical right shift produces incorrect Java result
// for negative data because java code convert short value into int with
-// sign extension before a shift.
+// sign extension before a shift. But char vectors are fine since chars are
+// unsigned values.
+
+instruct vsrl2S(vecS dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_imm(vecS dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_reg(vecS dst, vecS src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_reg_imm(vecS dst, vecS src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S(vecD dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_imm(vecD dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_reg(vecD dst, vecD src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_reg_imm(vecD dst, vecD src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S(vecX dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_imm(vecX dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_reg(vecX dst, vecX src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_reg_imm(vecX dst, vecX src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl16S_reg(vecY dst, vecY src, vecS shift) %{
+ predicate(UseAVX > 1 && n->as_Vector()->length() == 16);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed16S" %}
+ ins_encode %{
+ bool vector256 = true;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl16S_reg_imm(vecY dst, vecY src, immI8 shift) %{
+ predicate(UseAVX > 1 && n->as_Vector()->length() == 16);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed16S" %}
+ ins_encode %{
+ bool vector256 = true;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
// Integers vector logical right shift
instruct vsrl2I(vecD dst, vecS shift) %{
diff --git a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
index 123e6e2..cb9dada 100644
--- a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
@@ -30,6 +30,7 @@
#include "os_bsd.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/perfMemory.hpp"
+#include "services/memTracker.hpp"
#include "utilities/exceptions.hpp"
// put OS-includes here
@@ -753,6 +754,10 @@
// clear the shared memory region
(void)::memset((void*) mapAddress, 0, size);
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
return mapAddress;
}
@@ -912,6 +917,10 @@
"Could not map PerfMemory");
}
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/linux/vm/perfMemory_linux.cpp b/hotspot/src/os/linux/vm/perfMemory_linux.cpp
index 2adae8d..b54c5db 100644
--- a/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+++ b/hotspot/src/os/linux/vm/perfMemory_linux.cpp
@@ -30,6 +30,7 @@
#include "os_linux.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/perfMemory.hpp"
+#include "services/memTracker.hpp"
#include "utilities/exceptions.hpp"
// put OS-includes here
@@ -753,6 +754,10 @@
// clear the shared memory region
(void)::memset((void*) mapAddress, 0, size);
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
return mapAddress;
}
@@ -912,6 +917,10 @@
"Could not map PerfMemory");
}
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 0483dcb..e3415b8 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -55,6 +55,7 @@
#include "runtime/threadCritical.hpp"
#include "runtime/timer.hpp"
#include "services/attachListener.hpp"
+#include "services/memTracker.hpp"
#include "services/runtimeService.hpp"
#include "thread_solaris.inline.hpp"
#include "utilities/decoder.hpp"
@@ -3072,11 +3073,12 @@
// Since snv_84, Solaris attempts to honor the address hint - see 5003415.
// Give it a try, if the kernel honors the hint we can return immediately.
char* addr = Solaris::anon_mmap(requested_addr, bytes, 0, false);
+
volatile int err = errno;
if (addr == requested_addr) {
return addr;
} else if (addr != NULL) {
- unmap_memory(addr, bytes);
+ pd_unmap_memory(addr, bytes);
}
if (PrintMiscellaneous && Verbose) {
diff --git a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp b/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
index c24789c..ebbc00b 100644
--- a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
@@ -30,6 +30,7 @@
#include "os_solaris.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/perfMemory.hpp"
+#include "services/memTracker.hpp"
#include "utilities/exceptions.hpp"
// put OS-includes here
@@ -768,6 +769,10 @@
// clear the shared memory region
(void)::memset((void*) mapAddress, 0, size);
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
return mapAddress;
}
@@ -927,6 +932,10 @@
"Could not map PerfMemory");
}
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/windows/vm/perfMemory_windows.cpp b/hotspot/src/os/windows/vm/perfMemory_windows.cpp
index 2c75539..061c9d8 100644
--- a/hotspot/src/os/windows/vm/perfMemory_windows.cpp
+++ b/hotspot/src/os/windows/vm/perfMemory_windows.cpp
@@ -30,6 +30,7 @@
#include "os_windows.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/perfMemory.hpp"
+#include "services/memTracker.hpp"
#include "utilities/exceptions.hpp"
#include <windows.h>
@@ -1496,6 +1497,10 @@
// clear the shared memory region
(void)memset(mapAddress, '\0', size);
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
return (char*) mapAddress;
}
@@ -1672,6 +1677,11 @@
"Could not map PerfMemory");
}
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC);
+ MemTracker::record_virtual_memory_type((address)mapAddress, mtInternal);
+
+
*addrp = (char*)mapAddress;
*sizep = size;
@@ -1824,6 +1834,8 @@
}
remove_file_mapping(addr);
+ // it does not go through os api, the operation has to record from here
+ MemTracker::record_virtual_memory_release((address)addr, bytes);
}
char* PerfMemory::backing_store_filename() {
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index 1bbdc5a..941dd12 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1844,17 +1844,12 @@
code == Bytecodes::_invokevirtual && target->is_final_method() ||
code == Bytecodes::_invokedynamic) {
ciMethod* inline_target = (cha_monomorphic_target != NULL) ? cha_monomorphic_target : target;
- bool success = false;
- if (target->is_method_handle_intrinsic()) {
- // method handle invokes
- success = try_method_handle_inline(target);
- } else {
- // static binding => check if callee is ok
- success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL), code, better_receiver);
- }
- CHECK_BAILOUT();
+ // static binding => check if callee is ok
+ bool success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL), code, better_receiver);
+ CHECK_BAILOUT();
clear_inline_bailout();
+
if (success) {
// Register dependence if JVMTI has either breakpoint
// setting or hotswapping of methods capabilities since they may
@@ -3201,6 +3196,11 @@
return false;
}
+ // method handle invokes
+ if (callee->is_method_handle_intrinsic()) {
+ return try_method_handle_inline(callee);
+ }
+
// handle intrinsics
if (callee->intrinsic_id() != vmIntrinsics::_none) {
if (try_inline_intrinsics(callee)) {
@@ -3885,10 +3885,14 @@
ValueType* type = state()->stack_at(args_base)->type();
if (type->is_constant()) {
ciMethod* target = type->as_ObjectType()->constant_value()->as_method_handle()->get_vmtarget();
- guarantee(!target->is_method_handle_intrinsic(), "should not happen"); // XXX remove
- Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
- if (try_inline(target, /*holder_known*/ true, bc)) {
- return true;
+ // We don't do CHA here so only inline static and statically bindable methods.
+ if (target->is_static() || target->can_be_statically_bound()) {
+ Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
+ if (try_inline(target, /*holder_known*/ true, bc)) {
+ return true;
+ }
+ } else {
+ print_inlining(target, "not static or statically bindable", /*success*/ false);
}
} else {
print_inlining(callee, "receiver not constant", /*success*/ false);
@@ -3941,9 +3945,14 @@
}
j += t->size(); // long and double take two slots
}
- Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
- if (try_inline(target, /*holder_known*/ true, bc)) {
- return true;
+ // We don't do CHA here so only inline static and statically bindable methods.
+ if (target->is_static() || target->can_be_statically_bound()) {
+ Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
+ if (try_inline(target, /*holder_known*/ true, bc)) {
+ return true;
+ }
+ } else {
+ print_inlining(target, "not static or statically bindable", /*success*/ false);
}
}
} else {
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 06fdb35..2febc7b 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -110,6 +110,7 @@
template(sun_jkernel_DownloadManager, "sun/jkernel/DownloadManager") \
template(getBootClassPathEntryForClass_name, "getBootClassPathEntryForClass") \
template(sun_misc_PostVMInitHook, "sun/misc/PostVMInitHook") \
+ template(sun_misc_Launcher_ExtClassLoader, "sun/misc/Launcher$ExtClassLoader") \
\
/* Java runtime version access */ \
template(sun_misc_Version, "sun/misc/Version") \
@@ -723,6 +724,21 @@
/* java/lang/ref/Reference */ \
do_intrinsic(_Reference_get, java_lang_ref_Reference, get_name, void_object_signature, F_R) \
\
+ /* support for com.sum.crypto.provider.AESCrypt and some of its callers */ \
+ do_class(com_sun_crypto_provider_aescrypt, "com/sun/crypto/provider/AESCrypt") \
+ do_intrinsic(_aescrypt_encryptBlock, com_sun_crypto_provider_aescrypt, encryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \
+ do_intrinsic(_aescrypt_decryptBlock, com_sun_crypto_provider_aescrypt, decryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \
+ do_name( encryptBlock_name, "encryptBlock") \
+ do_name( decryptBlock_name, "decryptBlock") \
+ do_signature(byteArray_int_byteArray_int_signature, "([BI[BI)V") \
+ \
+ do_class(com_sun_crypto_provider_cipherBlockChaining, "com/sun/crypto/provider/CipherBlockChaining") \
+ do_intrinsic(_cipherBlockChaining_encryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, encrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \
+ do_intrinsic(_cipherBlockChaining_decryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, decrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \
+ do_name( encrypt_name, "encrypt") \
+ do_name( decrypt_name, "decrypt") \
+ do_signature(byteArray_int_int_byteArray_int_signature, "([BII[BI)V") \
+ \
/* support for sun.misc.Unsafe */ \
do_class(sun_misc_Unsafe, "sun/misc/Unsafe") \
\
diff --git a/hotspot/src/share/vm/compiler/compilerOracle.cpp b/hotspot/src/share/vm/compiler/compilerOracle.cpp
index bdd3491..bf691bc 100644
--- a/hotspot/src/share/vm/compiler/compilerOracle.cpp
+++ b/hotspot/src/share/vm/compiler/compilerOracle.cpp
@@ -574,7 +574,7 @@
char token[1024];
int pos = 0;
int c = getc(stream);
- while(c != EOF) {
+ while(c != EOF && pos < (int)(sizeof(token)-1)) {
if (c == '\n') {
token[pos++] = '\0';
parse_from_line(token);
@@ -595,7 +595,7 @@
int pos = 0;
const char* sp = str;
int c = *sp++;
- while (c != '\0') {
+ while (c != '\0' && pos < (int)(sizeof(token)-1)) {
if (c == '\n') {
token[pos++] = '\0';
parse_line(token);
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp
new file mode 100644
index 0000000..01e0e87
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
+#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "memory/freeBlockDictionary.hpp"
+#include "memory/sharedHeap.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/mutex.hpp"
+#include "runtime/vmThread.hpp"
+
+template <>
+void AdaptiveFreeList<FreeChunk>::print_on(outputStream* st, const char* c) const {
+ if (c != NULL) {
+ st->print("%16s", c);
+ } else {
+ st->print(SIZE_FORMAT_W(16), size());
+ }
+ st->print("\t"
+ SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t"
+ SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\n",
+ bfr_surp(), surplus(), desired(), prev_sweep(), before_sweep(),
+ count(), coal_births(), coal_deaths(), split_births(), split_deaths());
+}
+
+template <class Chunk>
+AdaptiveFreeList<Chunk>::AdaptiveFreeList() : FreeList<Chunk>(), _hint(0) {
+ init_statistics();
+}
+
+template <class Chunk>
+AdaptiveFreeList<Chunk>::AdaptiveFreeList(Chunk* fc) : FreeList<Chunk>(fc), _hint(0) {
+ init_statistics();
+#ifndef PRODUCT
+ _allocation_stats.set_returned_bytes(size() * HeapWordSize);
+#endif
+}
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::initialize() {
+ FreeList<Chunk>::initialize();
+ set_hint(0);
+ init_statistics(true /* split_birth */);
+}
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::reset(size_t hint) {
+ FreeList<Chunk>::reset();
+ set_hint(hint);
+}
+
+#ifndef PRODUCT
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::assert_proper_lock_protection_work() const {
+ assert(protecting_lock() != NULL, "Don't call this directly");
+ assert(ParallelGCThreads > 0, "Don't call this directly");
+ Thread* thr = Thread::current();
+ if (thr->is_VM_thread() || thr->is_ConcurrentGC_thread()) {
+ // assert that we are holding the freelist lock
+ } else if (thr->is_GC_task_thread()) {
+ assert(protecting_lock()->owned_by_self(), "FreeList RACE DETECTED");
+ } else if (thr->is_Java_thread()) {
+ assert(!SafepointSynchronize::is_at_safepoint(), "Should not be executing");
+ } else {
+ ShouldNotReachHere(); // unaccounted thread type?
+ }
+}
+#endif
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::init_statistics(bool split_birth) {
+ _allocation_stats.initialize(split_birth);
+}
+
+template <class Chunk>
+size_t AdaptiveFreeList<Chunk>::get_better_size() {
+
+ // A candidate chunk has been found. If it is already under
+ // populated and there is a hinT, REturn the hint(). Else
+ // return the size of this chunk.
+ if (surplus() <= 0) {
+ if (hint() != 0) {
+ return hint();
+ } else {
+ return size();
+ }
+ } else {
+ // This list has a surplus so use it.
+ return size();
+ }
+}
+
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::return_chunk_at_head(Chunk* chunk) {
+ assert_proper_lock_protection();
+ return_chunk_at_head(chunk, true);
+}
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::return_chunk_at_head(Chunk* chunk, bool record_return) {
+ FreeList<Chunk>::return_chunk_at_head(chunk, record_return);
+#ifdef ASSERT
+ if (record_return) {
+ increment_returned_bytes_by(size()*HeapWordSize);
+ }
+#endif
+}
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk) {
+ return_chunk_at_tail(chunk, true);
+}
+
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk, bool record_return) {
+ FreeList<Chunk>::return_chunk_at_tail(chunk, record_return);
+#ifdef ASSERT
+ if (record_return) {
+ increment_returned_bytes_by(size()*HeapWordSize);
+ }
+#endif
+}
+
+#ifndef PRODUCT
+template <class Chunk>
+void AdaptiveFreeList<Chunk>::verify_stats() const {
+ // The +1 of the LH comparand is to allow some "looseness" in
+ // checking: we usually call this interface when adding a block
+ // and we'll subsequently update the stats; we cannot update the
+ // stats beforehand because in the case of the large-block BT
+ // dictionary for example, this might be the first block and
+ // in that case there would be no place that we could record
+ // the stats (which are kept in the block itself).
+ assert((_allocation_stats.prev_sweep() + _allocation_stats.split_births()
+ + _allocation_stats.coal_births() + 1) // Total Production Stock + 1
+ >= (_allocation_stats.split_deaths() + _allocation_stats.coal_deaths()
+ + (ssize_t)count()), // Total Current Stock + depletion
+ err_msg("FreeList " PTR_FORMAT " of size " SIZE_FORMAT
+ " violates Conservation Principle: "
+ "prev_sweep(" SIZE_FORMAT ")"
+ " + split_births(" SIZE_FORMAT ")"
+ " + coal_births(" SIZE_FORMAT ") + 1 >= "
+ " split_deaths(" SIZE_FORMAT ")"
+ " coal_deaths(" SIZE_FORMAT ")"
+ " + count(" SSIZE_FORMAT ")",
+ this, size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(),
+ _allocation_stats.split_births(), _allocation_stats.split_deaths(),
+ _allocation_stats.coal_deaths(), count()));
+}
+#endif
+
+// Needs to be after the definitions have been seen.
+template class AdaptiveFreeList<FreeChunk>;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp
new file mode 100644
index 0000000..8b56bb1
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2001, 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.
+ *
+ * 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_VM_MEMORY_ADAPTIVEFREELIST_HPP
+#define SHARE_VM_MEMORY_ADAPTIVEFREELIST_HPP
+
+#include "memory/freeList.hpp"
+#include "gc_implementation/shared/allocationStats.hpp"
+
+class CompactibleFreeListSpace;
+
+// A class for maintaining a free list of Chunk's. The FreeList
+// maintains a the structure of the list (head, tail, etc.) plus
+// statistics for allocations from the list. The links between items
+// are not part of FreeList. The statistics are
+// used to make decisions about coalescing Chunk's when they
+// are swept during collection.
+//
+// See the corresponding .cpp file for a description of the specifics
+// for that implementation.
+
+class Mutex;
+
+template <class Chunk>
+class AdaptiveFreeList : public FreeList<Chunk> {
+ friend class CompactibleFreeListSpace;
+ friend class VMStructs;
+ // friend class PrintTreeCensusClosure<Chunk, FreeList_t>;
+
+ size_t _hint; // next larger size list with a positive surplus
+
+ AllocationStats _allocation_stats; // allocation-related statistics
+
+ public:
+
+ AdaptiveFreeList();
+ AdaptiveFreeList(Chunk* fc);
+
+ using FreeList<Chunk>::assert_proper_lock_protection;
+#ifdef ASSERT
+ using FreeList<Chunk>::protecting_lock;
+#endif
+ using FreeList<Chunk>::count;
+ using FreeList<Chunk>::size;
+ using FreeList<Chunk>::verify_chunk_in_free_list;
+ using FreeList<Chunk>::getFirstNChunksFromList;
+ using FreeList<Chunk>::print_on;
+ void return_chunk_at_head(Chunk* fc, bool record_return);
+ void return_chunk_at_head(Chunk* fc);
+ void return_chunk_at_tail(Chunk* fc, bool record_return);
+ void return_chunk_at_tail(Chunk* fc);
+ using FreeList<Chunk>::return_chunk_at_tail;
+ using FreeList<Chunk>::remove_chunk;
+ using FreeList<Chunk>::prepend;
+ using FreeList<Chunk>::print_labels_on;
+ using FreeList<Chunk>::get_chunk_at_head;
+
+ // Initialize.
+ void initialize();
+
+ // Reset the head, tail, hint, and count of a free list.
+ void reset(size_t hint);
+
+ void assert_proper_lock_protection_work() const PRODUCT_RETURN;
+
+ void print_on(outputStream* st, const char* c = NULL) const;
+
+ size_t hint() const {
+ return _hint;
+ }
+ void set_hint(size_t v) {
+ assert_proper_lock_protection();
+ assert(v == 0 || size() < v, "Bad hint");
+ _hint = v;
+ }
+
+ size_t get_better_size();
+
+ // Accessors for statistics
+ void init_statistics(bool split_birth = false);
+
+ AllocationStats* allocation_stats() {
+ assert_proper_lock_protection();
+ return &_allocation_stats;
+ }
+
+ ssize_t desired() const {
+ return _allocation_stats.desired();
+ }
+ void set_desired(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_desired(v);
+ }
+ void compute_desired(float inter_sweep_current,
+ float inter_sweep_estimate,
+ float intra_sweep_estimate) {
+ assert_proper_lock_protection();
+ _allocation_stats.compute_desired(count(),
+ inter_sweep_current,
+ inter_sweep_estimate,
+ intra_sweep_estimate);
+ }
+ ssize_t coal_desired() const {
+ return _allocation_stats.coal_desired();
+ }
+ void set_coal_desired(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_coal_desired(v);
+ }
+
+ ssize_t surplus() const {
+ return _allocation_stats.surplus();
+ }
+ void set_surplus(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_surplus(v);
+ }
+ void increment_surplus() {
+ assert_proper_lock_protection();
+ _allocation_stats.increment_surplus();
+ }
+ void decrement_surplus() {
+ assert_proper_lock_protection();
+ _allocation_stats.decrement_surplus();
+ }
+
+ ssize_t bfr_surp() const {
+ return _allocation_stats.bfr_surp();
+ }
+ void set_bfr_surp(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_bfr_surp(v);
+ }
+ ssize_t prev_sweep() const {
+ return _allocation_stats.prev_sweep();
+ }
+ void set_prev_sweep(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_prev_sweep(v);
+ }
+ ssize_t before_sweep() const {
+ return _allocation_stats.before_sweep();
+ }
+ void set_before_sweep(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_before_sweep(v);
+ }
+
+ ssize_t coal_births() const {
+ return _allocation_stats.coal_births();
+ }
+ void set_coal_births(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_coal_births(v);
+ }
+ void increment_coal_births() {
+ assert_proper_lock_protection();
+ _allocation_stats.increment_coal_births();
+ }
+
+ ssize_t coal_deaths() const {
+ return _allocation_stats.coal_deaths();
+ }
+ void set_coal_deaths(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_coal_deaths(v);
+ }
+ void increment_coal_deaths() {
+ assert_proper_lock_protection();
+ _allocation_stats.increment_coal_deaths();
+ }
+
+ ssize_t split_births() const {
+ return _allocation_stats.split_births();
+ }
+ void set_split_births(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_split_births(v);
+ }
+ void increment_split_births() {
+ assert_proper_lock_protection();
+ _allocation_stats.increment_split_births();
+ }
+
+ ssize_t split_deaths() const {
+ return _allocation_stats.split_deaths();
+ }
+ void set_split_deaths(ssize_t v) {
+ assert_proper_lock_protection();
+ _allocation_stats.set_split_deaths(v);
+ }
+ void increment_split_deaths() {
+ assert_proper_lock_protection();
+ _allocation_stats.increment_split_deaths();
+ }
+
+#ifndef PRODUCT
+ // For debugging. The "_returned_bytes" in all the lists are summed
+ // and compared with the total number of bytes swept during a
+ // collection.
+ size_t returned_bytes() const { return _allocation_stats.returned_bytes(); }
+ void set_returned_bytes(size_t v) { _allocation_stats.set_returned_bytes(v); }
+ void increment_returned_bytes_by(size_t v) {
+ _allocation_stats.set_returned_bytes(_allocation_stats.returned_bytes() + v);
+ }
+ // Stats verification
+ void verify_stats() const;
+#endif // NOT PRODUCT
+};
+
+#endif // SHARE_VM_MEMORY_ADAPTIVEFREELIST_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
index eac32b1..2f43c98 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
@@ -91,7 +91,7 @@
_collector(NULL)
{
assert(sizeof(FreeChunk) / BytesPerWord <= MinChunkSize,
- "FreeChunk is larger than expected");
+ "FreeChunk is larger than expected");
_bt.set_space(this);
initialize(mr, SpaceDecorator::Clear, SpaceDecorator::Mangle);
// We have all of "mr", all of which we place in the dictionary
@@ -101,14 +101,14 @@
// implementation, namely, the simple binary tree (splaying
// temporarily disabled).
switch (dictionaryChoice) {
+ case FreeBlockDictionary<FreeChunk>::dictionaryBinaryTree:
+ _dictionary = new BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>(mr);
+ break;
case FreeBlockDictionary<FreeChunk>::dictionarySplayTree:
case FreeBlockDictionary<FreeChunk>::dictionarySkipList:
default:
warning("dictionaryChoice: selected option not understood; using"
" default BinaryTreeDictionary implementation instead.");
- case FreeBlockDictionary<FreeChunk>::dictionaryBinaryTree:
- _dictionary = new BinaryTreeDictionary<FreeChunk>(mr, use_adaptive_freelists);
- break;
}
assert(_dictionary != NULL, "CMS dictionary initialization");
// The indexed free lists are initially all empty and are lazily
@@ -453,7 +453,7 @@
reportIndexedFreeListStatistics();
gclog_or_tty->print_cr("Layout of Indexed Freelists");
gclog_or_tty->print_cr("---------------------------");
- FreeList<FreeChunk>::print_labels_on(st, "size");
+ AdaptiveFreeList<FreeChunk>::print_labels_on(st, "size");
for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
_indexedFreeList[i].print_on(gclog_or_tty);
for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
@@ -1319,7 +1319,7 @@
size_t currSize = numWords + MinChunkSize;
assert(currSize % MinObjAlignment == 0, "currSize should be aligned");
for (i = currSize; i < IndexSetSize; i += IndexSetStride) {
- FreeList<FreeChunk>* fl = &_indexedFreeList[i];
+ AdaptiveFreeList<FreeChunk>* fl = &_indexedFreeList[i];
if (fl->head()) {
ret = getFromListGreater(fl, numWords);
assert(ret == NULL || ret->is_free(), "Should be returning a free chunk");
@@ -1702,7 +1702,9 @@
_dictionary->return_chunk(chunk);
#ifndef PRODUCT
if (CMSCollector::abstract_state() != CMSCollector::Sweeping) {
- TreeChunk<FreeChunk>::as_TreeChunk(chunk)->list()->verify_stats();
+ TreeChunk<FreeChunk, AdaptiveFreeList>* tc = TreeChunk<FreeChunk, AdaptiveFreeList>::as_TreeChunk(chunk);
+ TreeList<FreeChunk, AdaptiveFreeList>* tl = tc->list();
+ tl->verify_stats();
}
#endif // PRODUCT
}
@@ -1745,7 +1747,7 @@
{
MutexLockerEx x(lock, Mutex::_no_safepoint_check_flag);
ec = dictionary()->find_largest_dict(); // get largest block
- if (ec != NULL && ec->end() == chunk) {
+ if (ec != NULL && ec->end() == (uintptr_t*) chunk) {
// It's a coterminal block - we can coalesce.
size_t old_size = ec->size();
coalDeath(old_size);
@@ -1850,11 +1852,11 @@
the excess is >= MIN_CHUNK. */
size_t start = align_object_size(numWords + MinChunkSize);
if (start < IndexSetSize) {
- FreeList<FreeChunk>* it = _indexedFreeList;
+ AdaptiveFreeList<FreeChunk>* it = _indexedFreeList;
size_t hint = _indexedFreeList[start].hint();
while (hint < IndexSetSize) {
assert(hint % MinObjAlignment == 0, "hint should be aligned");
- FreeList<FreeChunk> *fl = &_indexedFreeList[hint];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[hint];
if (fl->surplus() > 0 && fl->head() != NULL) {
// Found a list with surplus, reset original hint
// and split out a free chunk which is returned.
@@ -1873,7 +1875,7 @@
}
/* Requires fl->size >= numWords + MinChunkSize */
-FreeChunk* CompactibleFreeListSpace::getFromListGreater(FreeList<FreeChunk>* fl,
+FreeChunk* CompactibleFreeListSpace::getFromListGreater(AdaptiveFreeList<FreeChunk>* fl,
size_t numWords) {
FreeChunk *curr = fl->head();
size_t oldNumWords = curr->size();
@@ -2155,7 +2157,7 @@
assert_locked();
size_t i;
for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
- FreeList<FreeChunk>* fl = &_indexedFreeList[i];
+ AdaptiveFreeList<FreeChunk>* fl = &_indexedFreeList[i];
if (PrintFLSStatistics > 1) {
gclog_or_tty->print("size[%d] : ", i);
}
@@ -2174,7 +2176,7 @@
assert_locked();
size_t i;
for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
- FreeList<FreeChunk> *fl = &_indexedFreeList[i];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
fl->set_surplus(fl->count() -
(ssize_t)((double)fl->desired() * CMSSmallSplitSurplusPercent));
}
@@ -2185,7 +2187,7 @@
size_t i;
size_t h = IndexSetSize;
for (i = IndexSetSize - 1; i != 0; i -= IndexSetStride) {
- FreeList<FreeChunk> *fl = &_indexedFreeList[i];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
fl->set_hint(h);
if (fl->surplus() > 0) {
h = i;
@@ -2197,7 +2199,7 @@
assert_locked();
size_t i;
for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
- FreeList<FreeChunk> *fl = &_indexedFreeList[i];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
fl->set_prev_sweep(fl->count());
fl->set_coal_births(0);
fl->set_coal_deaths(0);
@@ -2224,7 +2226,7 @@
bool CompactibleFreeListSpace::coalOverPopulated(size_t size) {
if (size < SmallForDictionary) {
- FreeList<FreeChunk> *fl = &_indexedFreeList[size];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[size];
return (fl->coal_desired() < 0) ||
((int)fl->count() > fl->coal_desired());
} else {
@@ -2234,14 +2236,14 @@
void CompactibleFreeListSpace::smallCoalBirth(size_t size) {
assert(size < SmallForDictionary, "Size too large for indexed list");
- FreeList<FreeChunk> *fl = &_indexedFreeList[size];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[size];
fl->increment_coal_births();
fl->increment_surplus();
}
void CompactibleFreeListSpace::smallCoalDeath(size_t size) {
assert(size < SmallForDictionary, "Size too large for indexed list");
- FreeList<FreeChunk> *fl = &_indexedFreeList[size];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[size];
fl->increment_coal_deaths();
fl->decrement_surplus();
}
@@ -2250,7 +2252,7 @@
if (size < SmallForDictionary) {
smallCoalBirth(size);
} else {
- dictionary()->dict_census_udpate(size,
+ dictionary()->dict_census_update(size,
false /* split */,
true /* birth */);
}
@@ -2260,7 +2262,7 @@
if(size < SmallForDictionary) {
smallCoalDeath(size);
} else {
- dictionary()->dict_census_udpate(size,
+ dictionary()->dict_census_update(size,
false /* split */,
false /* birth */);
}
@@ -2268,14 +2270,14 @@
void CompactibleFreeListSpace::smallSplitBirth(size_t size) {
assert(size < SmallForDictionary, "Size too large for indexed list");
- FreeList<FreeChunk> *fl = &_indexedFreeList[size];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[size];
fl->increment_split_births();
fl->increment_surplus();
}
void CompactibleFreeListSpace::smallSplitDeath(size_t size) {
assert(size < SmallForDictionary, "Size too large for indexed list");
- FreeList<FreeChunk> *fl = &_indexedFreeList[size];
+ AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[size];
fl->increment_split_deaths();
fl->decrement_surplus();
}
@@ -2284,7 +2286,7 @@
if (size < SmallForDictionary) {
smallSplitBirth(size);
} else {
- dictionary()->dict_census_udpate(size,
+ dictionary()->dict_census_update(size,
true /* split */,
true /* birth */);
}
@@ -2294,7 +2296,7 @@
if (size < SmallForDictionary) {
smallSplitDeath(size);
} else {
- dictionary()->dict_census_udpate(size,
+ dictionary()->dict_census_update(size,
true /* split */,
false /* birth */);
}
@@ -2517,10 +2519,10 @@
#ifndef PRODUCT
void CompactibleFreeListSpace::check_free_list_consistency() const {
- assert(_dictionary->min_size() <= IndexSetSize,
+ assert((TreeChunk<FreeChunk, AdaptiveFreeList>::min_size() <= IndexSetSize),
"Some sizes can't be allocated without recourse to"
" linear allocation buffers");
- assert(BinaryTreeDictionary<FreeChunk>::min_tree_chunk_size*HeapWordSize == sizeof(TreeChunk<FreeChunk>),
+ assert((TreeChunk<FreeChunk, AdaptiveFreeList>::min_size()*HeapWordSize == sizeof(TreeChunk<FreeChunk, AdaptiveFreeList>)),
"else MIN_TREE_CHUNK_SIZE is wrong");
assert(IndexSetStart != 0, "IndexSetStart not initialized");
assert(IndexSetStride != 0, "IndexSetStride not initialized");
@@ -2529,15 +2531,15 @@
void CompactibleFreeListSpace::printFLCensus(size_t sweep_count) const {
assert_lock_strong(&_freelistLock);
- FreeList<FreeChunk> total;
+ AdaptiveFreeList<FreeChunk> total;
gclog_or_tty->print("end sweep# " SIZE_FORMAT "\n", sweep_count);
- FreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
+ AdaptiveFreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
size_t total_free = 0;
for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
- const FreeList<FreeChunk> *fl = &_indexedFreeList[i];
+ const AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
total_free += fl->count() * fl->size();
if (i % (40*IndexSetStride) == 0) {
- FreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
+ AdaptiveFreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
}
fl->print_on(gclog_or_tty);
total.set_bfr_surp( total.bfr_surp() + fl->bfr_surp() );
@@ -2620,7 +2622,7 @@
res = _cfls->getChunkFromDictionaryExact(word_sz);
if (res == NULL) return NULL;
} else {
- FreeList<FreeChunk>* fl = &_indexedFreeList[word_sz];
+ AdaptiveFreeList<FreeChunk>* fl = &_indexedFreeList[word_sz];
if (fl->count() == 0) {
// Attempt to refill this local free list.
get_from_global_pool(word_sz, fl);
@@ -2640,7 +2642,7 @@
// Get a chunk of blocks of the right size and update related
// book-keeping stats
-void CFLS_LAB::get_from_global_pool(size_t word_sz, FreeList<FreeChunk>* fl) {
+void CFLS_LAB::get_from_global_pool(size_t word_sz, AdaptiveFreeList<FreeChunk>* fl) {
// Get the #blocks we want to claim
size_t n_blks = (size_t)_blocks_to_claim[word_sz].average();
assert(n_blks > 0, "Error");
@@ -2722,7 +2724,7 @@
if (num_retire > 0) {
_cfls->_indexedFreeList[i].prepend(&_indexedFreeList[i]);
// Reset this list.
- _indexedFreeList[i] = FreeList<FreeChunk>();
+ _indexedFreeList[i] = AdaptiveFreeList<FreeChunk>();
_indexedFreeList[i].set_size(i);
}
}
@@ -2736,7 +2738,7 @@
}
}
-void CompactibleFreeListSpace:: par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList<FreeChunk>* fl) {
+void CompactibleFreeListSpace:: par_get_chunk_of_blocks(size_t word_sz, size_t n, AdaptiveFreeList<FreeChunk>* fl) {
assert(fl->count() == 0, "Precondition.");
assert(word_sz < CompactibleFreeListSpace::IndexSetSize,
"Precondition");
@@ -2752,12 +2754,12 @@
(cur_sz < CompactibleFreeListSpace::IndexSetSize) &&
(CMSSplitIndexedFreeListBlocks || k <= 1);
k++, cur_sz = k * word_sz) {
- FreeList<FreeChunk> fl_for_cur_sz; // Empty.
+ AdaptiveFreeList<FreeChunk> fl_for_cur_sz; // Empty.
fl_for_cur_sz.set_size(cur_sz);
{
MutexLockerEx x(_indexedFreeListParLocks[cur_sz],
Mutex::_no_safepoint_check_flag);
- FreeList<FreeChunk>* gfl = &_indexedFreeList[cur_sz];
+ AdaptiveFreeList<FreeChunk>* gfl = &_indexedFreeList[cur_sz];
if (gfl->count() != 0) {
// nn is the number of chunks of size cur_sz that
// we'd need to split k-ways each, in order to create
@@ -2832,12 +2834,11 @@
MutexLockerEx x(parDictionaryAllocLock(),
Mutex::_no_safepoint_check_flag);
while (n > 0) {
- fc = dictionary()->get_chunk(MAX2(n * word_sz,
- _dictionary->min_size()),
+ fc = dictionary()->get_chunk(MAX2(n * word_sz, _dictionary->min_size()),
FreeBlockDictionary<FreeChunk>::atLeast);
if (fc != NULL) {
_bt.allocated((HeapWord*)fc, fc->size(), true /* reducing */); // update _unallocated_blk
- dictionary()->dict_census_udpate(fc->size(),
+ dictionary()->dict_census_update(fc->size(),
true /*split*/,
false /*birth*/);
break;
@@ -2890,7 +2891,7 @@
fc->set_size(prefix_size);
if (rem >= IndexSetSize) {
returnChunkToDictionary(rem_fc);
- dictionary()->dict_census_udpate(rem, true /*split*/, true /*birth*/);
+ dictionary()->dict_census_update(rem, true /*split*/, true /*birth*/);
rem_fc = NULL;
}
// Otherwise, return it to the small list below.
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
index 4d24735..1b3d93e 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP
#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP
+#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
#include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp"
#include "memory/binaryTreeDictionary.hpp"
#include "memory/blockOffsetTable.inline.hpp"
@@ -38,6 +39,7 @@
class CompactibleFreeListSpace;
class BlkClosure;
class BlkClosureCareful;
+class FreeChunk;
class UpwardsObjectClosure;
class ObjectClosureCareful;
class Klass;
@@ -131,7 +133,7 @@
FreeBlockDictionary<FreeChunk>::DictionaryChoice _dictionaryChoice;
FreeBlockDictionary<FreeChunk>* _dictionary; // ptr to dictionary for large size blocks
- FreeList<FreeChunk> _indexedFreeList[IndexSetSize];
+ AdaptiveFreeList<FreeChunk> _indexedFreeList[IndexSetSize];
// indexed array for small size blocks
// allocation stategy
bool _fitStrategy; // Use best fit strategy.
@@ -168,7 +170,7 @@
// If the count of "fl" is negative, it's absolute value indicates a
// number of free chunks that had been previously "borrowed" from global
// list of size "word_sz", and must now be decremented.
- void par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList<FreeChunk>* fl);
+ void par_get_chunk_of_blocks(size_t word_sz, size_t n, AdaptiveFreeList<FreeChunk>* fl);
// Allocation helper functions
// Allocate using a strategy that takes from the indexed free lists
@@ -214,7 +216,7 @@
// and return it. The split off remainder is returned to
// the free lists. The old name for getFromListGreater
// was lookInListGreater.
- FreeChunk* getFromListGreater(FreeList<FreeChunk>* fl, size_t numWords);
+ FreeChunk* getFromListGreater(AdaptiveFreeList<FreeChunk>* fl, size_t numWords);
// Get a chunk in the indexed free list or dictionary,
// by considering a larger chunk and splitting it.
FreeChunk* getChunkFromGreater(size_t numWords);
@@ -621,7 +623,7 @@
CompactibleFreeListSpace* _cfls;
// Our local free lists.
- FreeList<FreeChunk> _indexedFreeList[CompactibleFreeListSpace::IndexSetSize];
+ AdaptiveFreeList<FreeChunk> _indexedFreeList[CompactibleFreeListSpace::IndexSetSize];
// Initialized from a command-line arg.
@@ -634,7 +636,7 @@
size_t _num_blocks [CompactibleFreeListSpace::IndexSetSize];
// Internal work method
- void get_from_global_pool(size_t word_sz, FreeList<FreeChunk>* fl);
+ void get_from_global_pool(size_t word_sz, AdaptiveFreeList<FreeChunk>* fl);
public:
CFLS_LAB(CompactibleFreeListSpace* cfls);
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index ac8b700..475f2b8 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -9143,7 +9143,7 @@
size_t shrinkable_size_in_bytes = chunk_at_end->size();
size_t aligned_shrinkable_size_in_bytes =
align_size_down(shrinkable_size_in_bytes, os::vm_page_size());
- assert(unallocated_start <= chunk_at_end->end(),
+ assert(unallocated_start <= (HeapWord*) chunk_at_end->end(),
"Inconsistent chunk at end of space");
size_t bytes = MIN2(desired_bytes, aligned_shrinkable_size_in_bytes);
size_t word_size_before = heap_word_size(_virtual_space.committed_size());
@@ -9210,7 +9210,7 @@
assert(_cmsSpace->unallocated_block() <= _cmsSpace->end(),
"Inconsistency at end of space");
- assert(chunk_at_end->end() == _cmsSpace->end(),
+ assert(chunk_at_end->end() == (uintptr_t*) _cmsSpace->end(),
"Shrinking is inconsistent");
return;
}
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
index 21934bc..8376e87 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
@@ -133,7 +133,7 @@
}
// Return the address past the end of this chunk
- HeapWord* end() const { return ((HeapWord*) this) + size(); }
+ uintptr_t* end() const { return ((uintptr_t*) this) + size(); }
// debugging
void verify() const PRODUCT_RETURN;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
index c393a55..b722779 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
@@ -25,6 +25,8 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
+typedef BinaryTreeDictionary<FreeChunk, AdaptiveFreeList> AFLBinaryTreeDictionary;
+
#define VM_STRUCTS_CMS(nonstatic_field, \
volatile_nonstatic_field, \
static_field) \
@@ -38,14 +40,8 @@
nonstatic_field(CMSCollector, _markBitMap, CMSBitMap) \
nonstatic_field(ConcurrentMarkSweepGeneration, _cmsSpace, CompactibleFreeListSpace*) \
static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \
- volatile_nonstatic_field(FreeChunk, _size, size_t) \
- nonstatic_field(FreeChunk, _next, FreeChunk*) \
- nonstatic_field(FreeChunk, _prev, FreeChunk*) \
nonstatic_field(LinearAllocBlock, _word_size, size_t) \
- nonstatic_field(FreeList<FreeChunk>, _size, size_t) \
- nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \
- nonstatic_field(BinaryTreeDictionary<FreeChunk>,_total_size, size_t) \
- nonstatic_field(CompactibleFreeListSpace, _dictionary, FreeBlockDictionary<FreeChunk>*) \
+ nonstatic_field(AFLBinaryTreeDictionary, _total_size, size_t) \
nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], FreeList<FreeChunk>) \
nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock)
@@ -60,19 +56,17 @@
declare_toplevel_type(CMSCollector) \
declare_toplevel_type(CMSBitMap) \
declare_toplevel_type(FreeChunk) \
+ declare_toplevel_type(Metablock) \
declare_toplevel_type(ConcurrentMarkSweepThread*) \
declare_toplevel_type(ConcurrentMarkSweepGeneration*) \
declare_toplevel_type(SurrogateLockerThread*) \
declare_toplevel_type(CompactibleFreeListSpace*) \
declare_toplevel_type(CMSCollector*) \
- declare_toplevel_type(FreeChunk*) \
- declare_toplevel_type(BinaryTreeDictionary<FreeChunk>*) \
- declare_toplevel_type(FreeBlockDictionary<FreeChunk>*) \
- declare_toplevel_type(FreeList<FreeChunk>*) \
- declare_toplevel_type(FreeList<FreeChunk>) \
+ declare_toplevel_type(AFLBinaryTreeDictionary*) \
declare_toplevel_type(LinearAllocBlock) \
declare_toplevel_type(FreeBlockDictionary<FreeChunk>) \
- declare_type(BinaryTreeDictionary<FreeChunk>, FreeBlockDictionary<FreeChunk>)
+ declare_type(AFLBinaryTreeDictionary, FreeBlockDictionary<FreeChunk>) \
+ declare_type(AFLBinaryTreeDictionary, FreeBlockDictionary<FreeChunk>) \
#define VM_INT_CONSTANTS_CMS(declare_constant) \
declare_constant(Generation::ConcurrentMarkSweep) \
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
index 3966877..285ef97 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
@@ -191,7 +191,7 @@
class VM_CollectForMetadataAllocation: public VM_GC_Operation {
private:
MetaWord* _result;
- size_t _size; // size of object to be allocated
+ size_t _size; // size of object to be allocated
Metaspace::MetadataType _mdtype;
ClassLoaderData* _loader_data;
public:
diff --git a/hotspot/src/share/vm/memory/allocation.cpp b/hotspot/src/share/vm/memory/allocation.cpp
index 56c7b63..92b335b 100644
--- a/hotspot/src/share/vm/memory/allocation.cpp
+++ b/hotspot/src/share/vm/memory/allocation.cpp
@@ -433,19 +433,18 @@
NOT_PRODUCT(Atomic::inc(&_instance_count);)
}
-Arena::Arena(Arena *a) : _chunk(a->_chunk), _hwm(a->_hwm), _max(a->_max), _first(a->_first) {
- set_size_in_bytes(a->size_in_bytes());
- NOT_PRODUCT(Atomic::inc(&_instance_count);)
-}
-
-
Arena *Arena::move_contents(Arena *copy) {
copy->destruct_contents();
copy->_chunk = _chunk;
copy->_hwm = _hwm;
copy->_max = _max;
copy->_first = _first;
- copy->set_size_in_bytes(size_in_bytes());
+
+ // workaround rare racing condition, which could double count
+ // the arena size by native memory tracking
+ size_t size = size_in_bytes();
+ set_size_in_bytes(0);
+ copy->set_size_in_bytes(size);
// Destroy original arena
reset();
return copy; // Return Arena with contents
@@ -497,6 +496,9 @@
char* end = _first->next() ? _first->top() : _hwm;
free_malloced_objects(_first, _first->bottom(), end, _hwm);
}
+ // reset size before chop to avoid a rare racing condition
+ // that can have total arena memory exceed total chunk memory
+ set_size_in_bytes(0);
_first->chop();
reset();
}
diff --git a/hotspot/src/share/vm/memory/allocation.hpp b/hotspot/src/share/vm/memory/allocation.hpp
index 30662b8..892e50d 100644
--- a/hotspot/src/share/vm/memory/allocation.hpp
+++ b/hotspot/src/share/vm/memory/allocation.hpp
@@ -144,8 +144,10 @@
mtNMT = 0x0A00, // memory used by native memory tracking
mtChunk = 0x0B00, // chunk that holds content of arenas
mtJavaHeap = 0x0C00, // Java heap
- mtDontTrack = 0x0D00, // memory we donot or cannot track
- mt_number_of_types = 0x000C, // number of memory types
+ mtClassShared = 0x0D00, // class data sharing
+ mt_number_of_types = 0x000D, // number of memory types (mtDontTrack
+ // is not included as validate type)
+ mtDontTrack = 0x0E00, // memory we do not or cannot track
mt_masks = 0x7F00,
// object type mask
@@ -342,7 +344,6 @@
public:
Arena();
Arena(size_t init_size);
- Arena(Arena *old);
~Arena();
void destruct_contents();
char* hwm() const { return _hwm; }
diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
index 08a9b03..f79d149 100644
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
@@ -25,9 +25,15 @@
#include "precompiled.hpp"
#include "gc_implementation/shared/allocationStats.hpp"
#include "memory/binaryTreeDictionary.hpp"
+#include "memory/freeList.hpp"
+#include "memory/freeBlockDictionary.hpp"
+#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
#include "runtime/globals.hpp"
#include "utilities/ostream.hpp"
#ifndef SERIALGC
+#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
+#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
#include "gc_implementation/shared/spaceDecorator.hpp"
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
#endif // SERIALGC
@@ -37,15 +43,18 @@
// This is currently used in the Concurrent Mark&Sweep implementation.
////////////////////////////////////////////////////////////////////////////////
-template <class Chunk>
-TreeChunk<Chunk>* TreeChunk<Chunk>::as_TreeChunk(Chunk* fc) {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize;
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>* TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(Chunk_t* fc) {
// Do some assertion checking here.
- return (TreeChunk<Chunk>*) fc;
+ return (TreeChunk<Chunk_t, FreeList_t>*) fc;
}
-template <class Chunk>
-void TreeChunk<Chunk>::verify_tree_chunk_list() const {
- TreeChunk<Chunk>* nextTC = (TreeChunk<Chunk>*)next();
+template <class Chunk_t, template <class> class FreeList_t>
+void TreeChunk<Chunk_t, FreeList_t>::verify_tree_chunk_list() const {
+ TreeChunk<Chunk_t, FreeList_t>* nextTC = (TreeChunk<Chunk_t, FreeList_t>*)next();
if (prev() != NULL) { // interior list node shouldn'r have tree fields
guarantee(embedded_list()->parent() == NULL && embedded_list()->left() == NULL &&
embedded_list()->right() == NULL, "should be clear");
@@ -57,53 +66,113 @@
}
}
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>::TreeList() {}
-template <class Chunk>
-TreeList<Chunk>* TreeList<Chunk>::as_TreeList(TreeChunk<Chunk>* tc) {
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>*
+TreeList<Chunk_t, FreeList_t>::as_TreeList(TreeChunk<Chunk_t,FreeList_t>* tc) {
// This first free chunk in the list will be the tree list.
- assert(tc->size() >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "Chunk is too small for a TreeChunk");
- TreeList<Chunk>* tl = tc->embedded_list();
+ assert((tc->size() >= (TreeChunk<Chunk_t, FreeList_t>::min_size())),
+ "Chunk is too small for a TreeChunk");
+ TreeList<Chunk_t, FreeList_t>* tl = tc->embedded_list();
+ tl->initialize();
tc->set_list(tl);
-#ifdef ASSERT
- tl->set_protecting_lock(NULL);
-#endif
- tl->set_hint(0);
tl->set_size(tc->size());
tl->link_head(tc);
tl->link_tail(tc);
tl->set_count(1);
- tl->init_statistics(true /* split_birth */);
- tl->set_parent(NULL);
- tl->set_left(NULL);
- tl->set_right(NULL);
+
return tl;
}
-template <class Chunk>
-TreeList<Chunk>* TreeList<Chunk>::as_TreeList(HeapWord* addr, size_t size) {
- TreeChunk<Chunk>* tc = (TreeChunk<Chunk>*) addr;
- assert(size >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "Chunk is too small for a TreeChunk");
- // The space in the heap will have been mangled initially but
- // is not remangled when a free chunk is returned to the free list
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>*
+get_chunk(size_t size, enum FreeBlockDictionary<Chunk_t>::Dither dither) {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
+ Chunk_t* res = get_chunk_from_tree(size, dither);
+ assert(res == NULL || res->is_free(),
+ "Should be returning a free chunk");
+ assert(dither != FreeBlockDictionary<Chunk_t>::exactly ||
+ res->size() == size, "Not correct size");
+ return res;
+}
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>*
+TreeList<Chunk_t, FreeList_t>::as_TreeList(HeapWord* addr, size_t size) {
+ TreeChunk<Chunk_t, FreeList_t>* tc = (TreeChunk<Chunk_t, FreeList_t>*) addr;
+ assert((size >= TreeChunk<Chunk_t, FreeList_t>::min_size()),
+ "Chunk is too small for a TreeChunk");
+ // The space will have been mangled initially but
+ // is not remangled when a Chunk_t is returned to the free list
// (since it is used to maintain the chunk on the free list).
- assert((ZapUnusedHeapArea &&
- SpaceMangler::is_mangled((HeapWord*) tc->size_addr()) &&
- SpaceMangler::is_mangled((HeapWord*) tc->prev_addr()) &&
- SpaceMangler::is_mangled((HeapWord*) tc->next_addr())) ||
- (tc->size() == 0 && tc->prev() == NULL && tc->next() == NULL),
- "Space should be clear or mangled");
+ tc->assert_is_mangled();
tc->set_size(size);
tc->link_prev(NULL);
tc->link_next(NULL);
- TreeList<Chunk>* tl = TreeList<Chunk>::as_TreeList(tc);
+ TreeList<Chunk_t, FreeList_t>* tl = TreeList<Chunk_t, FreeList_t>::as_TreeList(tc);
return tl;
}
-template <class Chunk>
-TreeList<Chunk>* TreeList<Chunk>::remove_chunk_replace_if_needed(TreeChunk<Chunk>* tc) {
- TreeList<Chunk>* retTL = this;
- Chunk* list = head();
+#ifndef SERIALGC
+// Specialize for AdaptiveFreeList which tries to avoid
+// splitting a chunk of a size that is under populated in favor of
+// an over populated size. The general get_better_list() just returns
+// the current list.
+template <>
+TreeList<FreeChunk, AdaptiveFreeList>*
+TreeList<FreeChunk, AdaptiveFreeList>::get_better_list(
+ BinaryTreeDictionary<FreeChunk, ::AdaptiveFreeList>* dictionary) {
+ // A candidate chunk has been found. If it is already under
+ // populated, get a chunk associated with the hint for this
+ // chunk.
+
+ TreeList<FreeChunk, ::AdaptiveFreeList>* curTL = this;
+ if (surplus() <= 0) {
+ /* Use the hint to find a size with a surplus, and reset the hint. */
+ TreeList<FreeChunk, ::AdaptiveFreeList>* hintTL = this;
+ while (hintTL->hint() != 0) {
+ assert(hintTL->hint() > hintTL->size(),
+ "hint points in the wrong direction");
+ hintTL = dictionary->find_list(hintTL->hint());
+ assert(curTL != hintTL, "Infinite loop");
+ if (hintTL == NULL ||
+ hintTL == curTL /* Should not happen but protect against it */ ) {
+ // No useful hint. Set the hint to NULL and go on.
+ curTL->set_hint(0);
+ break;
+ }
+ assert(hintTL->size() > curTL->size(), "hint is inconsistent");
+ if (hintTL->surplus() > 0) {
+ // The hint led to a list that has a surplus. Use it.
+ // Set the hint for the candidate to an overpopulated
+ // size.
+ curTL->set_hint(hintTL->size());
+ // Change the candidate.
+ curTL = hintTL;
+ break;
+ }
+ }
+ }
+ return curTL;
+}
+#endif // SERIALGC
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>*
+TreeList<Chunk_t, FreeList_t>::get_better_list(
+ BinaryTreeDictionary<Chunk_t, FreeList_t>* dictionary) {
+ return this;
+}
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::remove_chunk_replace_if_needed(TreeChunk<Chunk_t, FreeList_t>* tc) {
+
+ TreeList<Chunk_t, FreeList_t>* retTL = this;
+ Chunk_t* list = head();
assert(!list || list != list->next(), "Chunk on list twice");
assert(tc != NULL, "Chunk being removed is NULL");
assert(parent() == NULL || this == parent()->left() ||
@@ -112,13 +181,13 @@
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
- Chunk* prevFC = tc->prev();
- TreeChunk<Chunk>* nextTC = TreeChunk<Chunk>::as_TreeChunk(tc->next());
+ Chunk_t* prevFC = tc->prev();
+ TreeChunk<Chunk_t, FreeList_t>* nextTC = TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(tc->next());
assert(list != NULL, "should have at least the target chunk");
// Is this the first item on the list?
if (tc == list) {
- // The "getChunk..." functions for a TreeList<Chunk> will not return the
+ // The "getChunk..." functions for a TreeList<Chunk_t, FreeList_t> will not return the
// first chunk in the list unless it is the last chunk in the list
// because the first chunk is also acting as the tree node.
// When coalescing happens, however, the first chunk in the a tree
@@ -127,8 +196,8 @@
// allocated when the sweeper yields (giving up the free list lock)
// to allow mutator activity. If this chunk is the first in the
// list and is not the last in the list, do the work to copy the
- // TreeList<Chunk> from the first chunk to the next chunk and update all
- // the TreeList<Chunk> pointers in the chunks in the list.
+ // TreeList<Chunk_t, FreeList_t> from the first chunk to the next chunk and update all
+ // the TreeList<Chunk_t, FreeList_t> pointers in the chunks in the list.
if (nextTC == NULL) {
assert(prevFC == NULL, "Not last chunk in the list");
set_tail(NULL);
@@ -141,11 +210,11 @@
// This can be slow for a long list. Consider having
// an option that does not allow the first chunk on the
// list to be coalesced.
- for (TreeChunk<Chunk>* curTC = nextTC; curTC != NULL;
- curTC = TreeChunk<Chunk>::as_TreeChunk(curTC->next())) {
+ for (TreeChunk<Chunk_t, FreeList_t>* curTC = nextTC; curTC != NULL;
+ curTC = TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(curTC->next())) {
curTC->set_list(retTL);
}
- // Fix the parent to point to the new TreeList<Chunk>.
+ // Fix the parent to point to the new TreeList<Chunk_t, FreeList_t>.
if (retTL->parent() != NULL) {
if (this == retTL->parent()->left()) {
retTL->parent()->set_left(retTL);
@@ -176,9 +245,9 @@
prevFC->link_after(nextTC);
}
- // Below this point the embeded TreeList<Chunk> being used for the
+ // Below this point the embeded TreeList<Chunk_t, FreeList_t> being used for the
// tree node may have changed. Don't use "this"
- // TreeList<Chunk>*.
+ // TreeList<Chunk_t, FreeList_t>*.
// chunk should still be a free chunk (bit set in _prev)
assert(!retTL->head() || retTL->size() == retTL->head()->size(),
"Wrong sized chunk in list");
@@ -188,7 +257,7 @@
tc->set_list(NULL);
bool prev_found = false;
bool next_found = false;
- for (Chunk* curFC = retTL->head();
+ for (Chunk_t* curFC = retTL->head();
curFC != NULL; curFC = curFC->next()) {
assert(curFC != tc, "Chunk is still in list");
if (curFC == prevFC) {
@@ -215,8 +284,8 @@
return retTL;
}
-template <class Chunk>
-void TreeList<Chunk>::return_chunk_at_tail(TreeChunk<Chunk>* chunk) {
+template <class Chunk_t, template <class> class FreeList_t>
+void TreeList<Chunk_t, FreeList_t>::return_chunk_at_tail(TreeChunk<Chunk_t, FreeList_t>* chunk) {
assert(chunk != NULL, "returning NULL chunk");
assert(chunk->list() == this, "list should be set for chunk");
assert(tail() != NULL, "The tree list is embedded in the first chunk");
@@ -225,12 +294,12 @@
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
- Chunk* fc = tail();
+ Chunk_t* fc = tail();
fc->link_after(chunk);
link_tail(chunk);
assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
- increment_count();
+ FreeList_t<Chunk_t>::increment_count();
debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
@@ -238,10 +307,10 @@
// Add this chunk at the head of the list. "At the head of the list"
// is defined to be after the chunk pointer to by head(). This is
-// because the TreeList<Chunk> is embedded in the first TreeChunk<Chunk> in the
-// list. See the definition of TreeChunk<Chunk>.
-template <class Chunk>
-void TreeList<Chunk>::return_chunk_at_head(TreeChunk<Chunk>* chunk) {
+// because the TreeList<Chunk_t, FreeList_t> is embedded in the first TreeChunk<Chunk_t, FreeList_t> in the
+// list. See the definition of TreeChunk<Chunk_t, FreeList_t>.
+template <class Chunk_t, template <class> class FreeList_t>
+void TreeList<Chunk_t, FreeList_t>::return_chunk_at_head(TreeChunk<Chunk_t, FreeList_t>* chunk) {
assert(chunk->list() == this, "list should be set for chunk");
assert(head() != NULL, "The tree list is embedded in the first chunk");
assert(chunk != NULL, "returning NULL chunk");
@@ -249,7 +318,7 @@
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
- Chunk* fc = head()->next();
+ Chunk_t* fc = head()->next();
if (fc != NULL) {
chunk->link_after(fc);
} else {
@@ -258,28 +327,38 @@
}
head()->link_after(chunk);
assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
- increment_count();
+ FreeList_t<Chunk_t>::increment_count();
debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));)
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
}
-template <class Chunk>
-TreeChunk<Chunk>* TreeList<Chunk>::head_as_TreeChunk() {
- assert(head() == NULL || TreeChunk<Chunk>::as_TreeChunk(head())->list() == this,
- "Wrong type of chunk?");
- return TreeChunk<Chunk>::as_TreeChunk(head());
+template <class Chunk_t, template <class> class FreeList_t>
+void TreeChunk<Chunk_t, FreeList_t>::assert_is_mangled() const {
+ assert((ZapUnusedHeapArea &&
+ SpaceMangler::is_mangled((HeapWord*) Chunk_t::size_addr()) &&
+ SpaceMangler::is_mangled((HeapWord*) Chunk_t::prev_addr()) &&
+ SpaceMangler::is_mangled((HeapWord*) Chunk_t::next_addr())) ||
+ (size() == 0 && prev() == NULL && next() == NULL),
+ "Space should be clear or mangled");
}
-template <class Chunk>
-TreeChunk<Chunk>* TreeList<Chunk>::first_available() {
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::head_as_TreeChunk() {
+ assert(head() == NULL || (TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(head())->list() == this),
+ "Wrong type of chunk?");
+ return TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(head());
+}
+
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::first_available() {
assert(head() != NULL, "The head of the list cannot be NULL");
- Chunk* fc = head()->next();
- TreeChunk<Chunk>* retTC;
+ Chunk_t* fc = head()->next();
+ TreeChunk<Chunk_t, FreeList_t>* retTC;
if (fc == NULL) {
retTC = head_as_TreeChunk();
} else {
- retTC = TreeChunk<Chunk>::as_TreeChunk(fc);
+ retTC = TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(fc);
}
assert(retTC->list() == this, "Wrong type of chunk.");
return retTC;
@@ -288,41 +367,32 @@
// Returns the block with the largest heap address amongst
// those in the list for this size; potentially slow and expensive,
// use with caution!
-template <class Chunk>
-TreeChunk<Chunk>* TreeList<Chunk>::largest_address() {
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::largest_address() {
assert(head() != NULL, "The head of the list cannot be NULL");
- Chunk* fc = head()->next();
- TreeChunk<Chunk>* retTC;
+ Chunk_t* fc = head()->next();
+ TreeChunk<Chunk_t, FreeList_t>* retTC;
if (fc == NULL) {
retTC = head_as_TreeChunk();
} else {
// walk down the list and return the one with the highest
// heap address among chunks of this size.
- Chunk* last = fc;
+ Chunk_t* last = fc;
while (fc->next() != NULL) {
if ((HeapWord*)last < (HeapWord*)fc) {
last = fc;
}
fc = fc->next();
}
- retTC = TreeChunk<Chunk>::as_TreeChunk(last);
+ retTC = TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(last);
}
assert(retTC->list() == this, "Wrong type of chunk.");
return retTC;
}
-template <class Chunk>
-BinaryTreeDictionary<Chunk>::BinaryTreeDictionary(bool adaptive_freelists, bool splay) :
- _splay(splay), _adaptive_freelists(adaptive_freelists),
- _total_size(0), _total_free_blocks(0), _root(0) {}
-
-template <class Chunk>
-BinaryTreeDictionary<Chunk>::BinaryTreeDictionary(MemRegion mr,
- bool adaptive_freelists,
- bool splay):
- _adaptive_freelists(adaptive_freelists), _splay(splay)
-{
- assert(mr.word_size() >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "minimum chunk size");
+template <class Chunk_t, template <class> class FreeList_t>
+BinaryTreeDictionary<Chunk_t, FreeList_t>::BinaryTreeDictionary(MemRegion mr) {
+ assert((mr.byte_size() > min_size()), "minimum chunk size");
reset(mr);
assert(root()->left() == NULL, "reset check failed");
@@ -333,52 +403,48 @@
assert(total_free_blocks() == 1, "reset check failed");
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::inc_total_size(size_t inc) {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::inc_total_size(size_t inc) {
_total_size = _total_size + inc;
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::dec_total_size(size_t dec) {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::dec_total_size(size_t dec) {
_total_size = _total_size - dec;
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::reset(MemRegion mr) {
- assert(mr.word_size() >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "minimum chunk size");
- set_root(TreeList<Chunk>::as_TreeList(mr.start(), mr.word_size()));
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::reset(MemRegion mr) {
+ assert((mr.byte_size() > min_size()), "minimum chunk size");
+ set_root(TreeList<Chunk_t, FreeList_t>::as_TreeList(mr.start(), mr.word_size()));
set_total_size(mr.word_size());
set_total_free_blocks(1);
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::reset(HeapWord* addr, size_t byte_size) {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::reset(HeapWord* addr, size_t byte_size) {
MemRegion mr(addr, heap_word_size(byte_size));
reset(mr);
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::reset() {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::reset() {
set_root(NULL);
set_total_size(0);
set_total_free_blocks(0);
}
// Get a free block of size at least size from tree, or NULL.
-// If a splay step is requested, the removal algorithm (only) incorporates
-// a splay step as follows:
-// . the search proceeds down the tree looking for a possible
-// match. At the (closest) matching location, an appropriate splay step is applied
-// (zig, zig-zig or zig-zag). A chunk of the appropriate size is then returned
-// if available, and if it's the last chunk, the node is deleted. A deteleted
-// node is replaced in place by its tree successor.
-template <class Chunk>
-TreeChunk<Chunk>*
-BinaryTreeDictionary<Chunk>::get_chunk_from_tree(size_t size, enum FreeBlockDictionary<Chunk>::Dither dither, bool splay)
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>*
+BinaryTreeDictionary<Chunk_t, FreeList_t>::get_chunk_from_tree(
+ size_t size,
+ enum FreeBlockDictionary<Chunk_t>::Dither dither)
{
- TreeList<Chunk> *curTL, *prevTL;
- TreeChunk<Chunk>* retTC = NULL;
- assert(size >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "minimum chunk size");
+ TreeList<Chunk_t, FreeList_t> *curTL, *prevTL;
+ TreeChunk<Chunk_t, FreeList_t>* retTC = NULL;
+
+ assert((size >= min_size()), "minimum chunk size");
if (FLSVerifyDictionary) {
verify_tree();
}
@@ -398,7 +464,7 @@
}
if (curTL == NULL) { // couldn't find exact match
- if (dither == FreeBlockDictionary<Chunk>::exactly) return NULL;
+ if (dither == FreeBlockDictionary<Chunk_t>::exactly) return NULL;
// try and find the next larger size by walking back up the search path
for (curTL = prevTL; curTL != NULL;) {
@@ -410,46 +476,9 @@
}
if (curTL != NULL) {
assert(curTL->size() >= size, "size inconsistency");
- if (adaptive_freelists()) {
- // A candidate chunk has been found. If it is already under
- // populated, get a chunk associated with the hint for this
- // chunk.
- if (curTL->surplus() <= 0) {
- /* Use the hint to find a size with a surplus, and reset the hint. */
- TreeList<Chunk>* hintTL = curTL;
- while (hintTL->hint() != 0) {
- assert(hintTL->hint() == 0 || hintTL->hint() > hintTL->size(),
- "hint points in the wrong direction");
- hintTL = find_list(hintTL->hint());
- assert(curTL != hintTL, "Infinite loop");
- if (hintTL == NULL ||
- hintTL == curTL /* Should not happen but protect against it */ ) {
- // No useful hint. Set the hint to NULL and go on.
- curTL->set_hint(0);
- break;
- }
- assert(hintTL->size() > size, "hint is inconsistent");
- if (hintTL->surplus() > 0) {
- // The hint led to a list that has a surplus. Use it.
- // Set the hint for the candidate to an overpopulated
- // size.
- curTL->set_hint(hintTL->size());
- // Change the candidate.
- curTL = hintTL;
- break;
- }
- // The evm code reset the hint of the candidate as
- // at an interim point. Why? Seems like this leaves
- // the hint pointing to a list that didn't work.
- // curTL->set_hint(hintTL->size());
- }
- }
- }
- // don't waste time splaying if chunk's singleton
- if (splay && curTL->head()->next() != NULL) {
- semi_splay_step(curTL);
- }
+ curTL = curTL->get_better_list(this);
+
retTC = curTL->first_available();
assert((retTC != NULL) && (curTL->count() > 0),
"A list in the binary tree should not be NULL");
@@ -465,9 +494,9 @@
return retTC;
}
-template <class Chunk>
-TreeList<Chunk>* BinaryTreeDictionary<Chunk>::find_list(size_t size) const {
- TreeList<Chunk>* curTL;
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>* BinaryTreeDictionary<Chunk_t, FreeList_t>::find_list(size_t size) const {
+ TreeList<Chunk_t, FreeList_t>* curTL;
for (curTL = root(); curTL != NULL;) {
if (curTL->size() == size) { // exact match
break;
@@ -484,10 +513,10 @@
}
-template <class Chunk>
-bool BinaryTreeDictionary<Chunk>::verify_chunk_in_free_list(Chunk* tc) const {
+template <class Chunk_t, template <class> class FreeList_t>
+bool BinaryTreeDictionary<Chunk_t, FreeList_t>::verify_chunk_in_free_list(Chunk_t* tc) const {
size_t size = tc->size();
- TreeList<Chunk>* tl = find_list(size);
+ TreeList<Chunk_t, FreeList_t>* tl = find_list(size);
if (tl == NULL) {
return false;
} else {
@@ -495,9 +524,9 @@
}
}
-template <class Chunk>
-Chunk* BinaryTreeDictionary<Chunk>::find_largest_dict() const {
- TreeList<Chunk> *curTL = root();
+template <class Chunk_t, template <class> class FreeList_t>
+Chunk_t* BinaryTreeDictionary<Chunk_t, FreeList_t>::find_largest_dict() const {
+ TreeList<Chunk_t, FreeList_t> *curTL = root();
if (curTL != NULL) {
while(curTL->right() != NULL) curTL = curTL->right();
return curTL->largest_address();
@@ -510,15 +539,15 @@
// chunk in a list on a tree node, just unlink it.
// If it is the last chunk in the list (the next link is NULL),
// remove the node and repair the tree.
-template <class Chunk>
-TreeChunk<Chunk>*
-BinaryTreeDictionary<Chunk>::remove_chunk_from_tree(TreeChunk<Chunk>* tc) {
+template <class Chunk_t, template <class> class FreeList_t>
+TreeChunk<Chunk_t, FreeList_t>*
+BinaryTreeDictionary<Chunk_t, FreeList_t>::remove_chunk_from_tree(TreeChunk<Chunk_t, FreeList_t>* tc) {
assert(tc != NULL, "Should not call with a NULL chunk");
assert(tc->is_free(), "Header is not marked correctly");
- TreeList<Chunk> *newTL, *parentTL;
- TreeChunk<Chunk>* retTC;
- TreeList<Chunk>* tl = tc->list();
+ TreeList<Chunk_t, FreeList_t> *newTL, *parentTL;
+ TreeChunk<Chunk_t, FreeList_t>* retTC;
+ TreeList<Chunk_t, FreeList_t>* tl = tc->list();
debug_only(
bool removing_only_chunk = false;
if (tl == _root) {
@@ -538,8 +567,8 @@
retTC = tc;
// Removing this chunk can have the side effect of changing the node
- // (TreeList<Chunk>*) in the tree. If the node is the root, update it.
- TreeList<Chunk>* replacementTL = tl->remove_chunk_replace_if_needed(tc);
+ // (TreeList<Chunk_t, FreeList_t>*) in the tree. If the node is the root, update it.
+ TreeList<Chunk_t, FreeList_t>* replacementTL = tl->remove_chunk_replace_if_needed(tc);
assert(tc->is_free(), "Chunk should still be free");
assert(replacementTL->parent() == NULL ||
replacementTL == replacementTL->parent()->left() ||
@@ -549,17 +578,18 @@
assert(replacementTL->parent() == NULL, "Incorrectly replacing root");
set_root(replacementTL);
}
- debug_only(
+#ifdef ASSERT
if (tl != replacementTL) {
assert(replacementTL->head() != NULL,
"If the tree list was replaced, it should not be a NULL list");
- TreeList<Chunk>* rhl = replacementTL->head_as_TreeChunk()->list();
- TreeList<Chunk>* rtl = TreeChunk<Chunk>::as_TreeChunk(replacementTL->tail())->list();
+ TreeList<Chunk_t, FreeList_t>* rhl = replacementTL->head_as_TreeChunk()->list();
+ TreeList<Chunk_t, FreeList_t>* rtl =
+ TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(replacementTL->tail())->list();
assert(rhl == replacementTL, "Broken head");
assert(rtl == replacementTL, "Broken tail");
assert(replacementTL->size() == tc->size(), "Broken size");
}
- )
+#endif
// Does the tree need to be repaired?
if (replacementTL->count() == 0) {
@@ -574,7 +604,7 @@
} else if (replacementTL->right() == NULL) {
// right is NULL
newTL = replacementTL->left();
- debug_only(replacementTL->clearLeft();)
+ debug_only(replacementTL->clear_left();)
} else { // we have both children, so, by patriarchal convention,
// my replacement is least node in right sub-tree
complicated_splice = true;
@@ -623,7 +653,7 @@
newTL->set_right(replacementTL->right());
debug_only(
replacementTL->clear_right();
- replacementTL->clearLeft();
+ replacementTL->clear_left();
)
}
assert(replacementTL->right() == NULL &&
@@ -644,21 +674,21 @@
verify_tree();
}
assert(!removing_only_chunk || _root == NULL, "root should be NULL");
- return TreeChunk<Chunk>::as_TreeChunk(retTC);
+ return TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(retTC);
}
// Remove the leftmost node (lm) in the tree and return it.
// If lm has a right child, link it to the left node of
// the parent of lm.
-template <class Chunk>
-TreeList<Chunk>* BinaryTreeDictionary<Chunk>::remove_tree_minimum(TreeList<Chunk>* tl) {
+template <class Chunk_t, template <class> class FreeList_t>
+TreeList<Chunk_t, FreeList_t>* BinaryTreeDictionary<Chunk_t, FreeList_t>::remove_tree_minimum(TreeList<Chunk_t, FreeList_t>* tl) {
assert(tl != NULL && tl->parent() != NULL, "really need a proper sub-tree");
// locate the subtree minimum by walking down left branches
- TreeList<Chunk>* curTL = tl;
+ TreeList<Chunk_t, FreeList_t>* curTL = tl;
for (; curTL->left() != NULL; curTL = curTL->left());
// obviously curTL now has at most one child, a right child
if (curTL != root()) { // Should this test just be removed?
- TreeList<Chunk>* parentTL = curTL->parent();
+ TreeList<Chunk_t, FreeList_t>* parentTL = curTL->parent();
if (parentTL->left() == curTL) { // curTL is a left child
parentTL->set_left(curTL->right());
} else {
@@ -685,31 +715,14 @@
return curTL;
}
-// Based on a simplification of the algorithm by Sleator and Tarjan (JACM 1985).
-// The simplifications are the following:
-// . we splay only when we delete (not when we insert)
-// . we apply a single spay step per deletion/access
-// By doing such partial splaying, we reduce the amount of restructuring,
-// while getting a reasonably efficient search tree (we think).
-// [Measurements will be needed to (in)validate this expectation.]
-
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::semi_splay_step(TreeList<Chunk>* tc) {
- // apply a semi-splay step at the given node:
- // . if root, norting needs to be done
- // . if child of root, splay once
- // . else zig-zig or sig-zag depending on path from grandparent
- if (root() == tc) return;
- warning("*** Splaying not yet implemented; "
- "tree operations may be inefficient ***");
-}
-
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::insert_chunk_in_tree(Chunk* fc) {
- TreeList<Chunk> *curTL, *prevTL;
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::insert_chunk_in_tree(Chunk_t* fc) {
+ TreeList<Chunk_t, FreeList_t> *curTL, *prevTL;
size_t size = fc->size();
- assert(size >= BinaryTreeDictionary<Chunk>::min_tree_chunk_size, "too small to be a TreeList<Chunk>");
+ assert((size >= min_size()),
+ err_msg(SIZE_FORMAT " is too small to be a TreeChunk<Chunk_t, FreeList_t> " SIZE_FORMAT,
+ size, min_size()));
if (FLSVerifyDictionary) {
verify_tree();
}
@@ -729,9 +742,9 @@
curTL = curTL->right();
}
}
- TreeChunk<Chunk>* tc = TreeChunk<Chunk>::as_TreeChunk(fc);
+ TreeChunk<Chunk_t, FreeList_t>* tc = TreeChunk<Chunk_t, FreeList_t>::as_TreeChunk(fc);
// This chunk is being returned to the binary tree. Its embedded
- // TreeList<Chunk> should be unused at this point.
+ // TreeList<Chunk_t, FreeList_t> should be unused at this point.
tc->initialize();
if (curTL != NULL) { // exact match
tc->set_list(curTL);
@@ -739,8 +752,8 @@
} else { // need a new node in tree
tc->clear_next();
tc->link_prev(NULL);
- TreeList<Chunk>* newTL = TreeList<Chunk>::as_TreeList(tc);
- assert(((TreeChunk<Chunk>*)tc)->list() == newTL,
+ TreeList<Chunk_t, FreeList_t>* newTL = TreeList<Chunk_t, FreeList_t>::as_TreeList(tc);
+ assert(((TreeChunk<Chunk_t, FreeList_t>*)tc)->list() == newTL,
"List was not initialized correctly");
if (prevTL == NULL) { // we are the only tree node
assert(root() == NULL, "control point invariant");
@@ -768,30 +781,30 @@
}
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::max_chunk_size() const {
- FreeBlockDictionary<Chunk>::verify_par_locked();
- TreeList<Chunk>* tc = root();
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::max_chunk_size() const {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
+ TreeList<Chunk_t, FreeList_t>* tc = root();
if (tc == NULL) return 0;
for (; tc->right() != NULL; tc = tc->right());
return tc->size();
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_list_length(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_list_length(TreeList<Chunk_t, FreeList_t>* tl) const {
size_t res;
res = tl->count();
#ifdef ASSERT
size_t cnt;
- Chunk* tc = tl->head();
+ Chunk_t* tc = tl->head();
for (cnt = 0; tc != NULL; tc = tc->next(), cnt++);
assert(res == cnt, "The count is not being maintained correctly");
#endif
return res;
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_size_in_tree(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_size_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const {
if (tl == NULL)
return 0;
return (tl->size() * total_list_length(tl)) +
@@ -799,8 +812,8 @@
total_size_in_tree(tl->right());
}
-template <class Chunk>
-double BinaryTreeDictionary<Chunk>::sum_of_squared_block_sizes(TreeList<Chunk>* const tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+double BinaryTreeDictionary<Chunk_t, FreeList_t>::sum_of_squared_block_sizes(TreeList<Chunk_t, FreeList_t>* const tl) const {
if (tl == NULL) {
return 0.0;
}
@@ -811,8 +824,8 @@
return curr;
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_free_blocks_in_tree(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_free_blocks_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const {
if (tl == NULL)
return 0;
return total_list_length(tl) +
@@ -820,28 +833,28 @@
total_free_blocks_in_tree(tl->right());
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::num_free_blocks() const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::num_free_blocks() const {
assert(total_free_blocks_in_tree(root()) == total_free_blocks(),
"_total_free_blocks inconsistency");
return total_free_blocks();
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::tree_height_helper(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::tree_height_helper(TreeList<Chunk_t, FreeList_t>* tl) const {
if (tl == NULL)
return 0;
return 1 + MAX2(tree_height_helper(tl->left()),
tree_height_helper(tl->right()));
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::treeHeight() const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::tree_height() const {
return tree_height_helper(root());
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_nodes_helper(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_nodes_helper(TreeList<Chunk_t, FreeList_t>* tl) const {
if (tl == NULL) {
return 0;
}
@@ -849,14 +862,18 @@
total_nodes_helper(tl->right());
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_nodes_in_tree(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_nodes_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const {
return total_nodes_helper(root());
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::dict_census_udpate(size_t size, bool split, bool birth){
- TreeList<Chunk>* nd = find_list(size);
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::dict_census_update(size_t size, bool split, bool birth){}
+
+#ifndef SERIALGC
+template <>
+void BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::dict_census_update(size_t size, bool split, bool birth){
+ TreeList<FreeChunk, AdaptiveFreeList>* nd = find_list(size);
if (nd) {
if (split) {
if (birth) {
@@ -882,16 +899,26 @@
// This is a birth associated with a LinAB. The chunk
// for the LinAB is not in the dictionary.
}
+#endif // SERIALGC
-template <class Chunk>
-bool BinaryTreeDictionary<Chunk>::coal_dict_over_populated(size_t size) {
+template <class Chunk_t, template <class> class FreeList_t>
+bool BinaryTreeDictionary<Chunk_t, FreeList_t>::coal_dict_over_populated(size_t size) {
+ // For the general type of freelists, encourage coalescing by
+ // returning true.
+ return true;
+}
+
+#ifndef SERIALGC
+template <>
+bool BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::coal_dict_over_populated(size_t size) {
if (FLSAlwaysCoalesceLarge) return true;
- TreeList<Chunk>* list_of_size = find_list(size);
+ TreeList<FreeChunk, AdaptiveFreeList>* list_of_size = find_list(size);
// None of requested size implies overpopulated.
return list_of_size == NULL || list_of_size->coal_desired() <= 0 ||
list_of_size->count() > list_of_size->coal_desired();
}
+#endif // SERIALGC
// Closures for walking the binary tree.
// do_list() walks the free list in a node applying the closure
@@ -899,19 +926,18 @@
// do_tree() walks the nodes in the binary tree applying do_list()
// to each list at each node.
-template <class Chunk>
+template <class Chunk_t, template <class> class FreeList_t>
class TreeCensusClosure : public StackObj {
protected:
- virtual void do_list(FreeList<Chunk>* fl) = 0;
+ virtual void do_list(FreeList_t<Chunk_t>* fl) = 0;
public:
- virtual void do_tree(TreeList<Chunk>* tl) = 0;
+ virtual void do_tree(TreeList<Chunk_t, FreeList_t>* tl) = 0;
};
-template <class Chunk>
-class AscendTreeCensusClosure : public TreeCensusClosure<Chunk> {
- using TreeCensusClosure<Chunk>::do_list;
+template <class Chunk_t, template <class> class FreeList_t>
+class AscendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> {
public:
- void do_tree(TreeList<Chunk>* tl) {
+ void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
do_tree(tl->left());
do_list(tl);
@@ -920,11 +946,10 @@
}
};
-template <class Chunk>
-class DescendTreeCensusClosure : public TreeCensusClosure<Chunk> {
- using TreeCensusClosure<Chunk>::do_list;
+template <class Chunk_t, template <class> class FreeList_t>
+class DescendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> {
public:
- void do_tree(TreeList<Chunk>* tl) {
+ void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
do_tree(tl->right());
do_list(tl);
@@ -935,8 +960,8 @@
// For each list in the tree, calculate the desired, desired
// coalesce, count before sweep, and surplus before sweep.
-template <class Chunk>
-class BeginSweepClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class BeginSweepClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
double _percentage;
float _inter_sweep_current;
float _inter_sweep_estimate;
@@ -951,32 +976,36 @@
_inter_sweep_estimate(inter_sweep_estimate),
_intra_sweep_estimate(intra_sweep_estimate) { }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList<Chunk_t>* fl) {}
+
+#ifndef SERIALGC
+ void do_list(AdaptiveFreeList<Chunk_t>* fl) {
double coalSurplusPercent = _percentage;
fl->compute_desired(_inter_sweep_current, _inter_sweep_estimate, _intra_sweep_estimate);
fl->set_coal_desired((ssize_t)((double)fl->desired() * coalSurplusPercent));
fl->set_before_sweep(fl->count());
fl->set_bfr_surp(fl->surplus());
}
+#endif // SERIALGC
};
// Used to search the tree until a condition is met.
// Similar to TreeCensusClosure but searches the
// tree and returns promptly when found.
-template <class Chunk>
+template <class Chunk_t, template <class> class FreeList_t>
class TreeSearchClosure : public StackObj {
protected:
- virtual bool do_list(FreeList<Chunk>* fl) = 0;
+ virtual bool do_list(FreeList_t<Chunk_t>* fl) = 0;
public:
- virtual bool do_tree(TreeList<Chunk>* tl) = 0;
+ virtual bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) = 0;
};
#if 0 // Don't need this yet but here for symmetry.
-template <class Chunk>
-class AscendTreeSearchClosure : public TreeSearchClosure {
+template <class Chunk_t, template <class> class FreeList_t>
+class AscendTreeSearchClosure : public TreeSearchClosure<Chunk_t> {
public:
- bool do_tree(TreeList<Chunk>* tl) {
+ bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
if (do_tree(tl->left())) return true;
if (do_list(tl)) return true;
@@ -987,11 +1016,10 @@
};
#endif
-template <class Chunk>
-class DescendTreeSearchClosure : public TreeSearchClosure<Chunk> {
- using TreeSearchClosure<Chunk>::do_list;
+template <class Chunk_t, template <class> class FreeList_t>
+class DescendTreeSearchClosure : public TreeSearchClosure<Chunk_t, FreeList_t> {
public:
- bool do_tree(TreeList<Chunk>* tl) {
+ bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
if (do_tree(tl->right())) return true;
if (do_list(tl)) return true;
@@ -1003,17 +1031,17 @@
// Searches the tree for a chunk that ends at the
// specified address.
-template <class Chunk>
-class EndTreeSearchClosure : public DescendTreeSearchClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class EndTreeSearchClosure : public DescendTreeSearchClosure<Chunk_t, FreeList_t> {
HeapWord* _target;
- Chunk* _found;
+ Chunk_t* _found;
public:
EndTreeSearchClosure(HeapWord* target) : _target(target), _found(NULL) {}
- bool do_list(FreeList<Chunk>* fl) {
- Chunk* item = fl->head();
+ bool do_list(FreeList_t<Chunk_t>* fl) {
+ Chunk_t* item = fl->head();
while (item != NULL) {
- if (item->end() == _target) {
+ if (item->end() == (uintptr_t*) _target) {
_found = item;
return true;
}
@@ -1021,22 +1049,22 @@
}
return false;
}
- Chunk* found() { return _found; }
+ Chunk_t* found() { return _found; }
};
-template <class Chunk>
-Chunk* BinaryTreeDictionary<Chunk>::find_chunk_ends_at(HeapWord* target) const {
- EndTreeSearchClosure<Chunk> etsc(target);
+template <class Chunk_t, template <class> class FreeList_t>
+Chunk_t* BinaryTreeDictionary<Chunk_t, FreeList_t>::find_chunk_ends_at(HeapWord* target) const {
+ EndTreeSearchClosure<Chunk_t, FreeList_t> etsc(target);
bool found_target = etsc.do_tree(root());
assert(found_target || etsc.found() == NULL, "Consistency check");
assert(!found_target || etsc.found() != NULL, "Consistency check");
return etsc.found();
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::begin_sweep_dict_census(double coalSurplusPercent,
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::begin_sweep_dict_census(double coalSurplusPercent,
float inter_sweep_current, float inter_sweep_estimate, float intra_sweep_estimate) {
- BeginSweepClosure<Chunk> bsc(coalSurplusPercent, inter_sweep_current,
+ BeginSweepClosure<Chunk_t, FreeList_t> bsc(coalSurplusPercent, inter_sweep_current,
inter_sweep_estimate,
intra_sweep_estimate);
bsc.do_tree(root());
@@ -1045,84 +1073,91 @@
// Closures and methods for calculating total bytes returned to the
// free lists in the tree.
#ifndef PRODUCT
-template <class Chunk>
-class InitializeDictReturnedBytesClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class InitializeDictReturnedBytesClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
public:
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList_t<Chunk_t>* fl) {
fl->set_returned_bytes(0);
}
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::initialize_dict_returned_bytes() {
- InitializeDictReturnedBytesClosure<Chunk> idrb;
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::initialize_dict_returned_bytes() {
+ InitializeDictReturnedBytesClosure<Chunk_t, FreeList_t> idrb;
idrb.do_tree(root());
}
-template <class Chunk>
-class ReturnedBytesClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class ReturnedBytesClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
size_t _dict_returned_bytes;
public:
ReturnedBytesClosure() { _dict_returned_bytes = 0; }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList_t<Chunk_t>* fl) {
_dict_returned_bytes += fl->returned_bytes();
}
size_t dict_returned_bytes() { return _dict_returned_bytes; }
};
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::sum_dict_returned_bytes() {
- ReturnedBytesClosure<Chunk> rbc;
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::sum_dict_returned_bytes() {
+ ReturnedBytesClosure<Chunk_t, FreeList_t> rbc;
rbc.do_tree(root());
return rbc.dict_returned_bytes();
}
// Count the number of entries in the tree.
-template <class Chunk>
-class treeCountClosure : public DescendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class treeCountClosure : public DescendTreeCensusClosure<Chunk_t, FreeList_t> {
public:
uint count;
treeCountClosure(uint c) { count = c; }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList_t<Chunk_t>* fl) {
count++;
}
};
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::total_count() {
- treeCountClosure<Chunk> ctc(0);
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::total_count() {
+ treeCountClosure<Chunk_t, FreeList_t> ctc(0);
ctc.do_tree(root());
return ctc.count;
}
#endif // PRODUCT
// Calculate surpluses for the lists in the tree.
-template <class Chunk>
-class setTreeSurplusClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class setTreeSurplusClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
double percentage;
public:
setTreeSurplusClosure(double v) { percentage = v; }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList<Chunk_t>* fl) {}
+
+#ifndef SERIALGC
+ void do_list(AdaptiveFreeList<Chunk_t>* fl) {
double splitSurplusPercent = percentage;
fl->set_surplus(fl->count() -
(ssize_t)((double)fl->desired() * splitSurplusPercent));
}
+#endif // SERIALGC
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::set_tree_surplus(double splitSurplusPercent) {
- setTreeSurplusClosure<Chunk> sts(splitSurplusPercent);
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::set_tree_surplus(double splitSurplusPercent) {
+ setTreeSurplusClosure<Chunk_t, FreeList_t> sts(splitSurplusPercent);
sts.do_tree(root());
}
// Set hints for the lists in the tree.
-template <class Chunk>
-class setTreeHintsClosure : public DescendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class setTreeHintsClosure : public DescendTreeCensusClosure<Chunk_t, FreeList_t> {
size_t hint;
public:
setTreeHintsClosure(size_t v) { hint = v; }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList<Chunk_t>* fl) {}
+
+#ifndef SERIALGC
+ void do_list(AdaptiveFreeList<Chunk_t>* fl) {
fl->set_hint(hint);
assert(fl->hint() == 0 || fl->hint() > fl->size(),
"Current hint is inconsistent");
@@ -1130,35 +1165,40 @@
hint = fl->size();
}
}
+#endif // SERIALGC
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::set_tree_hints(void) {
- setTreeHintsClosure<Chunk> sth(0);
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::set_tree_hints(void) {
+ setTreeHintsClosure<Chunk_t, FreeList_t> sth(0);
sth.do_tree(root());
}
// Save count before previous sweep and splits and coalesces.
-template <class Chunk>
-class clearTreeCensusClosure : public AscendTreeCensusClosure<Chunk> {
- void do_list(FreeList<Chunk>* fl) {
+template <class Chunk_t, template <class> class FreeList_t>
+class clearTreeCensusClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
+ void do_list(FreeList<Chunk_t>* fl) {}
+
+#ifndef SERIALGC
+ void do_list(AdaptiveFreeList<Chunk_t>* fl) {
fl->set_prev_sweep(fl->count());
fl->set_coal_births(0);
fl->set_coal_deaths(0);
fl->set_split_births(0);
fl->set_split_deaths(0);
}
+#endif // SERIALGC
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::clear_tree_census(void) {
- clearTreeCensusClosure<Chunk> ctc;
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::clear_tree_census(void) {
+ clearTreeCensusClosure<Chunk_t, FreeList_t> ctc;
ctc.do_tree(root());
}
// Do reporting and post sweep clean up.
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::end_sweep_dict_census(double splitSurplusPercent) {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::end_sweep_dict_census(double splitSurplusPercent) {
// Does walking the tree 3 times hurt?
set_tree_surplus(splitSurplusPercent);
set_tree_hints();
@@ -1169,9 +1209,9 @@
}
// Print summary statistics
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::report_statistics() const {
- FreeBlockDictionary<Chunk>::verify_par_locked();
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::report_statistics() const {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
gclog_or_tty->print("Statistics for BinaryTreeDictionary:\n"
"------------------------------------\n");
size_t total_size = total_chunk_size(debug_only(NULL));
@@ -1182,36 +1222,47 @@
if (free_blocks > 0) {
gclog_or_tty->print("Av. Block Size: %d\n", total_size/free_blocks);
}
- gclog_or_tty->print("Tree Height: %d\n", treeHeight());
+ gclog_or_tty->print("Tree Height: %d\n", tree_height());
}
// Print census information - counts, births, deaths, etc.
// for each list in the tree. Also print some summary
// information.
-template <class Chunk>
-class PrintTreeCensusClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class PrintTreeCensusClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
int _print_line;
size_t _total_free;
- FreeList<Chunk> _total;
+ FreeList_t<Chunk_t> _total;
public:
PrintTreeCensusClosure() {
_print_line = 0;
_total_free = 0;
}
- FreeList<Chunk>* total() { return &_total; }
+ FreeList_t<Chunk_t>* total() { return &_total; }
size_t total_free() { return _total_free; }
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList<Chunk_t>* fl) {
if (++_print_line >= 40) {
- FreeList<Chunk>::print_labels_on(gclog_or_tty, "size");
+ FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, "size");
_print_line = 0;
}
fl->print_on(gclog_or_tty);
_total_free += fl->count() * fl->size() ;
total()->set_count( total()->count() + fl->count() );
- total()->set_bfr_surp( total()->bfr_surp() + fl->bfr_surp() );
+ }
+
+#ifndef SERIALGC
+ void do_list(AdaptiveFreeList<Chunk_t>* fl) {
+ if (++_print_line >= 40) {
+ FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, "size");
+ _print_line = 0;
+ }
+ fl->print_on(gclog_or_tty);
+ _total_free += fl->count() * fl->size() ;
+ total()->set_count( total()->count() + fl->count() );
+ total()->set_bfr_surp( total()->bfr_surp() + fl->bfr_surp() );
total()->set_surplus( total()->split_deaths() + fl->surplus() );
- total()->set_desired( total()->desired() + fl->desired() );
+ total()->set_desired( total()->desired() + fl->desired() );
total()->set_prev_sweep( total()->prev_sweep() + fl->prev_sweep() );
total()->set_before_sweep(total()->before_sweep() + fl->before_sweep());
total()->set_coal_births( total()->coal_births() + fl->coal_births() );
@@ -1219,18 +1270,32 @@
total()->set_split_births(total()->split_births() + fl->split_births());
total()->set_split_deaths(total()->split_deaths() + fl->split_deaths());
}
+#endif // SERIALGC
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::print_dict_census(void) const {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::print_dict_census(void) const {
gclog_or_tty->print("\nBinaryTree\n");
- FreeList<Chunk>::print_labels_on(gclog_or_tty, "size");
- PrintTreeCensusClosure<Chunk> ptc;
+ FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, "size");
+ PrintTreeCensusClosure<Chunk_t, FreeList_t> ptc;
ptc.do_tree(root());
- FreeList<Chunk>* total = ptc.total();
- FreeList<Chunk>::print_labels_on(gclog_or_tty, " ");
+ FreeList_t<Chunk_t>* total = ptc.total();
+ FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, " ");
+}
+
+#ifndef SERIALGC
+template <>
+void BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::print_dict_census(void) const {
+
+ gclog_or_tty->print("\nBinaryTree\n");
+ AdaptiveFreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
+ PrintTreeCensusClosure<FreeChunk, AdaptiveFreeList> ptc;
+ ptc.do_tree(root());
+
+ AdaptiveFreeList<FreeChunk>* total = ptc.total();
+ AdaptiveFreeList<FreeChunk>::print_labels_on(gclog_or_tty, " ");
total->print_on(gclog_or_tty, "TOTAL\t");
gclog_or_tty->print(
"total_free(words): " SIZE_FORMAT_W(16)
@@ -1242,9 +1307,10 @@
(double)(total->desired() - total->count())
/(total->desired() != 0 ? (double)total->desired() : 1.0));
}
+#endif // SERIALGC
-template <class Chunk>
-class PrintFreeListsClosure : public AscendTreeCensusClosure<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class PrintFreeListsClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
outputStream* _st;
int _print_line;
@@ -1253,14 +1319,14 @@
_st = st;
_print_line = 0;
}
- void do_list(FreeList<Chunk>* fl) {
+ void do_list(FreeList_t<Chunk_t>* fl) {
if (++_print_line >= 40) {
- FreeList<Chunk>::print_labels_on(_st, "size");
+ FreeList_t<Chunk_t>::print_labels_on(_st, "size");
_print_line = 0;
}
fl->print_on(gclog_or_tty);
size_t sz = fl->size();
- for (Chunk* fc = fl->head(); fc != NULL;
+ for (Chunk_t* fc = fl->head(); fc != NULL;
fc = fc->next()) {
_st->print_cr("\t[" PTR_FORMAT "," PTR_FORMAT ") %s",
fc, (HeapWord*)fc + sz,
@@ -1269,11 +1335,11 @@
}
};
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::print_free_lists(outputStream* st) const {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::print_free_lists(outputStream* st) const {
- FreeList<Chunk>::print_labels_on(st, "size");
- PrintFreeListsClosure<Chunk> pflc(st);
+ FreeList_t<Chunk_t>::print_labels_on(st, "size");
+ PrintFreeListsClosure<Chunk_t, FreeList_t> pflc(st);
pflc.do_tree(root());
}
@@ -1281,18 +1347,18 @@
// . _root has no parent
// . parent and child point to each other
// . each node's key correctly related to that of its child(ren)
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::verify_tree() const {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::verify_tree() const {
guarantee(root() == NULL || total_free_blocks() == 0 ||
total_size() != 0, "_total_size should't be 0?");
guarantee(root() == NULL || root()->parent() == NULL, "_root shouldn't have parent");
verify_tree_helper(root());
}
-template <class Chunk>
-size_t BinaryTreeDictionary<Chunk>::verify_prev_free_ptrs(TreeList<Chunk>* tl) {
+template <class Chunk_t, template <class> class FreeList_t>
+size_t BinaryTreeDictionary<Chunk_t, FreeList_t>::verify_prev_free_ptrs(TreeList<Chunk_t, FreeList_t>* tl) {
size_t ct = 0;
- for (Chunk* curFC = tl->head(); curFC != NULL; curFC = curFC->next()) {
+ for (Chunk_t* curFC = tl->head(); curFC != NULL; curFC = curFC->next()) {
ct++;
assert(curFC->prev() == NULL || curFC->prev()->is_free(),
"Chunk should be free");
@@ -1303,8 +1369,8 @@
// Note: this helper is recursive rather than iterative, so use with
// caution on very deep trees; and watch out for stack overflow errors;
// In general, to be used only for debugging.
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::verify_tree_helper(TreeList<Chunk>* tl) const {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::verify_tree_helper(TreeList<Chunk_t, FreeList_t>* tl) const {
if (tl == NULL)
return;
guarantee(tl->size() != 0, "A list must has a size");
@@ -1332,15 +1398,25 @@
verify_tree_helper(tl->right());
}
-template <class Chunk>
-void BinaryTreeDictionary<Chunk>::verify() const {
+template <class Chunk_t, template <class> class FreeList_t>
+void BinaryTreeDictionary<Chunk_t, FreeList_t>::verify() const {
verify_tree();
guarantee(total_size() == total_size_in_tree(root()), "Total Size inconsistency");
}
+template class TreeList<Metablock, FreeList>;
+template class BinaryTreeDictionary<Metablock, FreeList>;
+template class TreeChunk<Metablock, FreeList>;
+
+template class TreeList<Metachunk, FreeList>;
+template class BinaryTreeDictionary<Metachunk, FreeList>;
+template class TreeChunk<Metachunk, FreeList>;
+
+
#ifndef SERIALGC
// Explicitly instantiate these types for FreeChunk.
-template class BinaryTreeDictionary<FreeChunk>;
-template class TreeChunk<FreeChunk>;
-template class TreeList<FreeChunk>;
+template class TreeList<FreeChunk, AdaptiveFreeList>;
+template class BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>;
+template class TreeChunk<FreeChunk, AdaptiveFreeList>;
+
#endif // SERIALGC
diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp
index 4ab60c2..757eb4f 100644
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp
@@ -37,77 +37,78 @@
// A TreeList is a FreeList which can be used to maintain a
// binary tree of free lists.
-template <class Chunk> class TreeChunk;
-template <class Chunk> class BinaryTreeDictionary;
-template <class Chunk> class AscendTreeCensusClosure;
-template <class Chunk> class DescendTreeCensusClosure;
-template <class Chunk> class DescendTreeSearchClosure;
+template <class Chunk_t, template <class> class FreeList_t> class TreeChunk;
+template <class Chunk_t, template <class> class FreeList_t> class BinaryTreeDictionary;
+template <class Chunk_t, template <class> class FreeList_t> class AscendTreeCensusClosure;
+template <class Chunk_t, template <class> class FreeList_t> class DescendTreeCensusClosure;
+template <class Chunk_t, template <class> class FreeList_t> class DescendTreeSearchClosure;
-template <class Chunk>
-class TreeList: public FreeList<Chunk> {
- friend class TreeChunk<Chunk>;
- friend class BinaryTreeDictionary<Chunk>;
- friend class AscendTreeCensusClosure<Chunk>;
- friend class DescendTreeCensusClosure<Chunk>;
- friend class DescendTreeSearchClosure<Chunk>;
+template <class Chunk_t, template <class> class FreeList_t>
+class TreeList : public FreeList_t<Chunk_t> {
+ friend class TreeChunk<Chunk_t, FreeList_t>;
+ friend class BinaryTreeDictionary<Chunk_t, FreeList_t>;
+ friend class AscendTreeCensusClosure<Chunk_t, FreeList_t>;
+ friend class DescendTreeCensusClosure<Chunk_t, FreeList_t>;
+ friend class DescendTreeSearchClosure<Chunk_t, FreeList_t>;
- TreeList<Chunk>* _parent;
- TreeList<Chunk>* _left;
- TreeList<Chunk>* _right;
+ TreeList<Chunk_t, FreeList_t>* _parent;
+ TreeList<Chunk_t, FreeList_t>* _left;
+ TreeList<Chunk_t, FreeList_t>* _right;
protected:
- TreeList<Chunk>* parent() const { return _parent; }
- TreeList<Chunk>* left() const { return _left; }
- TreeList<Chunk>* right() const { return _right; }
- // Explicitly import these names into our namespace to fix name lookup with templates
- using FreeList<Chunk>::head;
- using FreeList<Chunk>::set_head;
+ TreeList<Chunk_t, FreeList_t>* parent() const { return _parent; }
+ TreeList<Chunk_t, FreeList_t>* left() const { return _left; }
+ TreeList<Chunk_t, FreeList_t>* right() const { return _right; }
- using FreeList<Chunk>::tail;
- using FreeList<Chunk>::set_tail;
- using FreeList<Chunk>::link_tail;
+ // Wrapper on call to base class, to get the template to compile.
+ Chunk_t* head() const { return FreeList_t<Chunk_t>::head(); }
+ Chunk_t* tail() const { return FreeList_t<Chunk_t>::tail(); }
+ void set_head(Chunk_t* head) { FreeList_t<Chunk_t>::set_head(head); }
+ void set_tail(Chunk_t* tail) { FreeList_t<Chunk_t>::set_tail(tail); }
- using FreeList<Chunk>::increment_count;
- NOT_PRODUCT(using FreeList<Chunk>::increment_returned_bytes_by;)
- using FreeList<Chunk>::verify_chunk_in_free_list;
- using FreeList<Chunk>::size;
+ size_t size() const { return FreeList_t<Chunk_t>::size(); }
// Accessors for links in tree.
- void set_left(TreeList<Chunk>* tl) {
+ void set_left(TreeList<Chunk_t, FreeList_t>* tl) {
_left = tl;
if (tl != NULL)
tl->set_parent(this);
}
- void set_right(TreeList<Chunk>* tl) {
+ void set_right(TreeList<Chunk_t, FreeList_t>* tl) {
_right = tl;
if (tl != NULL)
tl->set_parent(this);
}
- void set_parent(TreeList<Chunk>* tl) { _parent = tl; }
+ void set_parent(TreeList<Chunk_t, FreeList_t>* tl) { _parent = tl; }
- void clearLeft() { _left = NULL; }
+ void clear_left() { _left = NULL; }
void clear_right() { _right = NULL; }
void clear_parent() { _parent = NULL; }
- void initialize() { clearLeft(); clear_right(), clear_parent(); }
+ void initialize() { clear_left(); clear_right(), clear_parent(); FreeList_t<Chunk_t>::initialize(); }
// For constructing a TreeList from a Tree chunk or
// address and size.
- static TreeList<Chunk>* as_TreeList(TreeChunk<Chunk>* tc);
- static TreeList<Chunk>* as_TreeList(HeapWord* addr, size_t size);
+ TreeList();
+ static TreeList<Chunk_t, FreeList_t>*
+ as_TreeList(TreeChunk<Chunk_t, FreeList_t>* tc);
+ static TreeList<Chunk_t, FreeList_t>* as_TreeList(HeapWord* addr, size_t size);
// Returns the head of the free list as a pointer to a TreeChunk.
- TreeChunk<Chunk>* head_as_TreeChunk();
+ TreeChunk<Chunk_t, FreeList_t>* head_as_TreeChunk();
// Returns the first available chunk in the free list as a pointer
// to a TreeChunk.
- TreeChunk<Chunk>* first_available();
+ TreeChunk<Chunk_t, FreeList_t>* first_available();
// Returns the block with the largest heap address amongst
// those in the list for this size; potentially slow and expensive,
// use with caution!
- TreeChunk<Chunk>* largest_address();
+ TreeChunk<Chunk_t, FreeList_t>* largest_address();
+
+ TreeList<Chunk_t, FreeList_t>* get_better_list(
+ BinaryTreeDictionary<Chunk_t, FreeList_t>* dictionary);
// remove_chunk_replace_if_needed() removes the given "tc" from the TreeList.
// If "tc" is the first chunk in the list, it is also the
@@ -115,10 +116,10 @@
// returns the possibly replaced TreeList* for the node in
// the tree. It also updates the parent of the original
// node to point to the new node.
- TreeList<Chunk>* remove_chunk_replace_if_needed(TreeChunk<Chunk>* tc);
+ TreeList<Chunk_t, FreeList_t>* remove_chunk_replace_if_needed(TreeChunk<Chunk_t, FreeList_t>* tc);
// See FreeList.
- void return_chunk_at_head(TreeChunk<Chunk>* tc);
- void return_chunk_at_tail(TreeChunk<Chunk>* tc);
+ void return_chunk_at_head(TreeChunk<Chunk_t, FreeList_t>* tc);
+ void return_chunk_at_tail(TreeChunk<Chunk_t, FreeList_t>* tc);
};
// A TreeChunk is a subclass of a Chunk that additionally
@@ -134,52 +135,54 @@
// on the free list for a node in the tree and is only removed if
// it is the last chunk on the free list.
-template <class Chunk>
-class TreeChunk : public Chunk {
- friend class TreeList<Chunk>;
- TreeList<Chunk>* _list;
- TreeList<Chunk> _embedded_list; // if non-null, this chunk is on _list
+template <class Chunk_t, template <class> class FreeList_t>
+class TreeChunk : public Chunk_t {
+ friend class TreeList<Chunk_t, FreeList_t>;
+ TreeList<Chunk_t, FreeList_t>* _list;
+ TreeList<Chunk_t, FreeList_t> _embedded_list; // if non-null, this chunk is on _list
+
+ static size_t _min_tree_chunk_size;
+
protected:
- TreeList<Chunk>* embedded_list() const { return (TreeList<Chunk>*) &_embedded_list; }
- void set_embedded_list(TreeList<Chunk>* v) { _embedded_list = *v; }
+ TreeList<Chunk_t, FreeList_t>* embedded_list() const { return (TreeList<Chunk_t, FreeList_t>*) &_embedded_list; }
+ void set_embedded_list(TreeList<Chunk_t, FreeList_t>* v) { _embedded_list = *v; }
public:
- TreeList<Chunk>* list() { return _list; }
- void set_list(TreeList<Chunk>* v) { _list = v; }
- static TreeChunk<Chunk>* as_TreeChunk(Chunk* fc);
+ TreeList<Chunk_t, FreeList_t>* list() { return _list; }
+ void set_list(TreeList<Chunk_t, FreeList_t>* v) { _list = v; }
+ static TreeChunk<Chunk_t, FreeList_t>* as_TreeChunk(Chunk_t* fc);
// Initialize fields in a TreeChunk that should be
// initialized when the TreeChunk is being added to
// a free list in the tree.
void initialize() { embedded_list()->initialize(); }
- Chunk* next() const { return Chunk::next(); }
- Chunk* prev() const { return Chunk::prev(); }
- size_t size() const volatile { return Chunk::size(); }
+ Chunk_t* next() const { return Chunk_t::next(); }
+ Chunk_t* prev() const { return Chunk_t::prev(); }
+ size_t size() const volatile { return Chunk_t::size(); }
+
+ static size_t min_size() {
+ return _min_tree_chunk_size;
+ }
// debugging
void verify_tree_chunk_list() const;
+ void assert_is_mangled() const;
};
-template <class Chunk>
-class BinaryTreeDictionary: public FreeBlockDictionary<Chunk> {
+template <class Chunk_t, template <class> class FreeList_t>
+class BinaryTreeDictionary: public FreeBlockDictionary<Chunk_t> {
friend class VMStructs;
- bool _splay;
- bool _adaptive_freelists;
size_t _total_size;
size_t _total_free_blocks;
- TreeList<Chunk>* _root;
+ TreeList<Chunk_t, FreeList_t>* _root;
// private accessors
- bool splay() const { return _splay; }
- void set_splay(bool v) { _splay = v; }
void set_total_size(size_t v) { _total_size = v; }
virtual void inc_total_size(size_t v);
virtual void dec_total_size(size_t v);
- size_t total_free_blocks() const { return _total_free_blocks; }
void set_total_free_blocks(size_t v) { _total_free_blocks = v; }
- TreeList<Chunk>* root() const { return _root; }
- void set_root(TreeList<Chunk>* v) { _root = v; }
- bool adaptive_freelists() { return _adaptive_freelists; }
+ TreeList<Chunk_t, FreeList_t>* root() const { return _root; }
+ void set_root(TreeList<Chunk_t, FreeList_t>* v) { _root = v; }
// This field is added and can be set to point to the
// the Mutex used to synchronize access to the
@@ -191,54 +194,55 @@
// return it. If the chunk
// is the last chunk of that size, remove the node for that size
// from the tree.
- TreeChunk<Chunk>* get_chunk_from_tree(size_t size, enum FreeBlockDictionary<Chunk>::Dither dither, bool splay);
- // Return a list of the specified size or NULL from the tree.
- // The list is not removed from the tree.
- TreeList<Chunk>* find_list (size_t size) const;
+ TreeChunk<Chunk_t, FreeList_t>* get_chunk_from_tree(size_t size, enum FreeBlockDictionary<Chunk_t>::Dither dither);
// Remove this chunk from the tree. If the removal results
// in an empty list in the tree, remove the empty list.
- TreeChunk<Chunk>* remove_chunk_from_tree(TreeChunk<Chunk>* tc);
+ TreeChunk<Chunk_t, FreeList_t>* remove_chunk_from_tree(TreeChunk<Chunk_t, FreeList_t>* tc);
// Remove the node in the trees starting at tl that has the
// minimum value and return it. Repair the tree as needed.
- TreeList<Chunk>* remove_tree_minimum(TreeList<Chunk>* tl);
- void semi_splay_step(TreeList<Chunk>* tl);
+ TreeList<Chunk_t, FreeList_t>* remove_tree_minimum(TreeList<Chunk_t, FreeList_t>* tl);
// Add this free chunk to the tree.
- void insert_chunk_in_tree(Chunk* freeChunk);
+ void insert_chunk_in_tree(Chunk_t* freeChunk);
public:
- static const size_t min_tree_chunk_size = sizeof(TreeChunk<Chunk>)/HeapWordSize;
+ // Return a list of the specified size or NULL from the tree.
+ // The list is not removed from the tree.
+ TreeList<Chunk_t, FreeList_t>* find_list (size_t size) const;
void verify_tree() const;
// verify that the given chunk is in the tree.
- bool verify_chunk_in_free_list(Chunk* tc) const;
+ bool verify_chunk_in_free_list(Chunk_t* tc) const;
private:
- void verify_tree_helper(TreeList<Chunk>* tl) const;
- static size_t verify_prev_free_ptrs(TreeList<Chunk>* tl);
+ void verify_tree_helper(TreeList<Chunk_t, FreeList_t>* tl) const;
+ static size_t verify_prev_free_ptrs(TreeList<Chunk_t, FreeList_t>* tl);
// Returns the total number of chunks in the list.
- size_t total_list_length(TreeList<Chunk>* tl) const;
+ size_t total_list_length(TreeList<Chunk_t, FreeList_t>* tl) const;
// Returns the total number of words in the chunks in the tree
// starting at "tl".
- size_t total_size_in_tree(TreeList<Chunk>* tl) const;
+ size_t total_size_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const;
// Returns the sum of the square of the size of each block
// in the tree starting at "tl".
- double sum_of_squared_block_sizes(TreeList<Chunk>* const tl) const;
+ double sum_of_squared_block_sizes(TreeList<Chunk_t, FreeList_t>* const tl) const;
// Returns the total number of free blocks in the tree starting
// at "tl".
- size_t total_free_blocks_in_tree(TreeList<Chunk>* tl) const;
- size_t num_free_blocks() const;
- size_t treeHeight() const;
- size_t tree_height_helper(TreeList<Chunk>* tl) const;
- size_t total_nodes_in_tree(TreeList<Chunk>* tl) const;
- size_t total_nodes_helper(TreeList<Chunk>* tl) const;
+ size_t total_free_blocks_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const;
+ size_t num_free_blocks() const;
+ size_t tree_height() const;
+ size_t tree_height_helper(TreeList<Chunk_t, FreeList_t>* tl) const;
+ size_t total_nodes_in_tree(TreeList<Chunk_t, FreeList_t>* tl) const;
+ size_t total_nodes_helper(TreeList<Chunk_t, FreeList_t>* tl) const;
public:
// Constructor
- BinaryTreeDictionary(bool adaptive_freelists, bool splay = false);
- BinaryTreeDictionary(MemRegion mr, bool adaptive_freelists, bool splay = false);
+ BinaryTreeDictionary() :
+ _total_size(0), _total_free_blocks(0), _root(0) {}
+
+ BinaryTreeDictionary(MemRegion mr);
// Public accessors
size_t total_size() const { return _total_size; }
+ size_t total_free_blocks() const { return _total_free_blocks; }
// Reset the dictionary to the initial conditions with
// a single free chunk.
@@ -249,23 +253,24 @@
// Return a chunk of size "size" or greater from
// the tree.
- // want a better dynamic splay strategy for the future.
- Chunk* get_chunk(size_t size, enum FreeBlockDictionary<Chunk>::Dither dither) {
- FreeBlockDictionary<Chunk>::verify_par_locked();
- Chunk* res = get_chunk_from_tree(size, dither, splay());
+ Chunk_t* get_chunk(size_t size, enum FreeBlockDictionary<Chunk_t>::Dither dither) {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
+ Chunk_t* res = get_chunk_from_tree(size, dither);
assert(res == NULL || res->is_free(),
"Should be returning a free chunk");
+ assert(dither != FreeBlockDictionary<Chunk_t>::exactly ||
+ res == NULL || res->size() == size, "Not correct size");
return res;
}
- void return_chunk(Chunk* chunk) {
- FreeBlockDictionary<Chunk>::verify_par_locked();
+ void return_chunk(Chunk_t* chunk) {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
insert_chunk_in_tree(chunk);
}
- void remove_chunk(Chunk* chunk) {
- FreeBlockDictionary<Chunk>::verify_par_locked();
- remove_chunk_from_tree((TreeChunk<Chunk>*)chunk);
+ void remove_chunk(Chunk_t* chunk) {
+ FreeBlockDictionary<Chunk_t>::verify_par_locked();
+ remove_chunk_from_tree((TreeChunk<Chunk_t, FreeList_t>*)chunk);
assert(chunk->is_free(), "Should still be a free chunk");
}
@@ -281,19 +286,19 @@
}
size_t min_size() const {
- return min_tree_chunk_size;
+ return TreeChunk<Chunk_t, FreeList_t>::min_size();
}
double sum_of_squared_block_sizes() const {
return sum_of_squared_block_sizes(root());
}
- Chunk* find_chunk_ends_at(HeapWord* target) const;
+ Chunk_t* find_chunk_ends_at(HeapWord* target) const;
// Find the list with size "size" in the binary tree and update
// the statistics in the list according to "split" (chunk was
// split or coalesce) and "birth" (chunk was added or removed).
- void dict_census_udpate(size_t size, bool split, bool birth);
+ void dict_census_update(size_t size, bool split, bool birth);
// Return true if the dictionary is overpopulated (more chunks of
// this size than desired) for size "size".
bool coal_dict_over_populated(size_t size);
@@ -307,7 +312,7 @@
// statistics for the sweep.
void end_sweep_dict_census(double splitSurplusPercent);
// Return the largest free chunk in the tree.
- Chunk* find_largest_dict() const;
+ Chunk_t* find_largest_dict() const;
// Accessors for statistics
void set_tree_surplus(double splitSurplusPercent);
void set_tree_hints(void);
diff --git a/hotspot/src/share/vm/memory/filemap.cpp b/hotspot/src/share/vm/memory/filemap.cpp
index d4a11f4..c3d1bf5 100644
--- a/hotspot/src/share/vm/memory/filemap.cpp
+++ b/hotspot/src/share/vm/memory/filemap.cpp
@@ -29,6 +29,7 @@
#include "runtime/arguments.hpp"
#include "runtime/java.hpp"
#include "runtime/os.hpp"
+#include "services/memTracker.hpp"
#include "utilities/defaultStream.hpp"
# include <sys/stat.h>
@@ -344,25 +345,14 @@
fail_continue(err_msg("Unable to reserved shared space at required address " INTPTR_FORMAT, requested_addr));
return rs;
}
+ // the reserved virtual memory is for mapping class data sharing archive
+ if (MemTracker::is_on()) {
+ MemTracker::record_virtual_memory_type((address)rs.base(), mtClassShared);
+ }
return rs;
}
// Memory map a region in the address space.
-
-char* FileMapInfo::map_region(int i, ReservedSpace rs) {
- struct FileMapInfo::FileMapHeader::space_info* si = &_header._space[i];
- size_t used = si->_used;
- size_t size = align_size_up(used, os::vm_allocation_granularity());
-
- ReservedSpace mapped_rs = rs.first_part(size, true, true);
- ReservedSpace unmapped_rs = rs.last_part(size);
- mapped_rs.release();
-
- return map_region(i);
-}
-
-
-// Memory map a region in the address space.
static const char* shared_region_name[] = { "ReadOnly", "ReadWrite", "MiscData", "MiscCode"};
char* FileMapInfo::map_region(int i) {
diff --git a/hotspot/src/share/vm/memory/filemap.hpp b/hotspot/src/share/vm/memory/filemap.hpp
index 760ddfe..7cdd961 100644
--- a/hotspot/src/share/vm/memory/filemap.hpp
+++ b/hotspot/src/share/vm/memory/filemap.hpp
@@ -125,7 +125,6 @@
size_t capacity, bool read_only, bool allow_exec);
void write_bytes(const void* buffer, int count);
void write_bytes_aligned(const void* buffer, int count);
- char* map_region(int i, ReservedSpace rs);
char* map_region(int i);
void unmap_region(int i);
void close();
diff --git a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
index 13b4daa..9b22212 100644
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
@@ -27,6 +27,8 @@
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
#endif // SERIALGC
#include "memory/freeBlockDictionary.hpp"
+#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "thread_linux.inline.hpp"
#endif
@@ -62,6 +64,9 @@
}
#endif
+template class FreeBlockDictionary<Metablock>;
+template class FreeBlockDictionary<Metachunk>;
+
#ifndef SERIALGC
// Explicitly instantiate for FreeChunk
template class FreeBlockDictionary<FreeChunk>;
diff --git a/hotspot/src/share/vm/memory/freeBlockDictionary.hpp b/hotspot/src/share/vm/memory/freeBlockDictionary.hpp
index 573cfed..2502e36 100644
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.hpp
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.hpp
@@ -66,7 +66,7 @@
virtual void reset(HeapWord* addr, size_t size) = 0;
virtual void reset() = 0;
- virtual void dict_census_udpate(size_t size, bool split, bool birth) = 0;
+ virtual void dict_census_update(size_t size, bool split, bool birth) = 0;
virtual bool coal_dict_over_populated(size_t size) = 0;
virtual void begin_sweep_dict_census(double coalSurplusPercent,
float inter_sweep_current, float inter_sweep_estimate,
diff --git a/hotspot/src/share/vm/memory/freeList.cpp b/hotspot/src/share/vm/memory/freeList.cpp
index a5fbc06..f5cd805 100644
--- a/hotspot/src/share/vm/memory/freeList.cpp
+++ b/hotspot/src/share/vm/memory/freeList.cpp
@@ -25,6 +25,8 @@
#include "precompiled.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "memory/freeList.hpp"
+#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
#include "memory/sharedHeap.hpp"
#include "runtime/globals.hpp"
#include "runtime/mutex.hpp"
@@ -49,8 +51,6 @@
{
_size = 0;
_count = 0;
- _hint = 0;
- init_statistics();
}
template <class Chunk>
@@ -62,34 +62,50 @@
{
_size = fc->size();
_count = 1;
- _hint = 0;
- init_statistics();
-#ifndef PRODUCT
- _allocation_stats.set_returned_bytes(size() * HeapWordSize);
-#endif
}
template <class Chunk>
-void FreeList<Chunk>::reset(size_t hint) {
+void FreeList<Chunk>::link_head(Chunk* v) {
+ assert_proper_lock_protection();
+ set_head(v);
+ // If this method is not used (just set the head instead),
+ // this check can be avoided.
+ if (v != NULL) {
+ v->link_prev(NULL);
+ }
+}
+
+
+
+template <class Chunk>
+void FreeList<Chunk>::reset() {
+ // Don't set the _size to 0 because this method is
+ // used with a existing list that has a size but which has
+ // been emptied.
+ // Don't clear the _protecting_lock of an existing list.
set_count(0);
set_head(NULL);
set_tail(NULL);
- set_hint(hint);
}
template <class Chunk>
-void FreeList<Chunk>::init_statistics(bool split_birth) {
- _allocation_stats.initialize(split_birth);
+void FreeList<Chunk>::initialize() {
+#ifdef ASSERT
+ // Needed early because it might be checked in other initializing code.
+ set_protecting_lock(NULL);
+#endif
+ reset();
+ set_size(0);
}
-template <class Chunk>
-Chunk* FreeList<Chunk>::get_chunk_at_head() {
+template <class Chunk_t>
+Chunk_t* FreeList<Chunk_t>::get_chunk_at_head() {
assert_proper_lock_protection();
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
- Chunk* fc = head();
+ Chunk_t* fc = head();
if (fc != NULL) {
- Chunk* nextFC = fc->next();
+ Chunk_t* nextFC = fc->next();
if (nextFC != NULL) {
// The chunk fc being removed has a "next". Set the "next" to the
// "prev" of fc.
@@ -197,11 +213,6 @@
link_tail(chunk);
}
increment_count(); // of # of chunks in list
- DEBUG_ONLY(
- if (record_return) {
- increment_returned_bytes_by(size()*HeapWordSize);
- }
- )
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
assert(head() == NULL || head()->size() == size(), "wrong item on list");
@@ -233,11 +244,6 @@
}
link_tail(chunk);
increment_count(); // of # of chunks in list
- DEBUG_ONLY(
- if (record_return) {
- increment_returned_bytes_by(size()*HeapWordSize);
- }
- )
assert(head() == NULL || head()->prev() == NULL, "list invariant");
assert(tail() == NULL || tail()->next() == NULL, "list invariant");
assert(head() == NULL || head()->size() == size(), "wrong item on list");
@@ -273,7 +279,7 @@
}
}
-// verify_chunk_in_free_list() is used to verify that an item is in this free list.
+// verify_chunk_in_free_lists() is used to verify that an item is in this free list.
// It is used as a debugging aid.
template <class Chunk>
bool FreeList<Chunk>::verify_chunk_in_free_list(Chunk* fc) const {
@@ -294,40 +300,14 @@
#ifndef PRODUCT
template <class Chunk>
-void FreeList<Chunk>::verify_stats() const {
- // The +1 of the LH comparand is to allow some "looseness" in
- // checking: we usually call this interface when adding a block
- // and we'll subsequently update the stats; we cannot update the
- // stats beforehand because in the case of the large-block BT
- // dictionary for example, this might be the first block and
- // in that case there would be no place that we could record
- // the stats (which are kept in the block itself).
- assert((_allocation_stats.prev_sweep() + _allocation_stats.split_births()
- + _allocation_stats.coal_births() + 1) // Total Production Stock + 1
- >= (_allocation_stats.split_deaths() + _allocation_stats.coal_deaths()
- + (ssize_t)count()), // Total Current Stock + depletion
- err_msg("FreeList " PTR_FORMAT " of size " SIZE_FORMAT
- " violates Conservation Principle: "
- "prev_sweep(" SIZE_FORMAT ")"
- " + split_births(" SIZE_FORMAT ")"
- " + coal_births(" SIZE_FORMAT ") + 1 >= "
- " split_deaths(" SIZE_FORMAT ")"
- " coal_deaths(" SIZE_FORMAT ")"
- " + count(" SSIZE_FORMAT ")",
- this, _size, _allocation_stats.prev_sweep(), _allocation_stats.split_births(),
- _allocation_stats.split_births(), _allocation_stats.split_deaths(),
- _allocation_stats.coal_deaths(), count()));
-}
-
-template <class Chunk>
void FreeList<Chunk>::assert_proper_lock_protection_work() const {
- assert(_protecting_lock != NULL, "Don't call this directly");
+ assert(protecting_lock() != NULL, "Don't call this directly");
assert(ParallelGCThreads > 0, "Don't call this directly");
Thread* thr = Thread::current();
if (thr->is_VM_thread() || thr->is_ConcurrentGC_thread()) {
// assert that we are holding the freelist lock
} else if (thr->is_GC_task_thread()) {
- assert(_protecting_lock->owned_by_self(), "FreeList RACE DETECTED");
+ assert(protecting_lock()->owned_by_self(), "FreeList RACE DETECTED");
} else if (thr->is_Java_thread()) {
assert(!SafepointSynchronize::is_at_safepoint(), "Should not be executing");
} else {
@@ -350,21 +330,17 @@
// to the call is a non-null string, it is printed in the first column;
// otherwise, if the argument is null (the default), then the size of the
// (free list) block is printed in the first column.
-template <class Chunk>
-void FreeList<Chunk>::print_on(outputStream* st, const char* c) const {
+template <class Chunk_t>
+void FreeList<Chunk_t>::print_on(outputStream* st, const char* c) const {
if (c != NULL) {
st->print("%16s", c);
} else {
st->print(SIZE_FORMAT_W(16), size());
}
- st->print("\t"
- SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t"
- SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\t" SSIZE_FORMAT_W(14) "\n",
- bfr_surp(), surplus(), desired(), prev_sweep(), before_sweep(),
- count(), coal_births(), coal_deaths(), split_births(), split_deaths());
}
+template class FreeList<Metablock>;
+template class FreeList<Metachunk>;
#ifndef SERIALGC
-// Needs to be after the definitions have been seen.
template class FreeList<FreeChunk>;
#endif // SERIALGC
diff --git a/hotspot/src/share/vm/memory/freeList.hpp b/hotspot/src/share/vm/memory/freeList.hpp
index a982cfb..37438cc 100644
--- a/hotspot/src/share/vm/memory/freeList.hpp
+++ b/hotspot/src/share/vm/memory/freeList.hpp
@@ -40,23 +40,19 @@
// for that implementation.
class Mutex;
-template <class Chunk> class TreeList;
-template <class Chunk> class PrintTreeCensusClosure;
-template <class Chunk>
+template <class Chunk_t>
class FreeList VALUE_OBJ_CLASS_SPEC {
friend class CompactibleFreeListSpace;
friend class VMStructs;
- friend class PrintTreeCensusClosure<Chunk>;
private:
- Chunk* _head; // Head of list of free chunks
- Chunk* _tail; // Tail of list of free chunks
+ Chunk_t* _head; // Head of list of free chunks
+ Chunk_t* _tail; // Tail of list of free chunks
size_t _size; // Size in Heap words of each chunk
ssize_t _count; // Number of entries in list
- size_t _hint; // next larger size list with a positive surplus
- AllocationStats _allocation_stats; // allocation-related statistics
+ protected:
#ifdef ASSERT
Mutex* _protecting_lock;
@@ -71,10 +67,6 @@
#endif
}
- // Initialize the allocation statistics.
- protected:
- void init_statistics(bool split_birth = false);
- void set_count(ssize_t v) { _count = v;}
void increment_count() {
_count++;
}
@@ -89,52 +81,48 @@
// Construct a list without any entries.
FreeList();
// Construct a list with "fc" as the first (and lone) entry in the list.
- FreeList(Chunk* fc);
+ FreeList(Chunk_t* fc);
- // Reset the head, tail, hint, and count of a free list.
- void reset(size_t hint);
+ // Do initialization
+ void initialize();
+
+ // Reset the head, tail, and count of a free list.
+ void reset();
// Declare the current free list to be protected by the given lock.
#ifdef ASSERT
- void set_protecting_lock(Mutex* protecting_lock) {
- _protecting_lock = protecting_lock;
+ Mutex* protecting_lock() const { return _protecting_lock; }
+ void set_protecting_lock(Mutex* v) {
+ _protecting_lock = v;
}
#endif
// Accessors.
- Chunk* head() const {
+ Chunk_t* head() const {
assert_proper_lock_protection();
return _head;
}
- void set_head(Chunk* v) {
+ void set_head(Chunk_t* v) {
assert_proper_lock_protection();
_head = v;
assert(!_head || _head->size() == _size, "bad chunk size");
}
// Set the head of the list and set the prev field of non-null
// values to NULL.
- void link_head(Chunk* v) {
- assert_proper_lock_protection();
- set_head(v);
- // If this method is not used (just set the head instead),
- // this check can be avoided.
- if (v != NULL) {
- v->link_prev(NULL);
- }
- }
+ void link_head(Chunk_t* v);
- Chunk* tail() const {
+ Chunk_t* tail() const {
assert_proper_lock_protection();
return _tail;
}
- void set_tail(Chunk* v) {
+ void set_tail(Chunk_t* v) {
assert_proper_lock_protection();
_tail = v;
assert(!_tail || _tail->size() == _size, "bad chunk size");
}
// Set the tail of the list and set the next field of non-null
// values to NULL.
- void link_tail(Chunk* v) {
+ void link_tail(Chunk_t* v) {
assert_proper_lock_protection();
set_tail(v);
if (v != NULL) {
@@ -152,174 +140,45 @@
assert_proper_lock_protection();
_size = v;
}
- ssize_t count() const {
- return _count;
- }
- size_t hint() const {
- return _hint;
- }
- void set_hint(size_t v) {
- assert_proper_lock_protection();
- assert(v == 0 || _size < v, "Bad hint"); _hint = v;
- }
+ ssize_t count() const { return _count; }
+ void set_count(ssize_t v) { _count = v;}
- // Accessors for statistics
- AllocationStats* allocation_stats() {
- assert_proper_lock_protection();
- return &_allocation_stats;
- }
+ size_t get_better_size() { return size(); }
- ssize_t desired() const {
- return _allocation_stats.desired();
- }
- void set_desired(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_desired(v);
- }
- void compute_desired(float inter_sweep_current,
- float inter_sweep_estimate,
- float intra_sweep_estimate) {
- assert_proper_lock_protection();
- _allocation_stats.compute_desired(_count,
- inter_sweep_current,
- inter_sweep_estimate,
- intra_sweep_estimate);
- }
- ssize_t coal_desired() const {
- return _allocation_stats.coal_desired();
- }
- void set_coal_desired(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_coal_desired(v);
- }
-
- ssize_t surplus() const {
- return _allocation_stats.surplus();
- }
- void set_surplus(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_surplus(v);
- }
- void increment_surplus() {
- assert_proper_lock_protection();
- _allocation_stats.increment_surplus();
- }
- void decrement_surplus() {
- assert_proper_lock_protection();
- _allocation_stats.decrement_surplus();
- }
-
- ssize_t bfr_surp() const {
- return _allocation_stats.bfr_surp();
- }
- void set_bfr_surp(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_bfr_surp(v);
- }
- ssize_t prev_sweep() const {
- return _allocation_stats.prev_sweep();
- }
- void set_prev_sweep(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_prev_sweep(v);
- }
- ssize_t before_sweep() const {
- return _allocation_stats.before_sweep();
- }
- void set_before_sweep(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_before_sweep(v);
- }
-
- ssize_t coal_births() const {
- return _allocation_stats.coal_births();
- }
- void set_coal_births(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_coal_births(v);
- }
- void increment_coal_births() {
- assert_proper_lock_protection();
- _allocation_stats.increment_coal_births();
- }
-
- ssize_t coal_deaths() const {
- return _allocation_stats.coal_deaths();
- }
- void set_coal_deaths(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_coal_deaths(v);
- }
- void increment_coal_deaths() {
- assert_proper_lock_protection();
- _allocation_stats.increment_coal_deaths();
- }
-
- ssize_t split_births() const {
- return _allocation_stats.split_births();
- }
- void set_split_births(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_split_births(v);
- }
- void increment_split_births() {
- assert_proper_lock_protection();
- _allocation_stats.increment_split_births();
- }
-
- ssize_t split_deaths() const {
- return _allocation_stats.split_deaths();
- }
- void set_split_deaths(ssize_t v) {
- assert_proper_lock_protection();
- _allocation_stats.set_split_deaths(v);
- }
- void increment_split_deaths() {
- assert_proper_lock_protection();
- _allocation_stats.increment_split_deaths();
- }
-
- NOT_PRODUCT(
- // For debugging. The "_returned_bytes" in all the lists are summed
- // and compared with the total number of bytes swept during a
- // collection.
- size_t returned_bytes() const { return _allocation_stats.returned_bytes(); }
- void set_returned_bytes(size_t v) { _allocation_stats.set_returned_bytes(v); }
- void increment_returned_bytes_by(size_t v) {
- _allocation_stats.set_returned_bytes(_allocation_stats.returned_bytes() + v);
- }
- )
+ size_t returned_bytes() const { ShouldNotReachHere(); return 0; }
+ void set_returned_bytes(size_t v) {}
+ void increment_returned_bytes_by(size_t v) {}
// Unlink head of list and return it. Returns NULL if
// the list is empty.
- Chunk* get_chunk_at_head();
+ Chunk_t* get_chunk_at_head();
// Remove the first "n" or "count", whichever is smaller, chunks from the
// list, setting "fl", which is required to be empty, to point to them.
- void getFirstNChunksFromList(size_t n, FreeList<Chunk>* fl);
+ void getFirstNChunksFromList(size_t n, FreeList<Chunk_t>* fl);
// Unlink this chunk from it's free list
- void remove_chunk(Chunk* fc);
+ void remove_chunk(Chunk_t* fc);
// Add this chunk to this free list.
- void return_chunk_at_head(Chunk* fc);
- void return_chunk_at_tail(Chunk* fc);
+ void return_chunk_at_head(Chunk_t* fc);
+ void return_chunk_at_tail(Chunk_t* fc);
// Similar to returnChunk* but also records some diagnostic
// information.
- void return_chunk_at_head(Chunk* fc, bool record_return);
- void return_chunk_at_tail(Chunk* fc, bool record_return);
+ void return_chunk_at_head(Chunk_t* fc, bool record_return);
+ void return_chunk_at_tail(Chunk_t* fc, bool record_return);
// Prepend "fl" (whose size is required to be the same as that of "this")
// to the front of "this" list.
- void prepend(FreeList<Chunk>* fl);
+ void prepend(FreeList<Chunk_t>* fl);
// Verify that the chunk is in the list.
// found. Return NULL if "fc" is not found.
- bool verify_chunk_in_free_list(Chunk* fc) const;
+ bool verify_chunk_in_free_list(Chunk_t* fc) const;
// Stats verification
- void verify_stats() const PRODUCT_RETURN;
+// void verify_stats() const { ShouldNotReachHere(); };
// Printing support
static void print_labels_on(outputStream* st, const char* c);
diff --git a/hotspot/src/share/vm/memory/metablock.hpp b/hotspot/src/share/vm/memory/metablock.hpp
new file mode 100644
index 0000000..220d361
--- /dev/null
+++ b/hotspot/src/share/vm/memory/metablock.hpp
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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_VM_MEMORY_METABLOCK_HPP
+#define SHARE_VM_MEMORY_METABLOCK_HPP
+
+// Metablock are the unit of allocation from a Chunk. It is initialized
+// with the size of the requested allocation. That size is overwritten
+// once the allocation returns.
+//
+// A Metablock may be reused by its SpaceManager but are never moved between
+// SpaceManagers. There is no explicit link to the Metachunk
+// from which it was allocated. Metablock may be deallocated and
+// put on a freelist but the space is never freed, rather
+// the Metachunk it is a part of will be deallocated when it's
+// associated class loader is collected.
+
+class Metablock VALUE_OBJ_CLASS_SPEC {
+ friend class VMStructs;
+ private:
+ // Used to align the allocation (see below).
+ union block_t {
+ void* _data[3];
+ struct header_t {
+ size_t _word_size;
+ Metablock* _next;
+ Metablock* _prev;
+ } _header;
+ } _block;
+ static size_t _min_block_byte_size;
+ static size_t _overhead;
+
+ typedef union block_t Block;
+ typedef struct header_t Header;
+ const Block* block() const { return &_block; }
+ const Block::header_t* header() const { return &(block()->_header); }
+ public:
+
+ static Metablock* initialize(MetaWord* p, size_t word_size);
+
+ // This places the body of the block at a 2 word boundary
+ // because every block starts on a 2 word boundary. Work out
+ // how to make the body on a 2 word boundary if the block
+ // starts on a arbitrary boundary. JJJ
+
+ size_t word_size() const { return header()->_word_size; }
+ void set_word_size(size_t v) { _block._header._word_size = v; }
+ size_t size() const volatile { return _block._header._word_size; }
+ void set_size(size_t v) { _block._header._word_size = v; }
+ Metablock* next() const { return header()->_next; }
+ void set_next(Metablock* v) { _block._header._next = v; }
+ Metablock* prev() const { return header()->_prev; }
+ void set_prev(Metablock* v) { _block._header._prev = v; }
+
+ static size_t min_block_byte_size() { return _min_block_byte_size; }
+ static size_t overhead() { return _overhead; }
+
+ bool is_free() { return header()->_word_size != 0; }
+ void clear_next() { set_next(NULL); }
+ void link_prev(Metablock* ptr) { set_prev(ptr); }
+ uintptr_t* end() { return ((uintptr_t*) this) + size(); }
+ bool cantCoalesce() const { return false; }
+ void link_next(Metablock* ptr) { set_next(ptr); }
+ void link_after(Metablock* ptr){
+ link_next(ptr);
+ if (ptr != NULL) ptr->link_prev(this);
+ }
+
+ // Should not be needed in a free list of Metablocks
+ void markNotFree() { ShouldNotReachHere(); }
+
+ // Debug support
+#ifdef ASSERT
+ void* prev_addr() const { return (void*)&_block._header._prev; }
+ void* next_addr() const { return (void*)&_block._header._next; }
+ void* size_addr() const { return (void*)&_block._header._word_size; }
+#endif
+ bool verify_chunk_in_free_list(Metablock* tc) const { return true; }
+ bool verify_par_locked() { return true; }
+
+ void assert_is_mangled() const {/* Don't check "\*/}
+};
+#endif // SHARE_VM_MEMORY_METABLOCK_HPP
diff --git a/hotspot/src/share/vm/memory/metachunk.hpp b/hotspot/src/share/vm/memory/metachunk.hpp
new file mode 100644
index 0000000..dd46197
--- /dev/null
+++ b/hotspot/src/share/vm/memory/metachunk.hpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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_VM_MEMORY_METACHUNK_HPP
+#define SHARE_VM_MEMORY_METACHUNK_HPP
+
+// Metachunk - Quantum of allocation from a Virtualspace
+// Metachunks are reused (when freed are put on a global freelist) and
+// have no permanent association to a SpaceManager.
+
+// +--------------+ <- end
+// | | --+ ---+
+// | | | free |
+// | | | |
+// | | | | capacity
+// | | | |
+// | | <- top --+ |
+// | | ---+ |
+// | | | used |
+// | | | |
+// | | | |
+// +--------------+ <- bottom ---+ ---+
+
+class Metachunk VALUE_OBJ_CLASS_SPEC {
+ // link to support lists of chunks
+ Metachunk* _next;
+ Metachunk* _prev;
+
+ MetaWord* _bottom;
+ MetaWord* _end;
+ MetaWord* _top;
+ size_t _word_size;
+ // Used in a guarantee() so included in the Product builds
+ // even through it is only for debugging.
+ bool _is_free;
+
+ // Metachunks are allocated out of a MetadataVirtualSpace and
+ // and use some of its space to describe itself (plus alignment
+ // considerations). Metadata is allocated in the rest of the chunk.
+ // This size is the overhead of maintaining the Metachunk within
+ // the space.
+ static size_t _overhead;
+
+ void set_bottom(MetaWord* v) { _bottom = v; }
+ void set_end(MetaWord* v) { _end = v; }
+ void set_top(MetaWord* v) { _top = v; }
+ void set_word_size(size_t v) { _word_size = v; }
+ public:
+#ifdef ASSERT
+ Metachunk() : _bottom(NULL), _end(NULL), _top(NULL), _is_free(false) {}
+#else
+ Metachunk() : _bottom(NULL), _end(NULL), _top(NULL) {}
+#endif
+
+ // Used to add a Metachunk to a list of Metachunks
+ void set_next(Metachunk* v) { _next = v; assert(v != this, "Boom");}
+ void set_prev(Metachunk* v) { _prev = v; assert(v != this, "Boom");}
+
+ MetaWord* allocate(size_t word_size);
+ static Metachunk* initialize(MetaWord* ptr, size_t word_size);
+
+ // Accessors
+ Metachunk* next() const { return _next; }
+ Metachunk* prev() const { return _prev; }
+ MetaWord* bottom() const { return _bottom; }
+ MetaWord* end() const { return _end; }
+ MetaWord* top() const { return _top; }
+ size_t word_size() const { return _word_size; }
+ size_t size() const volatile { return _word_size; }
+ void set_size(size_t v) { _word_size = v; }
+ bool is_free() { return _is_free; }
+ void set_is_free(bool v) { _is_free = v; }
+ static size_t overhead() { return _overhead; }
+ void clear_next() { set_next(NULL); }
+ void link_prev(Metachunk* ptr) { set_prev(ptr); }
+ uintptr_t* end() { return ((uintptr_t*) this) + size(); }
+ bool cantCoalesce() const { return false; }
+ void link_next(Metachunk* ptr) { set_next(ptr); }
+ void link_after(Metachunk* ptr){
+ link_next(ptr);
+ if (ptr != NULL) ptr->link_prev(this);
+ }
+
+ // Reset top to bottom so chunk can be reused.
+ void reset_empty() { _top = (_bottom + _overhead); }
+ bool is_empty() { return _top == (_bottom + _overhead); }
+
+ // used (has been allocated)
+ // free (available for future allocations)
+ // capacity (total size of chunk)
+ size_t used_word_size();
+ size_t free_word_size();
+ size_t capacity_word_size();
+
+ // Debug support
+#ifdef ASSERT
+ void* prev_addr() const { return (void*)&_prev; }
+ void* next_addr() const { return (void*)&_next; }
+ void* size_addr() const { return (void*)&_word_size; }
+#endif
+ bool verify_chunk_in_free_list(Metachunk* tc) const { return true; }
+ bool verify_par_locked() { return true; }
+
+ void assert_is_mangled() const {/* Don't check "\*/}
+
+#ifdef ASSERT
+ void mangle();
+#endif // ASSERT
+
+ void print_on(outputStream* st) const;
+ void verify();
+};
+#endif // SHARE_VM_MEMORY_METACHUNK_HPP
diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp
index 0396eef..fc2609f 100644
--- a/hotspot/src/share/vm/memory/metaspace.cpp
+++ b/hotspot/src/share/vm/memory/metaspace.cpp
@@ -24,9 +24,12 @@
#include "precompiled.hpp"
#include "gc_interface/collectedHeap.hpp"
#include "memory/binaryTreeDictionary.hpp"
+#include "memory/freeList.hpp"
#include "memory/collectorPolicy.hpp"
#include "memory/filemap.hpp"
#include "memory/freeList.hpp"
+#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
#include "memory/metaspace.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/resourceArea.hpp"
@@ -37,15 +40,8 @@
#include "utilities/copy.hpp"
#include "utilities/debug.hpp"
-// Define this macro to deallocate Metablock. If not defined,
-// blocks are not yet deallocated and are only mangled.
-#undef DEALLOCATE_BLOCKS
-
-// Easily recognizable patterns
-// These patterns can be the same in 32bit or 64bit since
-// they only have to be easily recognizable.
-const void* metaspace_allocation_leader = (void*) 0X11111111;
-const void* metaspace_allocation_trailer = (void*) 0X77777777;
+typedef BinaryTreeDictionary<Metablock, FreeList> BlockTreeDictionary;
+typedef BinaryTreeDictionary<Metachunk, FreeList> ChunkTreeDictionary;
// Parameters for stress mode testing
const uint metadata_deallocate_a_lot_block = 10;
@@ -53,7 +49,6 @@
size_t const allocation_from_dictionary_limit = 64 * K;
const size_t metadata_chunk_initialize = 0xf7f7f7f7;
const size_t metadata_deallocate = 0xf5f5f5f5;
-const size_t metadata_space_manager_allocate = 0xf3f3f3f3;
MetaWord* last_allocated = 0;
@@ -62,11 +57,12 @@
SmallIndex = 0,
MediumIndex = 1,
HumongousIndex = 2,
- NumberOfFreeLists = 3
+ NumberOfFreeLists = 2,
+ NumberOfInUseLists = 3
};
static ChunkIndex next_chunk_index(ChunkIndex i) {
- assert(i < NumberOfFreeLists, "Out of bound");
+ assert(i < NumberOfInUseLists, "Out of bound");
return (ChunkIndex) (i+1);
}
@@ -100,164 +96,13 @@
// the Chunk after the header for the Chunk) where as Metachunks
// point to space in a VirtualSpace. To replace Metachunks with
// Chunks, change Chunks so that they can be allocated out of a VirtualSpace.
-//
-
-// Metablock are the unit of allocation from a Chunk. It contains
-// the size of the requested allocation in a debug build.
-// Also in a debug build it has a marker before and after the
-// body of the block. The address of the body is the address returned
-// by the allocation.
-//
-// Layout in a debug build. In a product build only the body is present.
-//
-// +-----------+-----------+------------+ +-----------+
-// | word size | leader | body | ... | trailer |
-// +-----------+-----------+------------+ +-----------+
-//
-// A Metablock may be reused by its SpaceManager but are never moved between
-// SpaceManagers. There is no explicit link to the Metachunk
-// from which it was allocated. Metablock are not deallocated, rather
-// the Metachunk it is a part of will be deallocated when it's
-// associated class loader is collected.
-//
-// When the word size of a block is passed in to the deallocation
-// call the word size no longer needs to be part of a Metablock.
-
-class Metablock {
- friend class VMStructs;
- private:
- // Used to align the allocation (see below) and for debugging.
+size_t Metablock::_min_block_byte_size = sizeof(Metablock);
#ifdef ASSERT
- struct {
- size_t _word_size;
- void* _leader;
- } _header;
- void* _data[1];
-#endif
- static size_t _overhead;
-
-#ifdef ASSERT
- void set_word_size(size_t v) { _header._word_size = v; }
- void* leader() { return _header._leader; }
- void* trailer() {
- jlong index = (jlong) _header._word_size - sizeof(_header)/BytesPerWord - 1;
- assert(index > 0, err_msg("Bad indexling of trailer %d", index));
- void** ptr = &_data[index];
- return *ptr;
- }
- void set_leader(void* v) { _header._leader = v; }
- void set_trailer(void* v) {
- void** ptr = &_data[_header._word_size - sizeof(_header)/BytesPerWord - 1];
- *ptr = v;
- }
- public:
- size_t word_size() { return _header._word_size; }
-#endif
- public:
-
- static Metablock* initialize(MetaWord* p, size_t word_size);
-
- // This places the body of the block at a 2 word boundary
- // because every block starts on a 2 word boundary. Work out
- // how to make the body on a 2 word boundary if the block
- // starts on a arbitrary boundary. JJJ
-
-#ifdef ASSERT
- MetaWord* data() { return (MetaWord*) &_data[0]; }
+ size_t Metablock::_overhead =
+ Chunk::aligned_overhead_size(sizeof(Metablock)) / BytesPerWord;
#else
- MetaWord* data() { return (MetaWord*) this; }
+ size_t Metablock::_overhead = 0;
#endif
- static Metablock* metablock_from_data(MetaWord* p) {
-#ifdef ASSERT
- size_t word_offset = offset_of(Metablock, _data)/BytesPerWord;
- Metablock* result = (Metablock*) (p - word_offset);
- return result;
-#else
- return (Metablock*) p;
-#endif
- }
-
- static size_t overhead() { return _overhead; }
- void verify();
-};
-
-// Metachunk - Quantum of allocation from a Virtualspace
-// Metachunks are reused (when freed are put on a global freelist) and
-// have no permanent association to a SpaceManager.
-
-// +--------------+ <- end
-// | | --+ ---+
-// | | | free |
-// | | | |
-// | | | | capacity
-// | | | |
-// | | <- top --+ |
-// | | ---+ |
-// | | | used |
-// | | | |
-// | | | |
-// +--------------+ <- bottom ---+ ---+
-
-class Metachunk VALUE_OBJ_CLASS_SPEC {
- // link to support lists of chunks
- Metachunk* _next;
-
- MetaWord* _bottom;
- MetaWord* _end;
- MetaWord* _top;
- size_t _word_size;
-
- // Metachunks are allocated out of a MetadataVirtualSpace and
- // and use some of its space to describe itself (plus alignment
- // considerations). Metadata is allocated in the rest of the chunk.
- // This size is the overhead of maintaining the Metachunk within
- // the space.
- static size_t _overhead;
-
- void set_bottom(MetaWord* v) { _bottom = v; }
- void set_end(MetaWord* v) { _end = v; }
- void set_top(MetaWord* v) { _top = v; }
- void set_word_size(size_t v) { _word_size = v; }
- public:
-
- // Used to add a Metachunk to a list of Metachunks
- void set_next(Metachunk* v) { _next = v; assert(v != this, "Boom");}
-
- Metablock* allocate(size_t word_size);
- static Metachunk* initialize(MetaWord* ptr, size_t word_size);
-
- // Accessors
- Metachunk* next() const { return _next; }
- MetaWord* bottom() const { return _bottom; }
- MetaWord* end() const { return _end; }
- MetaWord* top() const { return _top; }
- size_t word_size() const { return _word_size; }
- static size_t overhead() { return _overhead; }
-
- // Reset top to bottom so chunk can be reused.
- void reset_empty() { _top = (_bottom + _overhead); }
- bool is_empty() { return _top == (_bottom + _overhead); }
-
- // used (has been allocated)
- // free (available for future allocations)
- // capacity (total size of chunk)
- size_t used_word_size();
- size_t free_word_size();
- size_t capacity_word_size();
-
-#ifdef ASSERT
- void mangle() {
- // Mangle the payload of the chunk and not the links that
- // maintain list of chunks.
- HeapWord* start = (HeapWord*)(bottom() + overhead());
- size_t word_size = capacity_word_size() - overhead();
- Copy::fill_to_words(start, word_size, metadata_chunk_initialize);
- }
-#endif // ASSERT
-
- void print_on(outputStream* st) const;
- void verify();
-};
// Pointer to list of Metachunks.
@@ -292,7 +137,10 @@
// SmallChunk
// MediumChunk
// HumongousChunk
- ChunkList _free_chunks[3];
+ ChunkList _free_chunks[NumberOfFreeLists];
+
+ // HumongousChunk
+ ChunkTreeDictionary _humongous_dictionary;
// ChunkManager in all lists of this type
size_t _free_chunks_total;
@@ -337,7 +185,9 @@
}
ChunkList* free_medium_chunks() { return &_free_chunks[1]; }
ChunkList* free_small_chunks() { return &_free_chunks[0]; }
- ChunkList* free_humongous_chunks() { return &_free_chunks[2]; }
+ ChunkTreeDictionary* humongous_dictionary() {
+ return &_humongous_dictionary;
+ }
ChunkList* free_chunks(ChunkIndex index);
@@ -356,41 +206,35 @@
void locked_print_free_chunks(outputStream* st);
void locked_print_sum_free_chunks(outputStream* st);
+
+ void print_on(outputStream* st);
};
// Used to manage the free list of Metablocks (a block corresponds
// to the allocation of a quantum of metadata).
class BlockFreelist VALUE_OBJ_CLASS_SPEC {
-#ifdef DEALLOCATE_BLOCKS
- BinaryTreeDictionary<Metablock>* _dictionary;
-#endif
- static Metablock* initialize_free_chunk(Metablock* block, size_t word_size);
+ BlockTreeDictionary* _dictionary;
+ static Metablock* initialize_free_chunk(MetaWord* p, size_t word_size);
-#ifdef DEALLOCATE_BLOCKS
// Accessors
- BinaryTreeDictionary<Metablock>* dictionary() const { return _dictionary; }
-#endif
+ BlockTreeDictionary* dictionary() const { return _dictionary; }
public:
BlockFreelist();
~BlockFreelist();
// Get and return a block to the free list
- Metablock* get_block(size_t word_size);
- void return_block(Metablock* block, size_t word_size);
+ MetaWord* get_block(size_t word_size);
+ void return_block(MetaWord* p, size_t word_size);
- size_t totalSize() {
-#ifdef DEALLOCATE_BLOCKS
- if (dictionary() == NULL) {
- return 0;
- } else {
- return dictionary()->totalSize();
- }
-#else
+ size_t total_size() {
+ if (dictionary() == NULL) {
return 0;
-#endif
+ } else {
+ return dictionary()->total_size();
}
+}
void print_on(outputStream* st) const;
};
@@ -600,7 +444,6 @@
};
};
-
class Metadebug : AllStatic {
// Debugging support for Metaspaces
static int _deallocate_block_a_lot_count;
@@ -655,7 +498,7 @@
// List of chunks in use by this SpaceManager. Allocations
// are done from the current chunk. The list is used for deallocating
// chunks when the SpaceManager is freed.
- Metachunk* _chunks_in_use[NumberOfFreeLists];
+ Metachunk* _chunks_in_use[NumberOfInUseLists];
Metachunk* _current_chunk;
// Virtual space where allocation comes from.
@@ -700,24 +543,6 @@
// Add chunk to the list of chunks in use
void add_chunk(Metachunk* v, bool make_current);
- // Debugging support
- void verify_chunks_in_use_index(ChunkIndex index, Metachunk* v) {
- switch (index) {
- case 0:
- assert(v->word_size() == SmallChunk, "Not a SmallChunk");
- break;
- case 1:
- assert(v->word_size() == MediumChunk, "Not a MediumChunk");
- break;
- case 2:
- assert(v->word_size() > MediumChunk, "Not a HumongousChunk");
- break;
- default:
- assert(false, "Wrong list.");
- }
- }
-
- protected:
Mutex* lock() const { return _lock; }
public:
@@ -751,10 +576,10 @@
MetaWord* allocate(size_t word_size);
// Helper for allocations
- Metablock* allocate_work(size_t word_size);
+ MetaWord* allocate_work(size_t word_size);
// Returns a block to the per manager freelist
- void deallocate(MetaWord* p);
+ void deallocate(MetaWord* p, size_t word_size);
// Based on the allocation size and a minimum chunk size,
// returned chunk size (for expanding space for chunk allocation).
@@ -763,7 +588,7 @@
// Called when an allocation from the current chunk fails.
// Gets a new chunk (may require getting a new virtual space),
// and allocates from that chunk.
- Metablock* grow_and_allocate(size_t word_size);
+ MetaWord* grow_and_allocate(size_t word_size);
// debugging support.
@@ -780,6 +605,8 @@
uint const SpaceManager::_small_chunk_limit = 4;
+
+
const char* SpaceManager::_expand_lock_name =
"SpaceManager chunk allocation lock";
const int SpaceManager::_expand_lock_rank = Monitor::leaf - 1;
@@ -788,39 +615,26 @@
SpaceManager::_expand_lock_name,
Mutex::_allow_vm_block_flag);
-#ifdef ASSERT
-size_t Metablock::_overhead =
- Chunk::aligned_overhead_size(sizeof(Metablock)) / BytesPerWord;
-#else
-size_t Metablock::_overhead = 0;
-#endif
size_t Metachunk::_overhead =
Chunk::aligned_overhead_size(sizeof(Metachunk)) / BytesPerWord;
// New blocks returned by the Metaspace are zero initialized.
// We should fix the constructors to not assume this instead.
Metablock* Metablock::initialize(MetaWord* p, size_t word_size) {
+ if (p == NULL) {
+ return NULL;
+ }
+
Metablock* result = (Metablock*) p;
// Clear the memory
Copy::fill_to_aligned_words((HeapWord*)result, word_size);
#ifdef ASSERT
result->set_word_size(word_size);
- // Check after work size is set.
- result->set_leader((void*) metaspace_allocation_leader);
- result->set_trailer((void*) metaspace_allocation_trailer);
#endif
return result;
}
-void Metablock::verify() {
-#ifdef ASSERT
- assert(leader() == metaspace_allocation_leader &&
- trailer() == metaspace_allocation_trailer,
- "block has been corrupted");
-#endif
-}
-
// Metachunk methods
Metachunk* Metachunk::initialize(MetaWord* ptr, size_t word_size) {
@@ -843,18 +657,13 @@
}
-Metablock* Metachunk::allocate(size_t word_size) {
- Metablock* result = NULL;
+MetaWord* Metachunk::allocate(size_t word_size) {
+ MetaWord* result = NULL;
// If available, bump the pointer to allocate.
if (free_word_size() >= word_size) {
- result = Metablock::initialize(_top, word_size);
+ result = _top;
_top = _top + word_size;
}
-#ifdef ASSERT
- assert(result == NULL ||
- result->word_size() == word_size,
- "Block size is not set correctly");
-#endif
return result;
}
@@ -878,103 +687,85 @@
bottom(), top(), end(), word_size());
}
+#ifdef ASSERT
+void Metachunk::mangle() {
+ // Mangle the payload of the chunk and not the links that
+ // maintain list of chunks.
+ HeapWord* start = (HeapWord*)(bottom() + overhead());
+ size_t word_size = capacity_word_size() - overhead();
+ Copy::fill_to_words(start, word_size, metadata_chunk_initialize);
+}
+#endif // ASSERT
void Metachunk::verify() {
#ifdef ASSERT
// Cannot walk through the blocks unless the blocks have
// headers with sizes.
- MetaWord* curr = bottom() + overhead();
- while (curr < top()) {
- Metablock* block = (Metablock*) curr;
- size_t word_size = block->word_size();
- block->verify();
- curr = curr + word_size;
- }
+ assert(_bottom <= _top &&
+ _top <= _end,
+ "Chunk has been smashed");
+ assert(SpaceManager::is_humongous(_word_size) ||
+ _word_size == SpaceManager::MediumChunk ||
+ _word_size == SpaceManager::SmallChunk,
+ "Chunk size is wrong");
#endif
return;
}
// BlockFreelist methods
-#ifdef DEALLOCATE_BLOCKS
BlockFreelist::BlockFreelist() : _dictionary(NULL) {}
-#else
-BlockFreelist::BlockFreelist() {}
-#endif
BlockFreelist::~BlockFreelist() {
-#ifdef DEALLOCATE_BLOCKS
if (_dictionary != NULL) {
if (Verbose && TraceMetadataChunkAllocation) {
_dictionary->print_free_lists(gclog_or_tty);
}
delete _dictionary;
}
-#endif
}
-Metablock* BlockFreelist::initialize_free_chunk(Metablock* block, size_t word_size) {
-#ifdef DEALLOCATE_BLOCKS
-#ifdef ASSERT
- assert(word_size = block->word_size(), "Wrong chunk size");
-#endif
- Metablock* result = block;
- result->setSize(word_size);
- result->linkPrev(NULL);
- result->linkNext(NULL);
+Metablock* BlockFreelist::initialize_free_chunk(MetaWord* p, size_t word_size) {
+ Metablock* block = (Metablock*) p;
+ block->set_word_size(word_size);
+ block->set_prev(NULL);
+ block->set_next(NULL);
- return result;
-#else
- ShouldNotReachHere();
return block;
-#endif
}
-void BlockFreelist::return_block(Metablock* block, size_t word_size) {
-#ifdef ASSERT
- assert(word_size = block->word_size(), "Block size is wrong");;
-#endif
- Metablock* free_chunk = initialize_free_chunk(block, word_size);
-#ifdef DEALLOCATE_BLOCKS
+void BlockFreelist::return_block(MetaWord* p, size_t word_size) {
+ Metablock* free_chunk = initialize_free_chunk(p, word_size);
if (dictionary() == NULL) {
- _dictionary = new BinaryTreeDictionary<Metablock>(false /* adaptive_freelists */);
+ _dictionary = new BlockTreeDictionary();
}
- dictionary()->returnChunk(free_chunk);
-#endif
+ dictionary()->return_chunk(free_chunk);
}
-Metablock* BlockFreelist::get_block(size_t word_size) {
-#ifdef DEALLOCATE_BLOCKS
+MetaWord* BlockFreelist::get_block(size_t word_size) {
if (dictionary() == NULL) {
return NULL;
}
- Metablock* free_chunk =
- dictionary()->getChunk(word_size, FreeBlockDictionary<Metablock>::exactly);
-#else
- Metablock* free_chunk = NULL;
-#endif
- if (free_chunk == NULL) {
+ if (word_size < TreeChunk<Metablock, FreeList>::min_size()) {
+ // Dark matter. Too small for dictionary.
return NULL;
}
- assert(free_chunk->word_size() == word_size, "Size of chunk is incorrect");
- Metablock* block = Metablock::initialize((MetaWord*) free_chunk, word_size);
-#ifdef ASSERT
- assert(block->word_size() == word_size, "Block size is not set correctly");
-#endif
- return block;
+ Metablock* free_block =
+ dictionary()->get_chunk(word_size, FreeBlockDictionary<Metablock>::exactly);
+ if (free_block == NULL) {
+ return NULL;
+ }
+
+ return (MetaWord*) free_block;
}
void BlockFreelist::print_on(outputStream* st) const {
-#ifdef DEALLOCATE_BLOCKS
if (dictionary() == NULL) {
return;
}
dictionary()->print_free_lists(st);
-#else
- return;
-#endif
}
// VirtualSpaceNode methods
@@ -1597,14 +1388,11 @@
Metadebug::deallocate_block_a_lot_count() % MetaDataDeallocateALotInterval == 0 ) {
Metadebug::set_deallocate_block_a_lot_count(0);
for (uint i = 0; i < metadata_deallocate_a_lot_block; i++) {
- Metablock* dummy_block = sm->allocate_work(raw_word_size);
+ MetaWord* dummy_block = sm->allocate_work(raw_word_size);
if (dummy_block == 0) {
break;
}
-#ifdef ASSERT
- assert(dummy_block->word_size() == raw_word_size, "Block size is not set correctly");
-#endif
- sm->deallocate(dummy_block->data());
+ sm->deallocate(dummy_block, raw_word_size);
}
} else {
Metadebug::inc_deallocate_block_a_lot_count();
@@ -1784,8 +1572,8 @@
}
void ChunkManager::locked_verify() {
- locked_verify_free_chunks_total();
locked_verify_free_chunks_count();
+ locked_verify_free_chunks_total();
}
void ChunkManager::locked_print_free_chunks(outputStream* st) {
@@ -1803,7 +1591,6 @@
return &_free_chunks[index];
}
-
// These methods that sum the free chunk lists are used in printing
// methods that are used in product builds.
size_t ChunkManager::sum_free_chunks() {
@@ -1818,6 +1605,7 @@
result = result + list->sum_list_capacity();
}
+ result = result + humongous_dictionary()->total_size();
return result;
}
@@ -1831,6 +1619,7 @@
}
count = count + list->sum_list_count();
}
+ count = count + humongous_dictionary()->total_free_blocks();
return count;
}
@@ -1875,23 +1664,24 @@
assert_lock_strong(SpaceManager::expand_lock());
locked_verify();
- ChunkList* free_list = find_free_chunks_list(word_size);
- assert(free_list != NULL, "Sanity check");
- Metachunk* chunk = free_list->head();
- debug_only(Metachunk* debug_head = chunk;)
+ Metachunk* chunk = NULL;
+ if (!SpaceManager::is_humongous(word_size)) {
+ ChunkList* free_list = find_free_chunks_list(word_size);
+ assert(free_list != NULL, "Sanity check");
- if (chunk == NULL) {
- return NULL;
- }
+ chunk = free_list->head();
+ debug_only(Metachunk* debug_head = chunk;)
- Metachunk* prev_chunk = chunk;
- if (chunk->word_size() == word_size) {
- // Chunk is being removed from the chunks free list.
- dec_free_chunks_total(chunk->capacity_word_size());
+ if (chunk == NULL) {
+ return NULL;
+ }
+
// Remove the chunk as the head of the list.
free_list->set_head(chunk->next());
chunk->set_next(NULL);
+ // Chunk has been removed from the chunks free list.
+ dec_free_chunks_total(chunk->capacity_word_size());
if (TraceMetadataChunkAllocation && Verbose) {
tty->print_cr("ChunkManager::free_chunks_get: free_list "
@@ -1899,79 +1689,24 @@
free_list, chunk, chunk->word_size());
}
} else {
- assert(SpaceManager::is_humongous(word_size),
- "Should only need to check humongous");
- // This code to find the best fit is just for purposes of
- // investigating the loss due to fragmentation on a humongous
- // chunk. It will be replace by a binaryTreeDictionary for
- // the humongous chunks.
- uint count = 0;
- Metachunk* best_fit = NULL;
- Metachunk* best_fit_prev = NULL;
- while (chunk != NULL) {
- count++;
- if (chunk->word_size() < word_size) {
- prev_chunk = chunk;
- chunk = chunk->next();
- } else if (chunk->word_size() == word_size) {
- break;
- } else {
- if (best_fit == NULL ||
- best_fit->word_size() > chunk->word_size()) {
- best_fit_prev = prev_chunk;
- best_fit = chunk;
- }
- prev_chunk = chunk;
- chunk = chunk->next();
+ chunk = humongous_dictionary()->get_chunk(
+ word_size,
+ FreeBlockDictionary<Metachunk>::atLeast);
+
+ if (chunk != NULL) {
+ if (TraceMetadataHumongousAllocation) {
+ size_t waste = chunk->word_size() - word_size;
+ tty->print_cr("Free list allocate humongous chunk size " SIZE_FORMAT
+ " for requested size " SIZE_FORMAT
+ " waste " SIZE_FORMAT,
+ chunk->word_size(), word_size, waste);
}
+ // Chunk is being removed from the chunks free list.
+ dec_free_chunks_total(chunk->capacity_word_size());
+#ifdef ASSERT
+ chunk->set_is_free(false);
+#endif
}
- if (chunk == NULL) {
- prev_chunk = best_fit_prev;
- chunk = best_fit;
- }
- if (chunk != NULL) {
- if (TraceMetadataHumongousAllocation) {
- size_t waste = chunk->word_size() - word_size;
- tty->print_cr("Free list allocate humongous chunk size " SIZE_FORMAT
- " for requested size " SIZE_FORMAT
- " waste " SIZE_FORMAT
- " found at " SIZE_FORMAT " of " SIZE_FORMAT,
- chunk->word_size(), word_size, waste,
- count, free_list->sum_list_count());
- }
- // Chunk is being removed from the chunks free list.
- dec_free_chunks_total(chunk->capacity_word_size());
- // Remove the chunk if it is at the head of the list.
- if (chunk == free_list->head()) {
- free_list->set_head(chunk->next());
-
- if (TraceMetadataHumongousAllocation) {
- tty->print_cr("ChunkManager::free_chunks_get: humongous free_list "
- PTR_FORMAT " chunk " PTR_FORMAT " size " SIZE_FORMAT
- " new head " PTR_FORMAT,
- free_list, chunk, chunk->word_size(),
- free_list->head());
- }
- } else {
- // Remove a chunk in the interior of the list
- prev_chunk->set_next(chunk->next());
-
- if (TraceMetadataHumongousAllocation) {
- tty->print_cr("ChunkManager::free_chunks_get: humongous free_list "
- PTR_FORMAT " chunk " PTR_FORMAT " size " SIZE_FORMAT
- PTR_FORMAT " prev " PTR_FORMAT " next " PTR_FORMAT,
- free_list, chunk, chunk->word_size(),
- prev_chunk, chunk->next());
- }
- }
- chunk->set_next(NULL);
- } else {
- if (TraceMetadataHumongousAllocation) {
- tty->print_cr("ChunkManager::free_chunks_get: New humongous chunk of size "
- SIZE_FORMAT,
- word_size);
- }
- }
}
locked_verify();
return chunk;
@@ -2000,12 +1735,18 @@
return chunk;
}
+void ChunkManager::print_on(outputStream* out) {
+ if (PrintFLSStatistics != 0) {
+ humongous_dictionary()->report_statistics();
+ }
+}
+
// SpaceManager methods
size_t SpaceManager::sum_free_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t free = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
free += chunk->free_word_size();
@@ -2018,11 +1759,12 @@
size_t SpaceManager::sum_waste_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t result = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
- // Count the free space in all the chunk but not the
- // current chunk from which allocations are still being done.
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+
+
result += sum_waste_in_chunks_in_use(i);
}
+
return result;
}
@@ -2033,10 +1775,10 @@
// Count the free space in all the chunk but not the
// current chunk from which allocations are still being done.
if (chunk != NULL) {
- while (chunk != NULL) {
- if (chunk != current_chunk()) {
- result += chunk->free_word_size();
- }
+ Metachunk* prev = chunk;
+ while (chunk != NULL && chunk != current_chunk()) {
+ result += chunk->free_word_size();
+ prev = chunk;
chunk = chunk->next();
count++;
}
@@ -2047,7 +1789,7 @@
size_t SpaceManager::sum_capacity_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t sum = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
// Just changed this sum += chunk->capacity_word_size();
@@ -2061,9 +1803,10 @@
size_t SpaceManager::sum_count_in_chunks_in_use() {
size_t count = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
count = count + sum_count_in_chunks_in_use(i);
}
+
return count;
}
@@ -2081,7 +1824,7 @@
size_t SpaceManager::sum_used_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t used = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
used += chunk->used_word_size();
@@ -2139,15 +1882,13 @@
gclog_or_tty->print_cr(" word_size " PTR_FORMAT, word_size);
gclog_or_tty->print_cr(" chunk_word_size " PTR_FORMAT,
chunk_word_size);
- gclog_or_tty->print_cr(" block overhead " PTR_FORMAT
- " chunk overhead " PTR_FORMAT,
- Metablock::overhead(),
+ gclog_or_tty->print_cr(" chunk overhead " PTR_FORMAT,
Metachunk::overhead());
}
return chunk_word_size;
}
-Metablock* SpaceManager::grow_and_allocate(size_t word_size) {
+MetaWord* SpaceManager::grow_and_allocate(size_t word_size) {
assert(vs_list()->current_virtual_space() != NULL,
"Should have been set");
assert(current_chunk() == NULL ||
@@ -2180,7 +1921,7 @@
void SpaceManager::print_on(outputStream* st) const {
for (ChunkIndex i = SmallIndex;
- i < NumberOfFreeLists ;
+ i < NumberOfInUseLists ;
i = next_chunk_index(i) ) {
st->print_cr(" chunks_in_use " PTR_FORMAT " chunk size " PTR_FORMAT,
chunks_in_use(i),
@@ -2191,8 +1932,11 @@
sum_waste_in_chunks_in_use(SmallIndex),
sum_waste_in_chunks_in_use(MediumIndex),
sum_waste_in_chunks_in_use(HumongousIndex));
- // Nothing in them yet
- // block_freelists()->print_on(st);
+ // block free lists
+ if (block_freelists() != NULL) {
+ st->print_cr("total in block free lists " SIZE_FORMAT,
+ block_freelists()->total_size());
+ }
}
SpaceManager::SpaceManager(Mutex* lock, VirtualSpaceList* vs_list) :
@@ -2200,7 +1944,7 @@
_allocation_total(0),
_lock(lock) {
Metadebug::init_allocation_fail_alot_count();
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
_chunks_in_use[i] = NULL;
}
_current_chunk = NULL;
@@ -2262,22 +2006,24 @@
// Humongous chunks are never the current chunk.
Metachunk* humongous_chunks = chunks_in_use(HumongousIndex);
- if (humongous_chunks != NULL) {
- chunk_manager->free_humongous_chunks()->add_at_head(humongous_chunks);
- set_chunks_in_use(HumongousIndex, NULL);
+ while (humongous_chunks != NULL) {
+#ifdef ASSERT
+ humongous_chunks->set_is_free(true);
+#endif
+ Metachunk* next_humongous_chunks = humongous_chunks->next();
+ chunk_manager->humongous_dictionary()->return_chunk(humongous_chunks);
+ humongous_chunks = next_humongous_chunks;
}
+ set_chunks_in_use(HumongousIndex, NULL);
chunk_manager->locked_verify();
}
-void SpaceManager::deallocate(MetaWord* p) {
+void SpaceManager::deallocate(MetaWord* p, size_t word_size) {
assert_lock_strong(_lock);
- ShouldNotReachHere(); // Where is this needed.
-#ifdef DEALLOCATE_BLOCKS
- Metablock* block = Metablock::metablock_from_data(p);
- // This is expense but kept it until integration JJJ
- assert(contains((address)block), "Block does not belong to this metaspace");
- block_freelists()->return_block(block, word_size);
-#endif
+ size_t min_size = TreeChunk<Metablock, FreeList>::min_size();
+ assert(word_size >= min_size,
+ err_msg("Should not deallocate dark matter " SIZE_FORMAT, word_size));
+ block_freelists()->return_block(p, word_size);
}
// Adds a chunk to the list of chunks in use.
@@ -2366,50 +2112,40 @@
MetaWord* SpaceManager::allocate(size_t word_size) {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
- size_t block_overhead = Metablock::overhead();
// If only the dictionary is going to be used (i.e., no
// indexed free list), then there is a minimum size requirement.
// MinChunkSize is a placeholder for the real minimum size JJJ
- size_t byte_size_with_overhead = (word_size + block_overhead) * BytesPerWord;
-#ifdef DEALLOCATE_BLOCKS
- size_t raw_bytes_size = MAX2(ARENA_ALIGN(byte_size_with_overhead),
- MinChunkSize * BytesPerWord);
-#else
- size_t raw_bytes_size = ARENA_ALIGN(byte_size_with_overhead);
-#endif
+ size_t byte_size = word_size * BytesPerWord;
+
+ size_t byte_size_with_overhead = byte_size + Metablock::overhead();
+
+ size_t raw_bytes_size = MAX2(byte_size_with_overhead,
+ Metablock::min_block_byte_size());
+ raw_bytes_size = ARENA_ALIGN(raw_bytes_size);
size_t raw_word_size = raw_bytes_size / BytesPerWord;
assert(raw_word_size * BytesPerWord == raw_bytes_size, "Size problem");
BlockFreelist* fl = block_freelists();
- Metablock* block = NULL;
+ MetaWord* p = NULL;
// Allocation from the dictionary is expensive in the sense that
// the dictionary has to be searched for a size. Don't allocate
// from the dictionary until it starts to get fat. Is this
// a reasonable policy? Maybe an skinny dictionary is fast enough
// for allocations. Do some profiling. JJJ
- if (fl->totalSize() > allocation_from_dictionary_limit) {
- block = fl->get_block(raw_word_size);
+ if (fl->total_size() > allocation_from_dictionary_limit) {
+ p = fl->get_block(raw_word_size);
}
- if (block == NULL) {
- block = allocate_work(raw_word_size);
- if (block == NULL) {
- return NULL;
- }
+ if (p == NULL) {
+ p = allocate_work(raw_word_size);
}
Metadebug::deallocate_block_a_lot(this, raw_word_size);
- // Push the allocation past the word containing the size and leader.
-#ifdef ASSERT
- MetaWord* result = block->data();
- return result;
-#else
- return (MetaWord*) block;
-#endif
+ return p;
}
// Returns the address of spaced allocated for "word_size".
// This methods does not know about blocks (Metablocks)
-Metablock* SpaceManager::allocate_work(size_t word_size) {
+MetaWord* SpaceManager::allocate_work(size_t word_size) {
assert_lock_strong(_lock);
#ifdef ASSERT
if (Metadebug::test_metadata_failure()) {
@@ -2417,7 +2153,7 @@
}
#endif
// Is there space in the current chunk?
- Metablock* result = NULL;
+ MetaWord* result = NULL;
// For DumpSharedSpaces, only allocate out of the current chunk which is
// never null because we gave it the size we wanted. Caller reports out
@@ -2436,8 +2172,8 @@
}
if (result > 0) {
inc_allocation_total(word_size);
- assert(result != (Metablock*) chunks_in_use(MediumIndex), "Head of the list is being allocated");
- assert(result->word_size() == word_size, "Size not set correctly");
+ assert(result != (MetaWord*) chunks_in_use(MediumIndex),
+ "Head of the list is being allocated");
}
return result;
@@ -2447,13 +2183,13 @@
// If there are blocks in the dictionary, then
// verfication of chunks does not work since
// being in the dictionary alters a chunk.
- if (block_freelists()->totalSize() == 0) {
+ if (block_freelists()->total_size() == 0) {
// Skip the small chunks because their next link points to
// medium chunks. This is because the small chunk is the
// current chunk (for allocations) until it is full and the
// the addition of the next chunk does not NULL the next
// like of the small chunk.
- for (ChunkIndex i = MediumIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = MediumIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* curr = chunks_in_use(i);
while (curr != NULL) {
curr->verify();
@@ -2492,7 +2228,7 @@
// Add up statistics for all chunks in this SpaceManager.
for (ChunkIndex index = SmallIndex;
- index < NumberOfFreeLists;
+ index < NumberOfInUseLists;
index = next_chunk_index(index)) {
for (Metachunk* curr = chunks_in_use(index);
curr != NULL;
@@ -2521,7 +2257,7 @@
#ifdef ASSERT
void SpaceManager::mangle_freed_chunks() {
for (ChunkIndex index = SmallIndex;
- index < NumberOfFreeLists;
+ index < NumberOfInUseLists;
index = next_chunk_index(index)) {
for (Metachunk* curr = chunks_in_use(index);
curr != NULL;
@@ -2833,13 +2569,12 @@
}
}
-
MetaWord* Metaspace::allocate(size_t word_size, MetadataType mdtype) {
// DumpSharedSpaces doesn't use class metadata area (yet)
if (mdtype == ClassType && !DumpSharedSpaces) {
- return class_vsm()->allocate(word_size);
+ return class_vsm()->allocate(word_size);
} else {
- return vsm()->allocate(word_size);
+ return vsm()->allocate(word_size);
}
}
@@ -2853,6 +2588,7 @@
gclog_or_tty->print_cr("Increase capacity to GC from " SIZE_FORMAT
" to " SIZE_FORMAT, before_inc, MetaspaceGC::capacity_until_GC());
}
+
result = allocate(word_size, mdtype);
return result;
@@ -2889,37 +2625,39 @@
void Metaspace::deallocate(MetaWord* ptr, size_t word_size, bool is_class) {
if (SafepointSynchronize::is_at_safepoint()) {
assert(Thread::current()->is_VM_thread(), "should be the VM thread");
- // Don't take lock
-#ifdef DEALLOCATE_BLOCKS
- if (is_class) {
- class_vsm()->deallocate(ptr);
- } else {
- vsm()->deallocate(ptr);
- }
-#else
+ // Don't take Heap_lock
+ MutexLocker ml(vsm()->lock());
+ if (word_size < TreeChunk<Metablock, FreeList>::min_size()) {
+ // Dark matter. Too small for dictionary.
#ifdef ASSERT
- Copy::fill_to_words((HeapWord*)ptr, word_size, metadata_deallocate);
+ Copy::fill_to_words((HeapWord*)ptr, word_size, 0xf5f5f5f5);
#endif
-#endif
-
+ return;
+ }
+ if (is_class) {
+ class_vsm()->deallocate(ptr, word_size);
+ } else {
+ vsm()->deallocate(ptr, word_size);
+ }
} else {
MutexLocker ml(vsm()->lock());
-#ifdef DEALLOCATE_BLOCKS
- if (is_class) {
- class_vsm()->deallocate(ptr);
- } else {
- vsm()->deallocate(ptr);
- }
-#else
+ if (word_size < TreeChunk<Metablock, FreeList>::min_size()) {
+ // Dark matter. Too small for dictionary.
#ifdef ASSERT
- Copy::fill_to_words((HeapWord*)ptr, word_size, metadata_deallocate);
+ Copy::fill_to_words((HeapWord*)ptr, word_size, 0xf5f5f5f5);
#endif
-#endif
+ return;
+ }
+ if (is_class) {
+ class_vsm()->deallocate(ptr, word_size);
+ } else {
+ vsm()->deallocate(ptr, word_size);
+ }
}
}
-MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
+Metablock* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
bool read_only, MetadataType mdtype, TRAPS) {
if (HAS_PENDING_EXCEPTION) {
assert(false, "Should not allocate with exception pending");
@@ -2943,7 +2681,7 @@
if (result == NULL) {
report_out_of_shared_space(read_only ? SharedReadOnly : SharedReadWrite);
}
- return result;
+ return Metablock::initialize(result, word_size);
}
result = loader_data->metaspace_non_null()->allocate(word_size, mdtype);
@@ -2951,7 +2689,7 @@
if (result == NULL) {
// Try to clean out some memory and retry.
result =
- Universe::heap()->collector_policy()->satisfy_failed_metadata_allocation(
+ Universe::heap()->collector_policy()->satisfy_failed_metadata_allocation(
loader_data, word_size, mdtype);
// If result is still null, we are out of memory.
@@ -2967,7 +2705,7 @@
THROW_OOP_0(Universe::out_of_memory_error_perm_gen());
}
}
- return result;
+ return Metablock::initialize(result, word_size);
}
void Metaspace::print_on(outputStream* out) const {
diff --git a/hotspot/src/share/vm/memory/metaspace.hpp b/hotspot/src/share/vm/memory/metaspace.hpp
index 169a3b7..c42a979 100644
--- a/hotspot/src/share/vm/memory/metaspace.hpp
+++ b/hotspot/src/share/vm/memory/metaspace.hpp
@@ -57,12 +57,10 @@
//
class ClassLoaderData;
+class Metablock;
class MetaWord;
class Mutex;
class outputStream;
-class FreeChunk;
-template <class Chunk_t> class FreeList;
-template <class Chunk_t> class BinaryTreeDictionary;
class SpaceManager;
// Metaspaces each have a SpaceManager and allocations
@@ -128,7 +126,7 @@
size_t capacity_words(MetadataType mdtype) const;
size_t waste_words(MetadataType mdtype) const;
- static MetaWord* allocate(ClassLoaderData* loader_data, size_t size,
+ static Metablock* allocate(ClassLoaderData* loader_data, size_t size,
bool read_only, MetadataType mdtype, TRAPS);
void deallocate(MetaWord* ptr, size_t byte_size, bool is_class);
diff --git a/hotspot/src/share/vm/memory/metaspaceShared.cpp b/hotspot/src/share/vm/memory/metaspaceShared.cpp
index f69e758..dde26b5 100644
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp
@@ -663,8 +663,8 @@
if (_ro_base == NULL || _rw_base == NULL) {
return false;
} else {
- return ((p > _ro_base && p < (_ro_base + SharedReadOnlySize)) ||
- (p > _rw_base && p < (_rw_base + SharedReadWriteSize)));
+ return ((p >= _ro_base && p < (_ro_base + SharedReadOnlySize)) ||
+ (p >= _rw_base && p < (_rw_base + SharedReadWriteSize)));
}
}
@@ -693,14 +693,6 @@
ReservedSpace shared_rs = mapinfo->reserve_shared_memory();
if (!shared_rs.is_reserved()) return false;
- // Split reserved memory into pieces (windows needs this)
- ReservedSpace ro_rs = shared_rs.first_part(SharedReadOnlySize);
- ReservedSpace tmp_rs1 = shared_rs.last_part(SharedReadOnlySize);
- ReservedSpace rw_rs = tmp_rs1.first_part(SharedReadWriteSize);
- ReservedSpace tmp_rs2 = tmp_rs1.last_part(SharedReadWriteSize);
- ReservedSpace md_rs = tmp_rs2.first_part(SharedMiscDataSize);
- ReservedSpace mc_rs = tmp_rs2.last_part(SharedMiscDataSize);
-
// Map each shared region
if ((_ro_base = mapinfo->map_region(ro)) != NULL &&
(_rw_base = mapinfo->map_region(rw)) != NULL &&
diff --git a/hotspot/src/share/vm/memory/resourceArea.hpp b/hotspot/src/share/vm/memory/resourceArea.hpp
index f42c0f6..f1418ce 100644
--- a/hotspot/src/share/vm/memory/resourceArea.hpp
+++ b/hotspot/src/share/vm/memory/resourceArea.hpp
@@ -127,15 +127,21 @@
void reset_to_mark() {
if (UseMallocOnly) free_malloced_objects();
- if( _chunk->next() ) // Delete later chunks
+ if( _chunk->next() ) { // Delete later chunks
+ // reset arena size before delete chunks. Otherwise, the total
+ // arena size could exceed total chunk size
+ assert(_area->size_in_bytes() > size_in_bytes(), "Sanity check");
+ _area->set_size_in_bytes(size_in_bytes());
_chunk->next_chop();
+ } else {
+ assert(_area->size_in_bytes() == size_in_bytes(), "Sanity check");
+ }
_area->_chunk = _chunk; // Roll back arena to saved chunk
_area->_hwm = _hwm;
_area->_max = _max;
// clear out this chunk (to detect allocation bugs)
if (ZapResourceArea) memset(_hwm, badResourceValue, _max - _hwm);
- _area->set_size_in_bytes(size_in_bytes());
}
~ResourceMark() {
@@ -219,15 +225,21 @@
void reset_to_mark() {
if (UseMallocOnly) free_malloced_objects();
- if( _chunk->next() ) // Delete later chunks
+ if( _chunk->next() ) { // Delete later chunks
+ // reset arena size before delete chunks. Otherwise, the total
+ // arena size could exceed total chunk size
+ assert(_area->size_in_bytes() > size_in_bytes(), "Sanity check");
+ _area->set_size_in_bytes(size_in_bytes());
_chunk->next_chop();
+ } else {
+ assert(_area->size_in_bytes() == size_in_bytes(), "Sanity check");
+ }
_area->_chunk = _chunk; // Roll back arena to saved chunk
_area->_hwm = _hwm;
_area->_max = _max;
// clear out this chunk (to detect allocation bugs)
if (ZapResourceArea) memset(_hwm, badResourceValue, _max - _hwm);
- _area->set_size_in_bytes(size_in_bytes());
}
~DeoptResourceMark() {
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index 5a1032f..9849829 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -1155,8 +1155,12 @@
vmSymbols::SID Method::klass_id_for_intrinsics(Klass* holder) {
// if loader is not the default loader (i.e., != NULL), we can't know the intrinsics
// because we are not loading from core libraries
- if (InstanceKlass::cast(holder)->class_loader() != NULL)
+ // exception: the AES intrinsics come from lib/ext/sunjce_provider.jar
+ // which does not use the class default class loader so we check for its loader here
+ if ((InstanceKlass::cast(holder)->class_loader() != NULL) &&
+ InstanceKlass::cast(holder)->class_loader()->klass()->name() != vmSymbols::sun_misc_Launcher_ExtClassLoader()) {
return vmSymbols::NO_SID; // regardless of name, no intrinsics here
+ }
// see if the klass name is well-known:
Symbol* klass_name = InstanceKlass::cast(holder)->name();
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index 80996a5..4fdebf5 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -439,6 +439,9 @@
product(bool, DoEscapeAnalysis, true, \
"Perform escape analysis") \
\
+ develop(bool, ExitEscapeAnalysisOnTimeout, true, \
+ "Exit or throw assert in EA when it reaches time limit") \
+ \
notproduct(bool, PrintEscapeAnalysis, false, \
"Print the results of escape analysis") \
\
diff --git a/hotspot/src/share/vm/opto/callGenerator.cpp b/hotspot/src/share/vm/opto/callGenerator.cpp
index 547096b..93f2b85 100644
--- a/hotspot/src/share/vm/opto/callGenerator.cpp
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp
@@ -670,6 +670,129 @@
}
+//------------------------PredictedIntrinsicGenerator------------------------------
+// Internal class which handles all predicted Intrinsic calls.
+class PredictedIntrinsicGenerator : public CallGenerator {
+ CallGenerator* _intrinsic;
+ CallGenerator* _cg;
+
+public:
+ PredictedIntrinsicGenerator(CallGenerator* intrinsic,
+ CallGenerator* cg)
+ : CallGenerator(cg->method())
+ {
+ _intrinsic = intrinsic;
+ _cg = cg;
+ }
+
+ virtual bool is_virtual() const { return true; }
+ virtual bool is_inlined() const { return true; }
+ virtual bool is_intrinsic() const { return true; }
+
+ virtual JVMState* generate(JVMState* jvms);
+};
+
+
+CallGenerator* CallGenerator::for_predicted_intrinsic(CallGenerator* intrinsic,
+ CallGenerator* cg) {
+ return new PredictedIntrinsicGenerator(intrinsic, cg);
+}
+
+
+JVMState* PredictedIntrinsicGenerator::generate(JVMState* jvms) {
+ GraphKit kit(jvms);
+ PhaseGVN& gvn = kit.gvn();
+
+ CompileLog* log = kit.C->log();
+ if (log != NULL) {
+ log->elem("predicted_intrinsic bci='%d' method='%d'",
+ jvms->bci(), log->identify(method()));
+ }
+
+ Node* slow_ctl = _intrinsic->generate_predicate(kit.sync_jvms());
+ if (kit.failing())
+ return NULL; // might happen because of NodeCountInliningCutoff
+
+ SafePointNode* slow_map = NULL;
+ JVMState* slow_jvms;
+ if (slow_ctl != NULL) {
+ PreserveJVMState pjvms(&kit);
+ kit.set_control(slow_ctl);
+ if (!kit.stopped()) {
+ slow_jvms = _cg->generate(kit.sync_jvms());
+ if (kit.failing())
+ return NULL; // might happen because of NodeCountInliningCutoff
+ assert(slow_jvms != NULL, "must be");
+ kit.add_exception_states_from(slow_jvms);
+ kit.set_map(slow_jvms->map());
+ if (!kit.stopped())
+ slow_map = kit.stop();
+ }
+ }
+
+ if (kit.stopped()) {
+ // Predicate is always false.
+ kit.set_jvms(slow_jvms);
+ return kit.transfer_exceptions_into_jvms();
+ }
+
+ // Generate intrinsic code:
+ JVMState* new_jvms = _intrinsic->generate(kit.sync_jvms());
+ if (new_jvms == NULL) {
+ // Intrinsic failed, so use slow code or make a direct call.
+ if (slow_map == NULL) {
+ CallGenerator* cg = CallGenerator::for_direct_call(method());
+ new_jvms = cg->generate(kit.sync_jvms());
+ } else {
+ kit.set_jvms(slow_jvms);
+ return kit.transfer_exceptions_into_jvms();
+ }
+ }
+ kit.add_exception_states_from(new_jvms);
+ kit.set_jvms(new_jvms);
+
+ // Need to merge slow and fast?
+ if (slow_map == NULL) {
+ // The fast path is the only path remaining.
+ return kit.transfer_exceptions_into_jvms();
+ }
+
+ if (kit.stopped()) {
+ // Intrinsic method threw an exception, so it's just the slow path after all.
+ kit.set_jvms(slow_jvms);
+ return kit.transfer_exceptions_into_jvms();
+ }
+
+ // Finish the diamond.
+ kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
+ RegionNode* region = new (kit.C) RegionNode(3);
+ region->init_req(1, kit.control());
+ region->init_req(2, slow_map->control());
+ kit.set_control(gvn.transform(region));
+ Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
+ iophi->set_req(2, slow_map->i_o());
+ kit.set_i_o(gvn.transform(iophi));
+ kit.merge_memory(slow_map->merged_memory(), region, 2);
+ uint tos = kit.jvms()->stkoff() + kit.sp();
+ uint limit = slow_map->req();
+ for (uint i = TypeFunc::Parms; i < limit; i++) {
+ // Skip unused stack slots; fast forward to monoff();
+ if (i == tos) {
+ i = kit.jvms()->monoff();
+ if( i >= limit ) break;
+ }
+ Node* m = kit.map()->in(i);
+ Node* n = slow_map->in(i);
+ if (m != n) {
+ const Type* t = gvn.type(m)->meet(gvn.type(n));
+ Node* phi = PhiNode::make(region, m, t);
+ phi->set_req(2, n);
+ kit.map()->set_req(i, gvn.transform(phi));
+ }
+ }
+ return kit.transfer_exceptions_into_jvms();
+}
+
//-------------------------UncommonTrapCallGenerator-----------------------------
// Internal class which handles all out-of-line calls checking receiver type.
class UncommonTrapCallGenerator : public CallGenerator {
diff --git a/hotspot/src/share/vm/opto/callGenerator.hpp b/hotspot/src/share/vm/opto/callGenerator.hpp
index 3cfd39d..ae59173 100644
--- a/hotspot/src/share/vm/opto/callGenerator.hpp
+++ b/hotspot/src/share/vm/opto/callGenerator.hpp
@@ -143,6 +143,9 @@
// Registry for intrinsics:
static CallGenerator* for_intrinsic(ciMethod* m);
static void register_intrinsic(ciMethod* m, CallGenerator* cg);
+ static CallGenerator* for_predicted_intrinsic(CallGenerator* intrinsic,
+ CallGenerator* cg);
+ virtual Node* generate_predicate(JVMState* jvms) { return NULL; };
static void print_inlining(ciMethod* callee, int inline_level, int bci, const char* msg) {
if (PrintInlining)
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index d870872..c4da70e 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -3047,9 +3047,9 @@
case T_LONG:
case T_DOUBLE: return (_v._value.j == other._v._value.j);
case T_OBJECT:
- case T_METADATA: return (_v._metadata == other._v._metadata);
case T_ADDRESS: return (_v._value.l == other._v._value.l);
case T_VOID: return (_v._value.l == other._v._value.l); // jump-table entries
+ case T_METADATA: return (_v._metadata == other._v._metadata);
default: ShouldNotReachHere();
}
return false;
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index 6bcf3d3..44bf277 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -149,7 +149,7 @@
private:
BasicType _type;
union {
- jvalue _value;
+ jvalue _value;
Metadata* _metadata;
} _v;
int _offset; // offset of this constant (in bytes) relative to the constant table base.
diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/hotspot/src/share/vm/opto/doCall.cpp
index 30a01f3..95d1488 100644
--- a/hotspot/src/share/vm/opto/doCall.cpp
+++ b/hotspot/src/share/vm/opto/doCall.cpp
@@ -107,7 +107,17 @@
// intrinsics handle strict f.p. correctly.
if (allow_inline && allow_intrinsics) {
CallGenerator* cg = find_intrinsic(callee, call_is_virtual);
- if (cg != NULL) return cg;
+ if (cg != NULL) {
+ if (cg->is_predicted()) {
+ // Code without intrinsic but, hopefully, inlined.
+ CallGenerator* inline_cg = this->call_generator(callee,
+ vtable_index, call_is_virtual, jvms, allow_inline, prof_factor, false);
+ if (inline_cg != NULL) {
+ cg = CallGenerator::for_predicted_intrinsic(cg, inline_cg);
+ }
+ }
+ return cg;
+ }
}
// Do method handle calls.
diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index 9fd3180..a5aa471 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -893,12 +893,16 @@
arg_has_oops && (i > TypeFunc::Parms);
#ifdef ASSERT
if (!(is_arraycopy ||
- call->as_CallLeaf()->_name != NULL &&
- (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre") == 0 ||
- strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ))
- ) {
+ (call->as_CallLeaf()->_name != NULL &&
+ (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "aescrypt_encryptBlock") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "aescrypt_decryptBlock") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_encryptAESCrypt") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_decryptAESCrypt") == 0)
+ ))) {
call->dump();
- assert(false, "EA: unexpected CallLeaf");
+ fatal(err_msg_res("EA unexpected CallLeaf %s", call->as_CallLeaf()->_name));
}
#endif
// Always process arraycopy's destination object since
@@ -1080,7 +1084,7 @@
C->log()->text("%s", (iterations >= CG_BUILD_ITER_LIMIT) ? "iterations" : "time");
C->log()->end_elem(" limit'");
}
- assert(false, err_msg_res("infinite EA connection graph build (%f sec, %d iterations) with %d nodes and worklist size %d",
+ assert(ExitEscapeAnalysisOnTimeout, err_msg_res("infinite EA connection graph build (%f sec, %d iterations) with %d nodes and worklist size %d",
time.seconds(), iterations, nodes_size(), ptnodes_worklist.length()));
// Possible infinite build_connection_graph loop,
// bailout (no changes to ideal graph were made).
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index f34df79..6b90061 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -44,18 +44,22 @@
public:
private:
bool _is_virtual;
+ bool _is_predicted;
vmIntrinsics::ID _intrinsic_id;
public:
- LibraryIntrinsic(ciMethod* m, bool is_virtual, vmIntrinsics::ID id)
+ LibraryIntrinsic(ciMethod* m, bool is_virtual, bool is_predicted, vmIntrinsics::ID id)
: InlineCallGenerator(m),
_is_virtual(is_virtual),
+ _is_predicted(is_predicted),
_intrinsic_id(id)
{
}
virtual bool is_intrinsic() const { return true; }
virtual bool is_virtual() const { return _is_virtual; }
+ virtual bool is_predicted() const { return _is_predicted; }
virtual JVMState* generate(JVMState* jvms);
+ virtual Node* generate_predicate(JVMState* jvms);
vmIntrinsics::ID intrinsic_id() const { return _intrinsic_id; }
};
@@ -83,6 +87,7 @@
int arg_size() const { return callee()->arg_size(); }
bool try_to_inline();
+ Node* try_to_predicate();
// Helper functions to inline natives
void push_result(RegionNode* region, PhiNode* value);
@@ -148,6 +153,7 @@
CallJavaNode* generate_method_call_virtual(vmIntrinsics::ID method_id) {
return generate_method_call(method_id, true, false);
}
+ Node * load_field_from_object(Node * fromObj, const char * fieldName, const char * fieldTypeString, bool is_exact, bool is_static);
Node* make_string_method_node(int opcode, Node* str1_start, Node* cnt1, Node* str2_start, Node* cnt2);
Node* make_string_method_node(int opcode, Node* str1, Node* str2);
@@ -253,6 +259,10 @@
bool inline_reverseBytes(vmIntrinsics::ID id);
bool inline_reference_get();
+ bool inline_aescrypt_Block(vmIntrinsics::ID id);
+ bool inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id);
+ Node* inline_cipherBlockChaining_AESCrypt_predicate(bool decrypting);
+ Node* get_key_start_from_aescrypt_object(Node* aescrypt_object);
};
@@ -306,6 +316,8 @@
}
}
+ bool is_predicted = false;
+
switch (id) {
case vmIntrinsics::_compareTo:
if (!SpecialStringCompareTo) return NULL;
@@ -413,6 +425,18 @@
break;
#endif
+ case vmIntrinsics::_aescrypt_encryptBlock:
+ case vmIntrinsics::_aescrypt_decryptBlock:
+ if (!UseAESIntrinsics) return NULL;
+ break;
+
+ case vmIntrinsics::_cipherBlockChaining_encryptAESCrypt:
+ case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
+ if (!UseAESIntrinsics) return NULL;
+ // these two require the predicated logic
+ is_predicted = true;
+ break;
+
default:
assert(id <= vmIntrinsics::LAST_COMPILER_INLINE, "caller responsibility");
assert(id != vmIntrinsics::_Object_init && id != vmIntrinsics::_invoke, "enum out of order?");
@@ -444,7 +468,7 @@
if (!InlineUnsafeOps) return NULL;
}
- return new LibraryIntrinsic(m, is_virtual, (vmIntrinsics::ID) id);
+ return new LibraryIntrinsic(m, is_virtual, is_predicted, (vmIntrinsics::ID) id);
}
//----------------------register_library_intrinsics-----------------------
@@ -496,6 +520,47 @@
return NULL;
}
+Node* LibraryIntrinsic::generate_predicate(JVMState* jvms) {
+ LibraryCallKit kit(jvms, this);
+ Compile* C = kit.C;
+ int nodes = C->unique();
+#ifndef PRODUCT
+ assert(is_predicted(), "sanity");
+ if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) {
+ char buf[1000];
+ const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf));
+ tty->print_cr("Predicate for intrinsic %s", str);
+ }
+#endif
+
+ Node* slow_ctl = kit.try_to_predicate();
+ if (!kit.failing()) {
+ if (C->log()) {
+ C->log()->elem("predicate_intrinsic id='%s'%s nodes='%d'",
+ vmIntrinsics::name_at(intrinsic_id()),
+ (is_virtual() ? " virtual='1'" : ""),
+ C->unique() - nodes);
+ }
+ return slow_ctl; // Could be NULL if the check folds.
+ }
+
+ // The intrinsic bailed out
+ if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
+ if (jvms->has_method()) {
+ // Not a root compile.
+ const char* msg = "failed to generate predicate for intrinsic";
+ CompileTask::print_inlining(kit.callee(), jvms->depth() - 1, kit.bci(), msg);
+ } else {
+ // Root compile
+ tty->print("Did not generate predicate for intrinsic %s%s at bci:%d in",
+ vmIntrinsics::name_at(intrinsic_id()),
+ (is_virtual() ? " (virtual)" : ""), kit.bci());
+ }
+ }
+ C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
+ return NULL;
+}
+
bool LibraryCallKit::try_to_inline() {
// Handle symbolic names for otherwise undistinguished boolean switches:
const bool is_store = true;
@@ -767,6 +832,14 @@
case vmIntrinsics::_Reference_get:
return inline_reference_get();
+ case vmIntrinsics::_aescrypt_encryptBlock:
+ case vmIntrinsics::_aescrypt_decryptBlock:
+ return inline_aescrypt_Block(intrinsic_id());
+
+ case vmIntrinsics::_cipherBlockChaining_encryptAESCrypt:
+ case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
+ return inline_cipherBlockChaining_AESCrypt(intrinsic_id());
+
default:
// If you get here, it may be that someone has added a new intrinsic
// to the list in vmSymbols.hpp without implementing it here.
@@ -780,6 +853,36 @@
}
}
+Node* LibraryCallKit::try_to_predicate() {
+ if (!jvms()->has_method()) {
+ // Root JVMState has a null method.
+ assert(map()->memory()->Opcode() == Op_Parm, "");
+ // Insert the memory aliasing node
+ set_all_memory(reset_memory());
+ }
+ assert(merged_memory(), "");
+
+ switch (intrinsic_id()) {
+ case vmIntrinsics::_cipherBlockChaining_encryptAESCrypt:
+ return inline_cipherBlockChaining_AESCrypt_predicate(false);
+ case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
+ return inline_cipherBlockChaining_AESCrypt_predicate(true);
+
+ default:
+ // If you get here, it may be that someone has added a new intrinsic
+ // to the list in vmSymbols.hpp without implementing it here.
+#ifndef PRODUCT
+ if ((PrintMiscellaneous && (Verbose || WizardMode)) || PrintOpto) {
+ tty->print_cr("*** Warning: Unimplemented predicate for intrinsic %s(%d)",
+ vmIntrinsics::name_at(intrinsic_id()), intrinsic_id());
+ }
+#endif
+ Node* slow_ctl = control();
+ set_control(top()); // No fast path instrinsic
+ return slow_ctl;
+ }
+}
+
//------------------------------push_result------------------------------
// Helper function for finishing intrinsics.
void LibraryCallKit::push_result(RegionNode* region, PhiNode* value) {
@@ -3830,7 +3933,7 @@
vtable_index*vtableEntry::size()) * wordSize +
vtableEntry::method_offset_in_bytes();
Node* entry_addr = basic_plus_adr(obj_klass, entry_offset);
- Node* target_call = make_load(NULL, entry_addr, TypeInstPtr::NOTNULL, T_OBJECT);
+ Node* target_call = make_load(NULL, entry_addr, TypePtr::NOTNULL, T_ADDRESS);
// Compare the target method with the expected method (e.g., Object.hashCode).
const TypePtr* native_call_addr = TypeMetadataPtr::make(method);
@@ -5613,3 +5716,265 @@
push(result);
return true;
}
+
+
+Node * LibraryCallKit::load_field_from_object(Node * fromObj, const char * fieldName, const char * fieldTypeString,
+ bool is_exact=true, bool is_static=false) {
+
+ const TypeInstPtr* tinst = _gvn.type(fromObj)->isa_instptr();
+ assert(tinst != NULL, "obj is null");
+ assert(tinst->klass()->is_loaded(), "obj is not loaded");
+ assert(!is_exact || tinst->klass_is_exact(), "klass not exact");
+
+ ciField* field = tinst->klass()->as_instance_klass()->get_field_by_name(ciSymbol::make(fieldName),
+ ciSymbol::make(fieldTypeString),
+ is_static);
+ if (field == NULL) return (Node *) NULL;
+ assert (field != NULL, "undefined field");
+
+ // Next code copied from Parse::do_get_xxx():
+
+ // Compute address and memory type.
+ int offset = field->offset_in_bytes();
+ bool is_vol = field->is_volatile();
+ ciType* field_klass = field->type();
+ assert(field_klass->is_loaded(), "should be loaded");
+ const TypePtr* adr_type = C->alias_type(field)->adr_type();
+ Node *adr = basic_plus_adr(fromObj, fromObj, offset);
+ BasicType bt = field->layout_type();
+
+ // Build the resultant type of the load
+ const Type *type = TypeOopPtr::make_from_klass(field_klass->as_klass());
+
+ // Build the load.
+ Node* loadedField = make_load(NULL, adr, type, bt, adr_type, is_vol);
+ return loadedField;
+}
+
+
+//------------------------------inline_aescrypt_Block-----------------------
+bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
+ address stubAddr;
+ const char *stubName;
+ assert(UseAES, "need AES instruction support");
+
+ switch(id) {
+ case vmIntrinsics::_aescrypt_encryptBlock:
+ stubAddr = StubRoutines::aescrypt_encryptBlock();
+ stubName = "aescrypt_encryptBlock";
+ break;
+ case vmIntrinsics::_aescrypt_decryptBlock:
+ stubAddr = StubRoutines::aescrypt_decryptBlock();
+ stubName = "aescrypt_decryptBlock";
+ break;
+ }
+ if (stubAddr == NULL) return false;
+
+ // Restore the stack and pop off the arguments.
+ int nargs = 5; // this + 2 oop/offset combos
+ assert(callee()->signature()->size() == nargs-1, "encryptBlock has 4 arguments");
+
+ Node *aescrypt_object = argument(0);
+ Node *src = argument(1);
+ Node *src_offset = argument(2);
+ Node *dest = argument(3);
+ Node *dest_offset = argument(4);
+
+ // (1) src and dest are arrays.
+ const Type* src_type = src->Value(&_gvn);
+ const Type* dest_type = dest->Value(&_gvn);
+ const TypeAryPtr* top_src = src_type->isa_aryptr();
+ const TypeAryPtr* top_dest = dest_type->isa_aryptr();
+ assert (top_src != NULL && top_src->klass() != NULL && top_dest != NULL && top_dest->klass() != NULL, "args are strange");
+
+ // for the quick and dirty code we will skip all the checks.
+ // we are just trying to get the call to be generated.
+ Node* src_start = src;
+ Node* dest_start = dest;
+ if (src_offset != NULL || dest_offset != NULL) {
+ assert(src_offset != NULL && dest_offset != NULL, "");
+ src_start = array_element_address(src, src_offset, T_BYTE);
+ dest_start = array_element_address(dest, dest_offset, T_BYTE);
+ }
+
+ // now need to get the start of its expanded key array
+ // this requires a newer class file that has this array as littleEndian ints, otherwise we revert to java
+ Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+ if (k_start == NULL) return false;
+
+ // Call the stub.
+ make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::aescrypt_block_Type(),
+ stubAddr, stubName, TypePtr::BOTTOM,
+ src_start, dest_start, k_start);
+
+ return true;
+}
+
+//------------------------------inline_cipherBlockChaining_AESCrypt-----------------------
+bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
+ address stubAddr;
+ const char *stubName;
+
+ assert(UseAES, "need AES instruction support");
+
+ switch(id) {
+ case vmIntrinsics::_cipherBlockChaining_encryptAESCrypt:
+ stubAddr = StubRoutines::cipherBlockChaining_encryptAESCrypt();
+ stubName = "cipherBlockChaining_encryptAESCrypt";
+ break;
+ case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
+ stubAddr = StubRoutines::cipherBlockChaining_decryptAESCrypt();
+ stubName = "cipherBlockChaining_decryptAESCrypt";
+ break;
+ }
+ if (stubAddr == NULL) return false;
+
+
+ // Restore the stack and pop off the arguments.
+ int nargs = 6; // this + oop/offset + len + oop/offset
+ assert(callee()->signature()->size() == nargs-1, "wrong number of arguments");
+ Node *cipherBlockChaining_object = argument(0);
+ Node *src = argument(1);
+ Node *src_offset = argument(2);
+ Node *len = argument(3);
+ Node *dest = argument(4);
+ Node *dest_offset = argument(5);
+
+ // (1) src and dest are arrays.
+ const Type* src_type = src->Value(&_gvn);
+ const Type* dest_type = dest->Value(&_gvn);
+ const TypeAryPtr* top_src = src_type->isa_aryptr();
+ const TypeAryPtr* top_dest = dest_type->isa_aryptr();
+ assert (top_src != NULL && top_src->klass() != NULL
+ && top_dest != NULL && top_dest->klass() != NULL, "args are strange");
+
+ // checks are the responsibility of the caller
+ Node* src_start = src;
+ Node* dest_start = dest;
+ if (src_offset != NULL || dest_offset != NULL) {
+ assert(src_offset != NULL && dest_offset != NULL, "");
+ src_start = array_element_address(src, src_offset, T_BYTE);
+ dest_start = array_element_address(dest, dest_offset, T_BYTE);
+ }
+
+ // if we are in this set of code, we "know" the embeddedCipher is an AESCrypt object
+ // (because of the predicated logic executed earlier).
+ // so we cast it here safely.
+ // this requires a newer class file that has this array as littleEndian ints, otherwise we revert to java
+
+ Node* embeddedCipherObj = load_field_from_object(cipherBlockChaining_object, "embeddedCipher", "Lcom/sun/crypto/provider/SymmetricCipher;", /*is_exact*/ false);
+ if (embeddedCipherObj == NULL) return false;
+
+ // cast it to what we know it will be at runtime
+ const TypeInstPtr* tinst = _gvn.type(cipherBlockChaining_object)->isa_instptr();
+ assert(tinst != NULL, "CBC obj is null");
+ assert(tinst->klass()->is_loaded(), "CBC obj is not loaded");
+ ciKlass* klass_AESCrypt = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make("com/sun/crypto/provider/AESCrypt"));
+ if (!klass_AESCrypt->is_loaded()) return false;
+
+ ciInstanceKlass* instklass_AESCrypt = klass_AESCrypt->as_instance_klass();
+ const TypeKlassPtr* aklass = TypeKlassPtr::make(instklass_AESCrypt);
+ const TypeOopPtr* xtype = aklass->as_instance_type();
+ Node* aescrypt_object = new(C) CheckCastPPNode(control(), embeddedCipherObj, xtype);
+ aescrypt_object = _gvn.transform(aescrypt_object);
+
+ // we need to get the start of the aescrypt_object's expanded key array
+ Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+ if (k_start == NULL) return false;
+
+ // similarly, get the start address of the r vector
+ Node* objRvec = load_field_from_object(cipherBlockChaining_object, "r", "[B", /*is_exact*/ false);
+ if (objRvec == NULL) return false;
+ Node* r_start = array_element_address(objRvec, intcon(0), T_BYTE);
+
+ // Call the stub, passing src_start, dest_start, k_start, r_start and src_len
+ make_runtime_call(RC_LEAF|RC_NO_FP,
+ OptoRuntime::cipherBlockChaining_aescrypt_Type(),
+ stubAddr, stubName, TypePtr::BOTTOM,
+ src_start, dest_start, k_start, r_start, len);
+
+ // return is void so no result needs to be pushed
+
+ return true;
+}
+
+//------------------------------get_key_start_from_aescrypt_object-----------------------
+Node * LibraryCallKit::get_key_start_from_aescrypt_object(Node *aescrypt_object) {
+ Node* objAESCryptKey = load_field_from_object(aescrypt_object, "K", "[I", /*is_exact*/ false);
+ assert (objAESCryptKey != NULL, "wrong version of com.sun.crypto.provider.AESCrypt");
+ if (objAESCryptKey == NULL) return (Node *) NULL;
+
+ // now have the array, need to get the start address of the K array
+ Node* k_start = array_element_address(objAESCryptKey, intcon(0), T_INT);
+ return k_start;
+}
+
+//----------------------------inline_cipherBlockChaining_AESCrypt_predicate----------------------------
+// Return node representing slow path of predicate check.
+// the pseudo code we want to emulate with this predicate is:
+// for encryption:
+// if (embeddedCipherObj instanceof AESCrypt) do_intrinsic, else do_javapath
+// for decryption:
+// if ((embeddedCipherObj instanceof AESCrypt) && (cipher!=plain)) do_intrinsic, else do_javapath
+// note cipher==plain is more conservative than the original java code but that's OK
+//
+Node* LibraryCallKit::inline_cipherBlockChaining_AESCrypt_predicate(bool decrypting) {
+ // First, check receiver for NULL since it is virtual method.
+ int nargs = arg_size();
+ Node* objCBC = argument(0);
+ _sp += nargs;
+ objCBC = do_null_check(objCBC, T_OBJECT);
+ _sp -= nargs;
+
+ if (stopped()) return NULL; // Always NULL
+
+ // Load embeddedCipher field of CipherBlockChaining object.
+ Node* embeddedCipherObj = load_field_from_object(objCBC, "embeddedCipher", "Lcom/sun/crypto/provider/SymmetricCipher;", /*is_exact*/ false);
+
+ // get AESCrypt klass for instanceOf check
+ // AESCrypt might not be loaded yet if some other SymmetricCipher got us to this compile point
+ // will have same classloader as CipherBlockChaining object
+ const TypeInstPtr* tinst = _gvn.type(objCBC)->isa_instptr();
+ assert(tinst != NULL, "CBCobj is null");
+ assert(tinst->klass()->is_loaded(), "CBCobj is not loaded");
+
+ // we want to do an instanceof comparison against the AESCrypt class
+ ciKlass* klass_AESCrypt = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make("com/sun/crypto/provider/AESCrypt"));
+ if (!klass_AESCrypt->is_loaded()) {
+ // if AESCrypt is not even loaded, we never take the intrinsic fast path
+ Node* ctrl = control();
+ set_control(top()); // no regular fast path
+ return ctrl;
+ }
+ ciInstanceKlass* instklass_AESCrypt = klass_AESCrypt->as_instance_klass();
+
+ _sp += nargs; // gen_instanceof might do an uncommon trap
+ Node* instof = gen_instanceof(embeddedCipherObj, makecon(TypeKlassPtr::make(instklass_AESCrypt)));
+ _sp -= nargs;
+ Node* cmp_instof = _gvn.transform(new (C) CmpINode(instof, intcon(1)));
+ Node* bool_instof = _gvn.transform(new (C) BoolNode(cmp_instof, BoolTest::ne));
+
+ Node* instof_false = generate_guard(bool_instof, NULL, PROB_MIN);
+
+ // for encryption, we are done
+ if (!decrypting)
+ return instof_false; // even if it is NULL
+
+ // for decryption, we need to add a further check to avoid
+ // taking the intrinsic path when cipher and plain are the same
+ // see the original java code for why.
+ RegionNode* region = new(C) RegionNode(3);
+ region->init_req(1, instof_false);
+ Node* src = argument(1);
+ Node *dest = argument(4);
+ Node* cmp_src_dest = _gvn.transform(new (C) CmpPNode(src, dest));
+ Node* bool_src_dest = _gvn.transform(new (C) BoolNode(cmp_src_dest, BoolTest::eq));
+ Node* src_dest_conjoint = generate_guard(bool_src_dest, NULL, PROB_MIN);
+ region->init_req(2, src_dest_conjoint);
+
+ record_for_igvn(region);
+ return _gvn.transform(region);
+
+}
+
+
diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp
index b8b1a57..53d0fff 100644
--- a/hotspot/src/share/vm/opto/loopTransform.cpp
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp
@@ -2715,6 +2715,8 @@
result_mem = new (C) ProjNode(call,TypeFunc::Memory);
_igvn.register_new_node_with_optimizer(result_mem);
+/* Disable following optimization until proper fix (add missing checks).
+
// If this fill is tightly coupled to an allocation and overwrites
// the whole body, allow it to take over the zeroing.
AllocateNode* alloc = AllocateNode::Ideal_allocation(base, this);
@@ -2738,6 +2740,7 @@
#endif
}
}
+*/
// Redirect the old control and memory edges that are outside the loop.
Node* exit = head->loopexit()->proj_out(0);
diff --git a/hotspot/src/share/vm/opto/mulnode.cpp b/hotspot/src/share/vm/opto/mulnode.cpp
index 4572a26..4047b93 100644
--- a/hotspot/src/share/vm/opto/mulnode.cpp
+++ b/hotspot/src/share/vm/opto/mulnode.cpp
@@ -479,24 +479,27 @@
return new (phase->C) AndINode(load,phase->intcon(mask&0xFFFF));
// Masking bits off of a Short? Loading a Character does some masking
- if (lop == Op_LoadS && (mask & 0xFFFF0000) == 0 ) {
- Node *ldus = new (phase->C) LoadUSNode(load->in(MemNode::Control),
- load->in(MemNode::Memory),
- load->in(MemNode::Address),
- load->adr_type());
- ldus = phase->transform(ldus);
- return new (phase->C) AndINode(ldus, phase->intcon(mask & 0xFFFF));
- }
+ if (can_reshape &&
+ load->outcnt() == 1 && load->unique_out() == this) {
+ if (lop == Op_LoadS && (mask & 0xFFFF0000) == 0 ) {
+ Node *ldus = new (phase->C) LoadUSNode(load->in(MemNode::Control),
+ load->in(MemNode::Memory),
+ load->in(MemNode::Address),
+ load->adr_type());
+ ldus = phase->transform(ldus);
+ return new (phase->C) AndINode(ldus, phase->intcon(mask & 0xFFFF));
+ }
- // Masking sign bits off of a Byte? Do an unsigned byte load plus
- // an and.
- if (lop == Op_LoadB && (mask & 0xFFFFFF00) == 0) {
- Node* ldub = new (phase->C) LoadUBNode(load->in(MemNode::Control),
- load->in(MemNode::Memory),
- load->in(MemNode::Address),
- load->adr_type());
- ldub = phase->transform(ldub);
- return new (phase->C) AndINode(ldub, phase->intcon(mask));
+ // Masking sign bits off of a Byte? Do an unsigned byte load plus
+ // an and.
+ if (lop == Op_LoadB && (mask & 0xFFFFFF00) == 0) {
+ Node* ldub = new (phase->C) LoadUBNode(load->in(MemNode::Control),
+ load->in(MemNode::Memory),
+ load->in(MemNode::Address),
+ load->adr_type());
+ ldub = phase->transform(ldub);
+ return new (phase->C) AndINode(ldub, phase->intcon(mask));
+ }
}
// Masking off sign bits? Dont make them!
@@ -923,7 +926,9 @@
set_req(2, phase->intcon(0));
return this;
}
- else if( ld->Opcode() == Op_LoadUS )
+ else if( can_reshape &&
+ ld->Opcode() == Op_LoadUS &&
+ ld->outcnt() == 1 && ld->unique_out() == shl)
// Replace zero-extension-load with sign-extension-load
return new (phase->C) LoadSNode( ld->in(MemNode::Control),
ld->in(MemNode::Memory),
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index bb05053..51987e2 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -811,6 +811,48 @@
return TypeFunc::make(domain, range);
}
+// for aescrypt encrypt/decrypt operations, just three pointers returning void (length is constant)
+const TypeFunc* OptoRuntime::aescrypt_block_Type() {
+ // create input type (domain)
+ int num_args = 3;
+ int argcnt = num_args;
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+ fields[argp++] = TypePtr::NOTNULL; // src
+ fields[argp++] = TypePtr::NOTNULL; // dest
+ fields[argp++] = TypePtr::NOTNULL; // k array
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
+ // no result type needed
+ fields = TypeTuple::fields(1);
+ fields[TypeFunc::Parms+0] = NULL; // void
+ const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
+ return TypeFunc::make(domain, range);
+}
+
+// for cipherBlockChaining calls of aescrypt encrypt/decrypt, four pointers and a length, returning void
+const TypeFunc* OptoRuntime::cipherBlockChaining_aescrypt_Type() {
+ // create input type (domain)
+ int num_args = 5;
+ int argcnt = num_args;
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+ fields[argp++] = TypePtr::NOTNULL; // src
+ fields[argp++] = TypePtr::NOTNULL; // dest
+ fields[argp++] = TypePtr::NOTNULL; // k array
+ fields[argp++] = TypePtr::NOTNULL; // r array
+ fields[argp++] = TypeInt::INT; // src len
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
+ // no result type needed
+ fields = TypeTuple::fields(1);
+ fields[TypeFunc::Parms+0] = NULL; // void
+ const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
+ return TypeFunc::make(domain, range);
+}
+
//------------- Interpreter state access for on stack replacement
const TypeFunc* OptoRuntime::osr_end_Type() {
// create input type (domain)
diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/hotspot/src/share/vm/opto/runtime.hpp
index c707772..13da255 100644
--- a/hotspot/src/share/vm/opto/runtime.hpp
+++ b/hotspot/src/share/vm/opto/runtime.hpp
@@ -280,6 +280,9 @@
static const TypeFunc* array_fill_Type();
+ static const TypeFunc* aescrypt_block_Type();
+ static const TypeFunc* cipherBlockChaining_aescrypt_Type();
+
// leaf on stack replacement interpreter accessor types
static const TypeFunc* osr_end_Type();
diff --git a/hotspot/src/share/vm/opto/superword.cpp b/hotspot/src/share/vm/opto/superword.cpp
index ffc5394..f53c648 100644
--- a/hotspot/src/share/vm/opto/superword.cpp
+++ b/hotspot/src/share/vm/opto/superword.cpp
@@ -1776,16 +1776,15 @@
set_velt_type(n, container_type(n));
}
- // Propagate narrowed type backwards through operations
+ // Propagate integer narrowed type backwards through operations
// that don't depend on higher order bits
for (int i = _block.length() - 1; i >= 0; i--) {
Node* n = _block.at(i);
// Only integer types need be examined
- const Type* vt = velt_type(n);
- if (vt->basic_type() == T_INT) {
+ const Type* vtn = velt_type(n);
+ if (vtn->basic_type() == T_INT) {
uint start, end;
VectorNode::vector_operands(n, &start, &end);
- const Type* vt = velt_type(n);
for (uint j = start; j < end; j++) {
Node* in = n->in(j);
@@ -1801,6 +1800,24 @@
}
}
if (same_type) {
+ // For right shifts of small integer types (bool, byte, char, short)
+ // we need precise information about sign-ness. Only Load nodes have
+ // this information because Store nodes are the same for signed and
+ // unsigned values. And any arithmetic operation after a load may
+ // expand a value to signed Int so such right shifts can't be used
+ // because vector elements do not have upper bits of Int.
+ const Type* vt = vtn;
+ if (VectorNode::is_shift(in)) {
+ Node* load = in->in(1);
+ if (load->is_Load() && in_bb(load) && (velt_type(load)->basic_type() == T_INT)) {
+ vt = velt_type(load);
+ } else if (in->Opcode() != Op_LShiftI) {
+ // Widen type to Int to avoid creation of right shift vector
+ // (align + data_size(s1) check in stmts_can_pack() will fail).
+ // Note, left shifts work regardless type.
+ vt = TypeInt::INT;
+ }
+ }
set_velt_type(in, vt);
}
}
@@ -1841,7 +1858,20 @@
// Smallest type containing range of values
const Type* SuperWord::container_type(Node* n) {
if (n->is_Mem()) {
- return Type::get_const_basic_type(n->as_Mem()->memory_type());
+ BasicType bt = n->as_Mem()->memory_type();
+ if (n->is_Store() && (bt == T_CHAR)) {
+ // Use T_SHORT type instead of T_CHAR for stored values because any
+ // preceding arithmetic operation extends values to signed Int.
+ bt = T_SHORT;
+ }
+ if (n->Opcode() == Op_LoadUB) {
+ // Adjust type for unsigned byte loads, it is important for right shifts.
+ // T_BOOLEAN is used because there is no basic type representing type
+ // TypeInt::UBYTE. Use of T_BOOLEAN for vectors is fine because only
+ // size (one byte) and sign is important.
+ bt = T_BOOLEAN;
+ }
+ return Type::get_const_basic_type(bt);
}
const Type* t = _igvn.type(n);
if (t->basic_type() == T_INT) {
diff --git a/hotspot/src/share/vm/opto/type.cpp b/hotspot/src/share/vm/opto/type.cpp
index f982799..1a8ee25 100644
--- a/hotspot/src/share/vm/opto/type.cpp
+++ b/hotspot/src/share/vm/opto/type.cpp
@@ -61,7 +61,7 @@
{ Bad, T_ILLEGAL, "tuple:", false, Node::NotAMachineReg, relocInfo::none }, // Tuple
{ Bad, T_ARRAY, "array:", false, Node::NotAMachineReg, relocInfo::none }, // Array
-#if defined(IA32) || defined(AMD64)
+#ifndef SPARC
{ Bad, T_ILLEGAL, "vectors:", false, Op_VecS, relocInfo::none }, // VectorS
{ Bad, T_ILLEGAL, "vectord:", false, Op_VecD, relocInfo::none }, // VectorD
{ Bad, T_ILLEGAL, "vectorx:", false, Op_VecX, relocInfo::none }, // VectorX
diff --git a/hotspot/src/share/vm/opto/vectornode.cpp b/hotspot/src/share/vm/opto/vectornode.cpp
index d0955a8..9660d4e 100644
--- a/hotspot/src/share/vm/opto/vectornode.cpp
+++ b/hotspot/src/share/vm/opto/vectornode.cpp
@@ -29,8 +29,7 @@
//------------------------------VectorNode--------------------------------------
// Return the vector operator for the specified scalar operation
-// and vector length. Also used to check if the code generator
-// supports the vector operation.
+// and vector length.
int VectorNode::opcode(int sopc, BasicType bt) {
switch (sopc) {
case Op_AddI:
@@ -75,7 +74,7 @@
case T_BYTE: return 0; // Unimplemented
case T_CHAR:
case T_SHORT: return Op_MulVS;
- case T_INT: return Matcher::match_rule_supported(Op_MulVI) ? Op_MulVI : 0; // SSE4_1
+ case T_INT: return Op_MulVI;
}
ShouldNotReachHere();
case Op_MulF:
@@ -104,9 +103,9 @@
return Op_LShiftVL;
case Op_RShiftI:
switch (bt) {
- case T_BOOLEAN:
+ case T_BOOLEAN:return Op_URShiftVB; // boolean is unsigned value
+ case T_CHAR: return Op_URShiftVS; // char is unsigned value
case T_BYTE: return Op_RShiftVB;
- case T_CHAR:
case T_SHORT: return Op_RShiftVS;
case T_INT: return Op_RShiftVI;
}
@@ -116,10 +115,14 @@
return Op_RShiftVL;
case Op_URShiftI:
switch (bt) {
- case T_BOOLEAN:
- case T_BYTE: return Op_URShiftVB;
- case T_CHAR:
- case T_SHORT: return Op_URShiftVS;
+ case T_BOOLEAN:return Op_URShiftVB;
+ case T_CHAR: return Op_URShiftVS;
+ case T_BYTE:
+ case T_SHORT: return 0; // Vector logical right shift for signed short
+ // values produces incorrect Java result for
+ // negative data because java code should convert
+ // a short value into int value with sign
+ // extension before a shift.
case T_INT: return Op_URShiftVI;
}
ShouldNotReachHere();
@@ -157,12 +160,14 @@
return 0; // Unimplemented
}
+// Also used to check if the code generator
+// supports the vector operation.
bool VectorNode::implemented(int opc, uint vlen, BasicType bt) {
if (is_java_primitive(bt) &&
(vlen > 1) && is_power_of_2(vlen) &&
Matcher::vector_size_supported(bt, vlen)) {
int vopc = VectorNode::opcode(opc, bt);
- return vopc > 0 && Matcher::has_match_rule(vopc);
+ return vopc > 0 && Matcher::match_rule_supported(vopc);
}
return false;
}
diff --git a/hotspot/src/share/vm/prims/unsafe.cpp b/hotspot/src/share/vm/prims/unsafe.cpp
index 051c859..e3750e6 100644
--- a/hotspot/src/share/vm/prims/unsafe.cpp
+++ b/hotspot/src/share/vm/prims/unsafe.cpp
@@ -124,6 +124,8 @@
assert((void*)p->obj_field_addr<oop>((jint)byte_offset) == ptr_plus_disp,
"raw [ptr+disp] must be consistent with oop::field_base");
}
+ jlong p_size = HeapWordSize * (jlong)(p->size());
+ assert(byte_offset < p_size, err_msg("Unsafe access: offset " INT64_FORMAT " > object's size " INT64_FORMAT, byte_offset, p_size));
}
#endif
if (sizeof(char*) == sizeof(jint)) // (this constant folds!)
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 3869f1f..12fbddc 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -791,6 +791,10 @@
st->print("jvm_args: "); print_jvm_args_on(st);
}
st->print_cr("java_command: %s", java_command() ? java_command() : "<unknown>");
+ if (_java_class_path != NULL) {
+ char* path = _java_class_path->value();
+ st->print_cr("java_class_path (initial): %s", strlen(path) == 0 ? "<not set>" : path );
+ }
st->print_cr("Launcher Type: %s", _sun_java_launcher);
}
@@ -873,7 +877,7 @@
bool result = true;
int c = getc(stream);
- while(c != EOF) {
+ while(c != EOF && pos < (int)(sizeof(token)-1)) {
if (in_white_space) {
if (in_comment) {
if (c == '\n') in_comment = false;
@@ -2771,6 +2775,11 @@
return JNI_EINVAL;
}
FLAG_SET_CMDLINE(uintx, MaxDirectMemorySize, max_direct_memory_size);
+ } else if (match_option(option, "-XX:+UseVMInterruptibleIO", &tail)) {
+ // NOTE! In JDK 9, the UseVMInterruptibleIO flag will completely go
+ // away and will cause VM initialization failures!
+ warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
+ FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
} else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
// Skip -XX:Flags= since that case has already been handled
if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
@@ -2786,10 +2795,6 @@
// Change the default value for flags which have different default values
// when working with older JDKs.
- if (JDK_Version::current().compare_major(6) <= 0 &&
- FLAG_IS_DEFAULT(UseVMInterruptibleIO)) {
- FLAG_SET_DEFAULT(UseVMInterruptibleIO, true);
- }
#ifdef LINUX
if (JDK_Version::current().compare_major(6) <= 0 &&
FLAG_IS_DEFAULT(UseLinuxPosixThreadCPUClocks)) {
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index e783883..39e6a98 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -533,6 +533,9 @@
product(intx, UseSSE, 99, \
"Highest supported SSE instructions set on x86/x64") \
\
+ product(bool, UseAES, false, \
+ "Control whether AES instructions can be used on x86/x64") \
+ \
product(uintx, LargePageSizeInBytes, 0, \
"Large page size (0 to let VM choose the page size") \
\
@@ -635,6 +638,9 @@
product(bool, UseSSE42Intrinsics, false, \
"SSE4.2 versions of intrinsics") \
\
+ product(bool, UseAESIntrinsics, false, \
+ "use intrinsics for AES versions of crypto") \
+ \
develop(bool, TraceCallFixup, false, \
"traces all call fixups") \
\
diff --git a/hotspot/src/share/vm/runtime/handles.cpp b/hotspot/src/share/vm/runtime/handles.cpp
index cb53088..a37e46d 100644
--- a/hotspot/src/share/vm/runtime/handles.cpp
+++ b/hotspot/src/share/vm/runtime/handles.cpp
@@ -158,13 +158,18 @@
// Delete later chunks
if( _chunk->next() ) {
+ // reset arena size before delete chunks. Otherwise, the total
+ // arena size could exceed total chunk size
+ assert(area->size_in_bytes() > size_in_bytes(), "Sanity check");
+ area->set_size_in_bytes(size_in_bytes());
_chunk->next_chop();
+ } else {
+ assert(area->size_in_bytes() == size_in_bytes(), "Sanity check");
}
// Roll back arena to saved top markers
area->_chunk = _chunk;
area->_hwm = _hwm;
area->_max = _max;
- area->set_size_in_bytes(_size_in_bytes);
#ifdef ASSERT
// clear out first chunk (to detect allocation bugs)
if (ZapVMHandleArea) {
diff --git a/hotspot/src/share/vm/runtime/handles.hpp b/hotspot/src/share/vm/runtime/handles.hpp
index cab3dc5..8c643d7 100644
--- a/hotspot/src/share/vm/runtime/handles.hpp
+++ b/hotspot/src/share/vm/runtime/handles.hpp
@@ -297,6 +297,7 @@
void set_previous_handle_mark(HandleMark* mark) { _previous_handle_mark = mark; }
HandleMark* previous_handle_mark() const { return _previous_handle_mark; }
+ size_t size_in_bytes() const { return _size_in_bytes; }
public:
HandleMark(); // see handles_inline.hpp
HandleMark(Thread* thread) { initialize(thread); }
diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/hotspot/src/share/vm/runtime/handles.inline.hpp
index 96dd94c..51c31ff 100644
--- a/hotspot/src/share/vm/runtime/handles.inline.hpp
+++ b/hotspot/src/share/vm/runtime/handles.inline.hpp
@@ -136,13 +136,18 @@
HandleArea* area = _area; // help compilers with poor alias analysis
// Delete later chunks
if( _chunk->next() ) {
+ // reset arena size before delete chunks. Otherwise, the total
+ // arena size could exceed total chunk size
+ assert(area->size_in_bytes() > size_in_bytes(), "Sanity check");
+ area->set_size_in_bytes(size_in_bytes());
_chunk->next_chop();
+ } else {
+ assert(area->size_in_bytes() == size_in_bytes(), "Sanity check");
}
// Roll back arena to saved top markers
area->_chunk = _chunk;
area->_hwm = _hwm;
area->_max = _max;
- area->set_size_in_bytes(_size_in_bytes);
debug_only(area->_handle_mark_nesting--);
}
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 550e64a..56bd826 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -600,9 +600,7 @@
if (PrintMalloc && tty != NULL) tty->print_cr("os::malloc " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, memblock);
// we do not track MallocCushion memory
- if (MemTracker::is_on()) {
MemTracker::record_malloc((address)memblock, size, memflags, caller == 0 ? CALLER_PC : caller);
- }
return memblock;
}
@@ -613,7 +611,7 @@
NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
void* ptr = ::realloc(memblock, size);
- if (ptr != NULL && MemTracker::is_on()) {
+ if (ptr != NULL) {
MemTracker::record_realloc((address)memblock, (address)ptr, size, memflags,
caller == 0 ? CALLER_PC : caller);
}
@@ -1401,7 +1399,7 @@
char* os::reserve_memory(size_t bytes, char* addr, size_t alignment_hint) {
char* result = pd_reserve_memory(bytes, addr, alignment_hint);
- if (result != NULL && MemTracker::is_on()) {
+ if (result != NULL) {
MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
}
@@ -1409,7 +1407,7 @@
}
char* os::attempt_reserve_memory_at(size_t bytes, char* addr) {
char* result = pd_attempt_reserve_memory_at(bytes, addr);
- if (result != NULL && MemTracker::is_on()) {
+ if (result != NULL) {
MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
}
return result;
@@ -1422,7 +1420,7 @@
bool os::commit_memory(char* addr, size_t bytes, bool executable) {
bool res = pd_commit_memory(addr, bytes, executable);
- if (res && MemTracker::is_on()) {
+ if (res) {
MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
}
return res;
@@ -1431,7 +1429,7 @@
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
bool executable) {
bool res = os::pd_commit_memory(addr, size, alignment_hint, executable);
- if (res && MemTracker::is_on()) {
+ if (res) {
MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
}
return res;
@@ -1458,8 +1456,9 @@
char *addr, size_t bytes, bool read_only,
bool allow_exec) {
char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
- if (result != NULL && MemTracker::is_on()) {
+ if (result != NULL) {
MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
+ MemTracker::record_virtual_memory_commit((address)result, bytes, CALLER_PC);
}
return result;
}
@@ -1474,6 +1473,7 @@
bool os::unmap_memory(char *addr, size_t bytes) {
bool result = pd_unmap_memory(addr, bytes);
if (result) {
+ MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
MemTracker::record_virtual_memory_release((address)addr, bytes);
}
return result;
diff --git a/hotspot/src/share/vm/runtime/stubRoutines.cpp b/hotspot/src/share/vm/runtime/stubRoutines.cpp
index 5ca4ba5..98d428a 100644
--- a/hotspot/src/share/vm/runtime/stubRoutines.cpp
+++ b/hotspot/src/share/vm/runtime/stubRoutines.cpp
@@ -120,6 +120,10 @@
address StubRoutines::_arrayof_jshort_fill;
address StubRoutines::_arrayof_jint_fill;
+address StubRoutines::_aescrypt_encryptBlock = NULL;
+address StubRoutines::_aescrypt_decryptBlock = NULL;
+address StubRoutines::_cipherBlockChaining_encryptAESCrypt = NULL;
+address StubRoutines::_cipherBlockChaining_decryptAESCrypt = NULL;
double (* StubRoutines::_intrinsic_log )(double) = NULL;
double (* StubRoutines::_intrinsic_log10 )(double) = NULL;
diff --git a/hotspot/src/share/vm/runtime/stubRoutines.hpp b/hotspot/src/share/vm/runtime/stubRoutines.hpp
index 0e583ae..91f273e 100644
--- a/hotspot/src/share/vm/runtime/stubRoutines.hpp
+++ b/hotspot/src/share/vm/runtime/stubRoutines.hpp
@@ -199,6 +199,11 @@
// zero heap space aligned to jlong (8 bytes)
static address _zero_aligned_words;
+ static address _aescrypt_encryptBlock;
+ static address _aescrypt_decryptBlock;
+ static address _cipherBlockChaining_encryptAESCrypt;
+ static address _cipherBlockChaining_decryptAESCrypt;
+
// These are versions of the java.lang.Math methods which perform
// the same operations as the intrinsic version. They are used for
// constant folding in the compiler to ensure equivalence. If the
@@ -330,6 +335,11 @@
static address arrayof_jshort_fill() { return _arrayof_jshort_fill; }
static address arrayof_jint_fill() { return _arrayof_jint_fill; }
+ static address aescrypt_encryptBlock() { return _aescrypt_encryptBlock; }
+ static address aescrypt_decryptBlock() { return _aescrypt_decryptBlock; }
+ static address cipherBlockChaining_encryptAESCrypt() { return _cipherBlockChaining_encryptAESCrypt; }
+ static address cipherBlockChaining_decryptAESCrypt() { return _cipherBlockChaining_decryptAESCrypt; }
+
static address select_fill_function(BasicType t, bool aligned, const char* &name);
static address zero_aligned_words() { return _zero_aligned_words; }
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 0ed9a4b..5c96224 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -323,12 +323,10 @@
os::initialize_thread(this);
#if INCLUDE_NMT
- // record thread's native stack, stack grows downward
- if (MemTracker::is_on()) {
- address stack_low_addr = stack_base() - stack_size();
- MemTracker::record_thread_stack(stack_low_addr, stack_size(), this,
+ // record thread's native stack, stack grows downward
+ address stack_low_addr = stack_base() - stack_size();
+ MemTracker::record_thread_stack(stack_low_addr, stack_size(), this,
CURRENT_PC);
- }
#endif // INCLUDE_NMT
}
@@ -345,6 +343,9 @@
if (_stack_base != NULL) {
address low_stack_addr = stack_base() - stack_size();
MemTracker::release_thread_stack(low_stack_addr, stack_size(), this);
+#ifdef ASSERT
+ set_stack_base(NULL);
+#endif
}
#endif // INCLUDE_NMT
@@ -1521,10 +1522,12 @@
tty->print_cr("terminate thread %p", this);
}
- // Info NMT that this JavaThread is exiting, its memory
- // recorder should be collected
+ // By now, this thread should already be invisible to safepoint,
+ // and its per-thread recorder also collected.
assert(!is_safepoint_visible(), "wrong state");
- MemTracker::thread_exiting(this);
+#if INCLUDE_NMT
+ assert(get_recorder() == NULL, "Already collected");
+#endif // INCLUDE_NMT
// JSR166 -- return the parker to the free list
Parker::Release(_parker);
@@ -2425,6 +2428,7 @@
}
void JavaThread::remove_stack_guard_pages() {
+ assert(Thread::current() == this, "from different thread");
if (_stack_guard_state == stack_guard_unused) return;
address low_addr = stack_base() - stack_size();
size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
@@ -4093,7 +4097,10 @@
// Now, this thread is not visible to safepoint
p->set_safepoint_visible(false);
-
+ // once the thread becomes safepoint invisible, we can not use its per-thread
+ // recorder. And Threads::do_threads() no longer walks this thread, so we have
+ // to release its per-thread recorder here.
+ MemTracker::thread_exiting(p);
} // unlock Threads_lock
// Since Events::log uses a lock, we grab it outside the Threads_lock
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 51e3ab5f..9159ad9 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -59,6 +59,7 @@
#include "memory/generation.hpp"
#include "memory/generationSpec.hpp"
#include "memory/heap.hpp"
+#include "memory/metablock.hpp"
#include "memory/space.hpp"
#include "memory/tenuredGeneration.hpp"
#include "memory/universe.hpp"
@@ -249,6 +250,7 @@
typedef Hashtable<Klass*, mtClass> KlassHashtable;
typedef HashtableEntry<Klass*, mtClass> KlassHashtableEntry;
typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
+typedef BinaryTreeDictionary<Metablock, FreeList> MetablockTreeDictionary;
//--------------------------------------------------------------------------------
// VM_STRUCTS
@@ -1237,7 +1239,15 @@
nonstatic_field(AccessFlags, _flags, jint) \
nonstatic_field(elapsedTimer, _counter, jlong) \
nonstatic_field(elapsedTimer, _active, bool) \
- nonstatic_field(InvocationCounter, _counter, unsigned int)
+ nonstatic_field(InvocationCounter, _counter, unsigned int) \
+ volatile_nonstatic_field(FreeChunk, _size, size_t) \
+ nonstatic_field(FreeChunk, _next, FreeChunk*) \
+ nonstatic_field(FreeChunk, _prev, FreeChunk*) \
+ nonstatic_field(FreeList<FreeChunk>, _size, size_t) \
+ nonstatic_field(FreeList<Metablock>, _size, size_t) \
+ nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \
+ nonstatic_field(FreeList<Metablock>, _count, ssize_t) \
+ nonstatic_field(MetablockTreeDictionary, _total_size, size_t)
/* NOTE that we do not use the last_entry() macro here; it is used */
/* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
@@ -2080,7 +2090,24 @@
declare_toplevel_type(Universe) \
declare_toplevel_type(vframeArray) \
declare_toplevel_type(vframeArrayElement) \
- declare_toplevel_type(Annotations*)
+ declare_toplevel_type(Annotations*) \
+ \
+ /***************/ \
+ /* Miscellaneous types */ \
+ /***************/ \
+ \
+ /* freelist */ \
+ declare_toplevel_type(FreeChunk*) \
+ declare_toplevel_type(Metablock*) \
+ declare_toplevel_type(FreeBlockDictionary<FreeChunk>*) \
+ declare_toplevel_type(FreeList<FreeChunk>*) \
+ declare_toplevel_type(FreeList<FreeChunk>) \
+ declare_toplevel_type(FreeBlockDictionary<Metablock>*) \
+ declare_toplevel_type(FreeList<Metablock>*) \
+ declare_toplevel_type(FreeList<Metablock>) \
+ declare_toplevel_type(MetablockTreeDictionary*) \
+ declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>) \
+ declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>)
/* NOTE that we do not use the last_entry() macro here; it is used */
diff --git a/hotspot/src/share/vm/services/attachListener.cpp b/hotspot/src/share/vm/services/attachListener.cpp
index 983f3f9..80dfd7e 100644
--- a/hotspot/src/share/vm/services/attachListener.cpp
+++ b/hotspot/src/share/vm/services/attachListener.cpp
@@ -404,6 +404,8 @@
static void attach_listener_thread_entry(JavaThread* thread, TRAPS) {
os::set_priority(thread, NearMaxPriority);
+ thread->record_stack_base_and_size();
+
if (AttachListener::pd_init() != 0) {
return;
}
diff --git a/hotspot/src/share/vm/services/memBaseline.cpp b/hotspot/src/share/vm/services/memBaseline.cpp
index 5b82975..57bdb01 100644
--- a/hotspot/src/share/vm/services/memBaseline.cpp
+++ b/hotspot/src/share/vm/services/memBaseline.cpp
@@ -40,6 +40,7 @@
{mtSymbol, "Symbol"},
{mtNMT, "Memory Tracking"},
{mtChunk, "Pooled Free Chunks"},
+ {mtClassShared,"Shared spaces for classes"},
{mtNone, "Unknown"} // It can happen when type tagging records are lagging
// behind
};
@@ -55,6 +56,7 @@
_malloc_cs = NULL;
_vm_cs = NULL;
+ _vm_map = NULL;
_number_of_classes = 0;
_number_of_threads = 0;
@@ -72,6 +74,11 @@
_vm_cs = NULL;
}
+ if (_vm_map != NULL) {
+ delete _vm_map;
+ _vm_map = NULL;
+ }
+
reset();
}
@@ -85,6 +92,7 @@
if (_malloc_cs != NULL) _malloc_cs->clear();
if (_vm_cs != NULL) _vm_cs->clear();
+ if (_vm_map != NULL) _vm_map->clear();
for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
_malloc_data[index].clear();
@@ -94,39 +102,33 @@
}
MemBaseline::~MemBaseline() {
- if (_malloc_cs != NULL) {
- delete _malloc_cs;
- }
-
- if (_vm_cs != NULL) {
- delete _vm_cs;
- }
+ clear();
}
// baseline malloc'd memory records, generate overall summary and summaries by
// memory types
bool MemBaseline::baseline_malloc_summary(const MemPointerArray* malloc_records) {
- MemPointerArrayIteratorImpl mItr((MemPointerArray*)malloc_records);
- MemPointerRecord* mptr = (MemPointerRecord*)mItr.current();
+ MemPointerArrayIteratorImpl malloc_itr((MemPointerArray*)malloc_records);
+ MemPointerRecord* malloc_ptr = (MemPointerRecord*)malloc_itr.current();
size_t used_arena_size = 0;
int index;
- while (mptr != NULL) {
- index = flag2index(FLAGS_TO_MEMORY_TYPE(mptr->flags()));
- size_t size = mptr->size();
+ while (malloc_ptr != NULL) {
+ index = flag2index(FLAGS_TO_MEMORY_TYPE(malloc_ptr->flags()));
+ size_t size = malloc_ptr->size();
_total_malloced += size;
_malloc_data[index].inc(size);
- if (MemPointerRecord::is_arena_record(mptr->flags())) {
+ if (MemPointerRecord::is_arena_record(malloc_ptr->flags())) {
// see if arena size record present
- MemPointerRecord* next_p = (MemPointerRecordEx*)mItr.peek_next();
- if (MemPointerRecord::is_arena_size_record(next_p->flags())) {
- assert(next_p->is_size_record_of_arena(mptr), "arena records do not match");
- size = next_p->size();
+ MemPointerRecord* next_malloc_ptr = (MemPointerRecordEx*)malloc_itr.peek_next();
+ if (MemPointerRecord::is_arena_size_record(next_malloc_ptr->flags())) {
+ assert(next_malloc_ptr->is_size_record_of_arena(malloc_ptr), "arena records do not match");
+ size = next_malloc_ptr->size();
_arena_data[index].inc(size);
used_arena_size += size;
- mItr.next();
+ malloc_itr.next();
}
}
- mptr = (MemPointerRecordEx*)mItr.next();
+ malloc_ptr = (MemPointerRecordEx*)malloc_itr.next();
}
// substract used arena size to get size of arena chunk in free list
@@ -142,20 +144,23 @@
// baseline mmap'd memory records, generate overall summary and summaries by
// memory types
bool MemBaseline::baseline_vm_summary(const MemPointerArray* vm_records) {
- MemPointerArrayIteratorImpl vItr((MemPointerArray*)vm_records);
- VMMemRegion* vptr = (VMMemRegion*)vItr.current();
+ MemPointerArrayIteratorImpl vm_itr((MemPointerArray*)vm_records);
+ VMMemRegion* vm_ptr = (VMMemRegion*)vm_itr.current();
int index;
- while (vptr != NULL) {
- index = flag2index(FLAGS_TO_MEMORY_TYPE(vptr->flags()));
-
+ while (vm_ptr != NULL) {
+ if (vm_ptr->is_reserved_region()) {
+ index = flag2index(FLAGS_TO_MEMORY_TYPE(vm_ptr->flags()));
// we use the number of thread stack to count threads
- if (IS_MEMORY_TYPE(vptr->flags(), mtThreadStack)) {
+ if (IS_MEMORY_TYPE(vm_ptr->flags(), mtThreadStack)) {
_number_of_threads ++;
}
- _total_vm_reserved += vptr->reserved_size();
- _total_vm_committed += vptr->committed_size();
- _vm_data[index].inc(vptr->reserved_size(), vptr->committed_size());
- vptr = (VMMemRegion*)vItr.next();
+ _total_vm_reserved += vm_ptr->size();
+ _vm_data[index].inc(vm_ptr->size(), 0);
+ } else {
+ _total_vm_committed += vm_ptr->size();
+ _vm_data[index].inc(0, vm_ptr->size());
+ }
+ vm_ptr = (VMMemRegion*)vm_itr.next();
}
return true;
}
@@ -165,41 +170,57 @@
bool MemBaseline::baseline_malloc_details(const MemPointerArray* malloc_records) {
assert(MemTracker::track_callsite(), "detail tracking is off");
- MemPointerArrayIteratorImpl mItr((MemPointerArray*)malloc_records);
- MemPointerRecordEx* mptr = (MemPointerRecordEx*)mItr.current();
- MallocCallsitePointer mp;
+ MemPointerArrayIteratorImpl malloc_itr(const_cast<MemPointerArray*>(malloc_records));
+ MemPointerRecordEx* malloc_ptr = (MemPointerRecordEx*)malloc_itr.current();
+ MallocCallsitePointer malloc_callsite;
+ // initailize malloc callsite array
if (_malloc_cs == NULL) {
_malloc_cs = new (std::nothrow) MemPointerArrayImpl<MallocCallsitePointer>(64);
// out of native memory
- if (_malloc_cs == NULL) {
+ if (_malloc_cs == NULL || _malloc_cs->out_of_memory()) {
return false;
}
} else {
_malloc_cs->clear();
}
+ MemPointerArray* malloc_data = const_cast<MemPointerArray*>(malloc_records);
+
+ // sort into callsite pc order. Details are aggregated by callsites
+ malloc_data->sort((FN_SORT)malloc_sort_by_pc);
+ bool ret = true;
+
// baseline memory that is totaled over 1 KB
- while (mptr != NULL) {
- if (!MemPointerRecord::is_arena_size_record(mptr->flags())) {
+ while (malloc_ptr != NULL) {
+ if (!MemPointerRecord::is_arena_size_record(malloc_ptr->flags())) {
// skip thread stacks
- if (!IS_MEMORY_TYPE(mptr->flags(), mtThreadStack)) {
- if (mp.addr() != mptr->pc()) {
- if ((mp.amount()/K) > 0) {
- if (!_malloc_cs->append(&mp)) {
- return false;
+ if (!IS_MEMORY_TYPE(malloc_ptr->flags(), mtThreadStack)) {
+ if (malloc_callsite.addr() != malloc_ptr->pc()) {
+ if ((malloc_callsite.amount()/K) > 0) {
+ if (!_malloc_cs->append(&malloc_callsite)) {
+ ret = false;
+ break;
}
}
- mp = MallocCallsitePointer(mptr->pc());
+ malloc_callsite = MallocCallsitePointer(malloc_ptr->pc());
}
- mp.inc(mptr->size());
+ malloc_callsite.inc(malloc_ptr->size());
}
}
- mptr = (MemPointerRecordEx*)mItr.next();
+ malloc_ptr = (MemPointerRecordEx*)malloc_itr.next();
}
- if (mp.addr() != 0 && (mp.amount()/K) > 0) {
- if (!_malloc_cs->append(&mp)) {
+ // restore to address order. Snapshot malloc data is maintained in memory
+ // address order.
+ malloc_data->sort((FN_SORT)malloc_sort_by_addr);
+
+ if (!ret) {
+ return false;
+ }
+ // deal with last record
+ if (malloc_callsite.addr() != 0 && (malloc_callsite.amount()/K) > 0) {
+ if (!_malloc_cs->append(&malloc_callsite)) {
return false;
}
}
@@ -210,34 +231,106 @@
bool MemBaseline::baseline_vm_details(const MemPointerArray* vm_records) {
assert(MemTracker::track_callsite(), "detail tracking is off");
- VMCallsitePointer vp;
- MemPointerArrayIteratorImpl vItr((MemPointerArray*)vm_records);
- VMMemRegionEx* vptr = (VMMemRegionEx*)vItr.current();
+ VMCallsitePointer vm_callsite;
+ VMCallsitePointer* cur_callsite = NULL;
+ MemPointerArrayIteratorImpl vm_itr((MemPointerArray*)vm_records);
+ VMMemRegionEx* vm_ptr = (VMMemRegionEx*)vm_itr.current();
+ // initialize virtual memory map array
+ if (_vm_map == NULL) {
+ _vm_map = new (std::nothrow) MemPointerArrayImpl<VMMemRegionEx>(vm_records->length());
+ if (_vm_map == NULL || _vm_map->out_of_memory()) {
+ return false;
+ }
+ } else {
+ _vm_map->clear();
+ }
+
+ // initialize virtual memory callsite array
if (_vm_cs == NULL) {
_vm_cs = new (std::nothrow) MemPointerArrayImpl<VMCallsitePointer>(64);
- if (_vm_cs == NULL) {
+ if (_vm_cs == NULL || _vm_cs->out_of_memory()) {
return false;
}
} else {
_vm_cs->clear();
}
- while (vptr != NULL) {
- if (vp.addr() != vptr->pc()) {
- if (!_vm_cs->append(&vp)) {
+ // consolidate virtual memory data
+ VMMemRegionEx* reserved_rec = NULL;
+ VMMemRegionEx* committed_rec = NULL;
+
+ // vm_ptr is coming in increasing base address order
+ while (vm_ptr != NULL) {
+ if (vm_ptr->is_reserved_region()) {
+ // consolidate reserved memory regions for virtual memory map.
+ // The criteria for consolidation is:
+ // 1. two adjacent reserved memory regions
+ // 2. belong to the same memory type
+ // 3. reserved from the same callsite
+ if (reserved_rec == NULL ||
+ reserved_rec->base() + reserved_rec->size() != vm_ptr->addr() ||
+ FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) != FLAGS_TO_MEMORY_TYPE(vm_ptr->flags()) ||
+ reserved_rec->pc() != vm_ptr->pc()) {
+ if (!_vm_map->append(vm_ptr)) {
return false;
}
- vp = VMCallsitePointer(vptr->pc());
+ // inserted reserved region, we need the pointer to the element in virtual
+ // memory map array.
+ reserved_rec = (VMMemRegionEx*)_vm_map->at(_vm_map->length() - 1);
+ } else {
+ reserved_rec->expand_region(vm_ptr->addr(), vm_ptr->size());
}
- vp.inc(vptr->size(), vptr->committed_size());
- vptr = (VMMemRegionEx*)vItr.next();
- }
- if (vp.addr() != 0) {
- if (!_vm_cs->append(&vp)) {
+
+ if (cur_callsite != NULL && !_vm_cs->append(cur_callsite)) {
return false;
}
+ vm_callsite = VMCallsitePointer(vm_ptr->pc());
+ cur_callsite = &vm_callsite;
+ vm_callsite.inc(vm_ptr->size(), 0);
+ } else {
+ // consolidate committed memory regions for virtual memory map
+ // The criterial is:
+ // 1. two adjacent committed memory regions
+ // 2. committed from the same callsite
+ if (committed_rec == NULL ||
+ committed_rec->base() + committed_rec->size() != vm_ptr->addr() ||
+ committed_rec->pc() != vm_ptr->pc()) {
+ if (!_vm_map->append(vm_ptr)) {
+ return false;
}
+ committed_rec = (VMMemRegionEx*)_vm_map->at(_vm_map->length() - 1);
+ } else {
+ committed_rec->expand_region(vm_ptr->addr(), vm_ptr->size());
+ }
+ vm_callsite.inc(0, vm_ptr->size());
+ }
+ vm_ptr = (VMMemRegionEx*)vm_itr.next();
+ }
+ // deal with last record
+ if (cur_callsite != NULL && !_vm_cs->append(cur_callsite)) {
+ return false;
+ }
+
+ // sort it into callsite pc order. Details are aggregated by callsites
+ _vm_cs->sort((FN_SORT)bl_vm_sort_by_pc);
+
+ // walk the array to consolidate record by pc
+ MemPointerArrayIteratorImpl itr(_vm_cs);
+ VMCallsitePointer* callsite_rec = (VMCallsitePointer*)itr.current();
+ VMCallsitePointer* next_rec = (VMCallsitePointer*)itr.next();
+ while (next_rec != NULL) {
+ assert(callsite_rec != NULL, "Sanity check");
+ if (next_rec->addr() == callsite_rec->addr()) {
+ callsite_rec->inc(next_rec->reserved_amount(), next_rec->committed_amount());
+ itr.remove();
+ next_rec = (VMCallsitePointer*)itr.current();
+ } else {
+ callsite_rec = next_rec;
+ next_rec = (VMCallsitePointer*)itr.next();
+ }
+ }
+
return true;
}
@@ -251,12 +344,8 @@
_number_of_classes = SystemDictionary::number_of_classes();
if (!summary_only && MemTracker::track_callsite() && _baselined) {
- ((MemPointerArray*)snapshot._alloc_ptrs)->sort((FN_SORT)malloc_sort_by_pc);
- ((MemPointerArray*)snapshot._vm_ptrs)->sort((FN_SORT)vm_sort_by_pc);
_baselined = baseline_malloc_details(snapshot._alloc_ptrs) &&
baseline_vm_details(snapshot._vm_ptrs);
- ((MemPointerArray*)snapshot._alloc_ptrs)->sort((FN_SORT)malloc_sort_by_addr);
- ((MemPointerArray*)snapshot._vm_ptrs)->sort((FN_SORT)vm_sort_by_addr);
}
return _baselined;
}
@@ -278,7 +367,7 @@
return MemType2NameMap[index]._name;
}
}
- assert(false, "no type");
+ assert(false, err_msg("bad type %x", type));
return NULL;
}
@@ -341,13 +430,6 @@
return UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
}
-// sort snapshot mmap'd records in callsite pc order
-int MemBaseline::vm_sort_by_pc(const void* p1, const void* p2) {
- assert(MemTracker::track_callsite(),"Just check");
- const VMMemRegionEx* mp1 = (const VMMemRegionEx*)p1;
- const VMMemRegionEx* mp2 = (const VMMemRegionEx*)p2;
- return UNSIGNED_COMPARE(mp1->pc(), mp2->pc());
-}
// sort baselined mmap'd records in size (reserved size) order
int MemBaseline::bl_vm_sort_by_size(const void* p1, const void* p2) {
@@ -376,12 +458,3 @@
return delta;
}
-// sort snapshot mmap'd records in memory block address order
-int MemBaseline::vm_sort_by_addr(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const VMMemRegion* mp1 = (const VMMemRegion*)p1;
- const VMMemRegion* mp2 = (const VMMemRegion*)p2;
- int delta = UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
- assert(delta != 0, "dup pointer");
- return delta;
-}
diff --git a/hotspot/src/share/vm/services/memBaseline.hpp b/hotspot/src/share/vm/services/memBaseline.hpp
index 2affa2b..5f98e30 100644
--- a/hotspot/src/share/vm/services/memBaseline.hpp
+++ b/hotspot/src/share/vm/services/memBaseline.hpp
@@ -320,6 +320,8 @@
// only available when detail tracking is on.
MemPointerArray* _malloc_cs;
MemPointerArray* _vm_cs;
+ // virtual memory map
+ MemPointerArray* _vm_map;
private:
static MemType2Name MemType2NameMap[NUMBER_OF_MEMORY_TYPE];
@@ -432,9 +434,6 @@
static int malloc_sort_by_pc(const void* p1, const void* p2);
static int malloc_sort_by_addr(const void* p1, const void* p2);
- static int vm_sort_by_pc(const void* p1, const void* p2);
- static int vm_sort_by_addr(const void* p1, const void* p2);
-
private:
// sorting functions for baselined records
static int bl_malloc_sort_by_size(const void* p1, const void* p2);
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/hotspot/src/share/vm/services/memPtr.cpp
index d2a1876..5d0fbf5 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/hotspot/src/share/vm/services/memPtr.cpp
@@ -40,35 +40,3 @@
return seq;
}
-
-
-bool VMMemRegion::contains(const VMMemRegion* mr) const {
- assert(base() != 0, "Sanity check");
- assert(size() != 0 || committed_size() != 0,
- "Sanity check");
- address base_addr = base();
- address end_addr = base_addr +
- (is_reserve_record()? reserved_size(): committed_size());
- if (mr->is_reserve_record()) {
- if (mr->base() == base_addr && mr->size() == size()) {
- // the same range
- return true;
- }
- return false;
- } else if (mr->is_commit_record() || mr->is_uncommit_record()) {
- assert(mr->base() != 0 && mr->committed_size() > 0,
- "bad record");
- return (mr->base() >= base_addr &&
- (mr->base() + mr->committed_size()) <= end_addr);
- } else if (mr->is_type_tagging_record()) {
- assert(mr->base() != NULL, "Sanity check");
- return (mr->base() >= base_addr && mr->base() < end_addr);
- } else if (mr->is_release_record()) {
- assert(mr->base() != 0 && mr->size() > 0,
- "bad record");
- return (mr->base() == base_addr && mr->size() == size());
- } else {
- ShouldNotReachHere();
- return false;
- }
-}
diff --git a/hotspot/src/share/vm/services/memPtr.hpp b/hotspot/src/share/vm/services/memPtr.hpp
index bef49b2..0618a3c 100644
--- a/hotspot/src/share/vm/services/memPtr.hpp
+++ b/hotspot/src/share/vm/services/memPtr.hpp
@@ -291,6 +291,26 @@
inline bool is_type_tagging_record() const {
return is_virtual_memory_type_record(_flags);
}
+
+ // if the two memory pointer records actually represent the same
+ // memory block
+ inline bool is_same_region(const MemPointerRecord* other) const {
+ return (addr() == other->addr() && size() == other->size());
+ }
+
+ // if this memory region fully contains another one
+ inline bool contains_region(const MemPointerRecord* other) const {
+ return contains_region(other->addr(), other->size());
+ }
+
+ // if this memory region fully contains specified memory range
+ inline bool contains_region(address add, size_t sz) const {
+ return (addr() <= add && addr() + size() >= add + sz);
+ }
+
+ inline bool contains_address(address add) const {
+ return (addr() <= add && addr() + size() > add);
+ }
};
// MemPointerRecordEx also records callsite pc, from where
@@ -321,66 +341,32 @@
}
};
-// a virtual memory region
+// a virtual memory region. The region can represent a reserved
+// virtual memory region or a committed memory region
class VMMemRegion : public MemPointerRecord {
- private:
- // committed size
- size_t _committed_size;
-
public:
- VMMemRegion(): _committed_size(0) { }
+ VMMemRegion() { }
void init(const MemPointerRecord* mp) {
- assert(mp->is_vm_pointer(), "not virtual memory pointer");
+ assert(mp->is_vm_pointer(), "Sanity check");
_addr = mp->addr();
- if (mp->is_commit_record() || mp->is_uncommit_record()) {
- _committed_size = mp->size();
- set_size(_committed_size);
- } else {
set_size(mp->size());
- _committed_size = 0;
- }
set_flags(mp->flags());
}
VMMemRegion& operator=(const VMMemRegion& other) {
MemPointerRecord::operator=(other);
- _committed_size = other.committed_size();
return *this;
}
- inline bool is_reserve_record() const {
- return is_virtual_memory_reserve_record(flags());
+ inline bool is_reserved_region() const {
+ return is_allocation_record();
}
- inline bool is_release_record() const {
- return is_virtual_memory_release_record(flags());
+ inline bool is_committed_region() const {
+ return is_commit_record();
}
- // resize reserved VM range
- inline void set_reserved_size(size_t new_size) {
- assert(new_size >= committed_size(), "resize");
- set_size(new_size);
- }
-
- inline void commit(size_t size) {
- _committed_size += size;
- }
-
- inline void uncommit(size_t size) {
- if (_committed_size >= size) {
- _committed_size -= size;
- } else {
- _committed_size = 0;
- }
- }
-
- /*
- * if this virtual memory range covers whole range of
- * the other VMMemRegion
- */
- bool contains(const VMMemRegion* mr) const;
-
/* base address of this virtual memory range */
inline address base() const {
return addr();
@@ -391,13 +377,28 @@
set_flags(flags() | (f & mt_masks));
}
- // release part of memory range
- inline void partial_release(address add, size_t sz) {
- assert(add >= addr() && add < addr() + size(), "not valid address");
- // for now, it can partially release from the both ends,
- // but not in the middle
+ // expand this region to also cover specified range.
+ // The range has to be on either end of the memory region.
+ void expand_region(address addr, size_t sz) {
+ if (addr < base()) {
+ assert(addr + sz == base(), "Sanity check");
+ _addr = addr;
+ set_size(size() + sz);
+ } else {
+ assert(base() + size() == addr, "Sanity check");
+ set_size(size() + sz);
+ }
+ }
+
+ // exclude the specified address range from this region.
+ // The excluded memory range has to be on either end of this memory
+ // region.
+ inline void exclude_region(address add, size_t sz) {
+ assert(is_reserved_region() || is_committed_region(), "Sanity check");
+ assert(addr() != NULL && size() != 0, "Sanity check");
+ assert(add >= addr() && add < addr() + size(), "Sanity check");
assert(add == addr() || (add + sz) == (addr() + size()),
- "release in the middle");
+ "exclude in the middle");
if (add == addr()) {
set_addr(add + sz);
set_size(size() - sz);
@@ -405,16 +406,6 @@
set_size(size() - sz);
}
}
-
- // the committed size of the virtual memory block
- inline size_t committed_size() const {
- return _committed_size;
- }
-
- // the reserved size of the virtual memory block
- inline size_t reserved_size() const {
- return size();
- }
};
class VMMemRegionEx : public VMMemRegion {
diff --git a/hotspot/src/share/vm/services/memRecorder.cpp b/hotspot/src/share/vm/services/memRecorder.cpp
index 33db875..5ec865a 100644
--- a/hotspot/src/share/vm/services/memRecorder.cpp
+++ b/hotspot/src/share/vm/services/memRecorder.cpp
@@ -31,14 +31,19 @@
#include "services/memTracker.hpp"
MemPointer* SequencedRecordIterator::next_record() {
- MemPointer* itr_cur = _itr.current();
- if (itr_cur == NULL) return NULL;
- MemPointer* itr_next = _itr.next();
+ MemPointerRecord* itr_cur = (MemPointerRecord*)_itr.current();
+ if (itr_cur == NULL) {
+ return itr_cur;
+ }
- while (itr_next != NULL &&
- same_kind((MemPointerRecord*)itr_cur, (MemPointerRecord*)itr_next)) {
+ MemPointerRecord* itr_next = (MemPointerRecord*)_itr.next();
+
+ // don't collapse virtual memory records
+ while (itr_next != NULL && !itr_cur->is_vm_pointer() &&
+ !itr_next->is_vm_pointer() &&
+ same_kind(itr_cur, itr_next)) {
itr_cur = itr_next;
- itr_next = _itr.next();
+ itr_next = (MemPointerRecord*)_itr.next();
}
return itr_cur;
diff --git a/hotspot/src/share/vm/services/memRecorder.hpp b/hotspot/src/share/vm/services/memRecorder.hpp
index 754cbd6..2afeeb0 100644
--- a/hotspot/src/share/vm/services/memRecorder.hpp
+++ b/hotspot/src/share/vm/services/memRecorder.hpp
@@ -188,6 +188,7 @@
// Test if the two records are the same kind: the same memory block and allocation
// type.
inline bool same_kind(const MemPointerRecord* p1, const MemPointerRecord* p2) const {
+ assert(!p1->is_vm_pointer() && !p2->is_vm_pointer(), "malloc pointer only");
return (p1->addr() == p2->addr() &&
(p1->flags() &MemPointerRecord::tag_masks) ==
(p2->flags() & MemPointerRecord::tag_masks));
diff --git a/hotspot/src/share/vm/services/memReporter.cpp b/hotspot/src/share/vm/services/memReporter.cpp
index 783d951..602ac1c 100644
--- a/hotspot/src/share/vm/services/memReporter.cpp
+++ b/hotspot/src/share/vm/services/memReporter.cpp
@@ -51,6 +51,7 @@
report_summaries(baseline);
if (!summary_only && MemTracker::track_callsite()) {
+ report_virtual_memory_map(baseline);
report_callsites(baseline);
}
_outputer.done();
@@ -74,6 +75,25 @@
_outputer.done_category_summary();
}
+void BaselineReporter::report_virtual_memory_map(const MemBaseline& baseline) {
+ _outputer.start_virtual_memory_map();
+ MemBaseline* pBL = const_cast<MemBaseline*>(&baseline);
+ MemPointerArrayIteratorImpl itr = MemPointerArrayIteratorImpl(pBL->_vm_map);
+ VMMemRegionEx* rgn = (VMMemRegionEx*)itr.current();
+ while (rgn != NULL) {
+ if (rgn->is_reserved_region()) {
+ _outputer.reserved_memory_region(FLAGS_TO_MEMORY_TYPE(rgn->flags()),
+ rgn->base(), rgn->base() + rgn->size(), amount_in_current_scale(rgn->size()), rgn->pc());
+ } else {
+ _outputer.committed_memory_region(rgn->base(), rgn->base() + rgn->size(),
+ amount_in_current_scale(rgn->size()), rgn->pc());
+ }
+ rgn = (VMMemRegionEx*)itr.next();
+ }
+
+ _outputer.done_virtual_memory_map();
+}
+
void BaselineReporter::report_callsites(const MemBaseline& baseline) {
_outputer.start_callsite();
MemBaseline* pBL = const_cast<MemBaseline*>(&baseline);
@@ -324,6 +344,40 @@
_output->print_cr(" ");
}
+
+void BaselineTTYOutputer::start_virtual_memory_map() {
+ _output->print_cr("Virtual memory map:");
+}
+
+void BaselineTTYOutputer::reserved_memory_region(MEMFLAGS type, address base, address end,
+ size_t size, address pc) {
+ const char* unit = memory_unit(_scale);
+ char buf[128];
+ int offset;
+ _output->print_cr(" ");
+ _output->print_cr("[" PTR_FORMAT " - " PTR_FORMAT "] reserved %d%s for %s", base, end, size, unit,
+ MemBaseline::type2name(type));
+ if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
+ _output->print_cr("\t\tfrom [%s+0x%x]", buf, offset);
+ }
+}
+
+void BaselineTTYOutputer::committed_memory_region(address base, address end, size_t size, address pc) {
+ const char* unit = memory_unit(_scale);
+ char buf[128];
+ int offset;
+ _output->print("\t[" PTR_FORMAT " - " PTR_FORMAT "] committed %d%s", base, end, size, unit);
+ if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
+ _output->print_cr(" from [%s+0x%x]", buf, offset);
+ }
+}
+
+void BaselineTTYOutputer::done_virtual_memory_map() {
+ _output->print_cr(" ");
+}
+
+
+
void BaselineTTYOutputer::start_callsite() {
_output->print_cr("Details:");
_output->print_cr(" ");
@@ -337,7 +391,7 @@
size_t malloc_count) {
if (malloc_amt > 0) {
const char* unit = memory_unit(_scale);
- char buf[64];
+ char buf[128];
int offset;
if (pc == 0) {
_output->print("[BOOTSTRAP]%18s", " ");
@@ -357,7 +411,7 @@
size_t committed_amt) {
if (reserved_amt > 0) {
const char* unit = memory_unit(_scale);
- char buf[64];
+ char buf[128];
int offset;
if (pc == 0) {
_output->print("[BOOTSTRAP]%18s", " ");
@@ -502,7 +556,7 @@
int malloc_diff, int malloc_count_diff) {
if (malloc_diff != 0) {
const char* unit = memory_unit(_scale);
- char buf[64];
+ char buf[128];
int offset;
if (pc == 0) {
_output->print_cr("[BOOTSTRAP]%18s", " ");
diff --git a/hotspot/src/share/vm/services/memReporter.hpp b/hotspot/src/share/vm/services/memReporter.hpp
index 4595b27..7a5372d 100644
--- a/hotspot/src/share/vm/services/memReporter.hpp
+++ b/hotspot/src/share/vm/services/memReporter.hpp
@@ -93,6 +93,11 @@
virtual void done_category_summary() = 0;
+ virtual void start_virtual_memory_map() = 0;
+ virtual void reserved_memory_region(MEMFLAGS type, address base, address end, size_t size, address pc) = 0;
+ virtual void committed_memory_region(address base, address end, size_t size, address pc) = 0;
+ virtual void done_virtual_memory_map() = 0;
+
/*
* Report callsite information
*/
@@ -136,6 +141,7 @@
private:
void report_summaries(const MemBaseline& baseline);
+ void report_virtual_memory_map(const MemBaseline& baseline);
void report_callsites(const MemBaseline& baseline);
void diff_summaries(const MemBaseline& cur, const MemBaseline& prev);
@@ -251,6 +257,13 @@
void done_category_summary();
+ // virtual memory map
+ void start_virtual_memory_map();
+ void reserved_memory_region(MEMFLAGS type, address base, address end, size_t size, address pc);
+ void committed_memory_region(address base, address end, size_t size, address pc);
+ void done_virtual_memory_map();
+
+
/*
* Report callsite information
*/
diff --git a/hotspot/src/share/vm/services/memSnapshot.cpp b/hotspot/src/share/vm/services/memSnapshot.cpp
index f860576..20e1ce6 100644
--- a/hotspot/src/share/vm/services/memSnapshot.cpp
+++ b/hotspot/src/share/vm/services/memSnapshot.cpp
@@ -31,6 +31,220 @@
#include "services/memSnapshot.hpp"
#include "services/memTracker.hpp"
+
+bool VMMemPointerIterator::insert_record(MemPointerRecord* rec) {
+ VMMemRegionEx new_rec;
+ assert(rec->is_allocation_record() || rec->is_commit_record(),
+ "Sanity check");
+ if (MemTracker::track_callsite()) {
+ new_rec.init((MemPointerRecordEx*)rec);
+ } else {
+ new_rec.init(rec);
+ }
+ return insert(&new_rec);
+}
+
+bool VMMemPointerIterator::insert_record_after(MemPointerRecord* rec) {
+ VMMemRegionEx new_rec;
+ assert(rec->is_allocation_record() || rec->is_commit_record(),
+ "Sanity check");
+ if (MemTracker::track_callsite()) {
+ new_rec.init((MemPointerRecordEx*)rec);
+ } else {
+ new_rec.init(rec);
+ }
+ return insert_after(&new_rec);
+}
+
+// we don't consolidate reserved regions, since they may be categorized
+// in different types.
+bool VMMemPointerIterator::add_reserved_region(MemPointerRecord* rec) {
+ assert(rec->is_allocation_record(), "Sanity check");
+ VMMemRegion* cur = (VMMemRegion*)current();
+
+ // we don't have anything yet
+ if (cur == NULL) {
+ return insert_record(rec);
+ }
+
+ assert(cur->is_reserved_region(), "Sanity check");
+ // duplicated records
+ if (cur->is_same_region(rec)) {
+ return true;
+ }
+ assert(cur->base() > rec->addr(), "Just check: locate()");
+ assert(rec->addr() + rec->size() <= cur->base(), "Can not overlap");
+ return insert_record(rec);
+}
+
+// we do consolidate committed regions
+bool VMMemPointerIterator::add_committed_region(MemPointerRecord* rec) {
+ assert(rec->is_commit_record(), "Sanity check");
+ VMMemRegion* cur;
+ cur = (VMMemRegion*)current();
+ assert(cur->is_reserved_region() && cur->contains_region(rec),
+ "Sanity check");
+
+ // thread's native stack is always marked as "committed", ignore
+ // the "commit" operation for creating stack guard pages
+ if (FLAGS_TO_MEMORY_TYPE(cur->flags()) == mtThreadStack &&
+ FLAGS_TO_MEMORY_TYPE(rec->flags()) != mtThreadStack) {
+ return true;
+ }
+
+ cur = (VMMemRegion*)next();
+ while (cur != NULL && cur->is_committed_region()) {
+ // duplicated commit records
+ if(cur->contains_region(rec)) {
+ return true;
+ }
+ if (cur->base() > rec->addr()) {
+ // committed regions can not overlap
+ assert(rec->addr() + rec->size() <= cur->base(), "Can not overlap");
+ if (rec->addr() + rec->size() == cur->base()) {
+ cur->expand_region(rec->addr(), rec->size());
+ return true;
+ } else {
+ return insert_record(rec);
+ }
+ } else if (cur->base() + cur->size() == rec->addr()) {
+ cur->expand_region(rec->addr(), rec->size());
+ VMMemRegion* next_reg = (VMMemRegion*)next();
+ // see if we can consolidate next committed region
+ if (next_reg != NULL && next_reg->is_committed_region() &&
+ next_reg->base() == cur->base() + cur->size()) {
+ cur->expand_region(next_reg->base(), next_reg->size());
+ remove();
+ }
+ return true;
+ }
+ cur = (VMMemRegion*)next();
+ }
+ return insert_record(rec);
+}
+
+bool VMMemPointerIterator::remove_uncommitted_region(MemPointerRecord* rec) {
+ assert(rec->is_uncommit_record(), "sanity check");
+ VMMemRegion* cur;
+ cur = (VMMemRegion*)current();
+ assert(cur->is_reserved_region() && cur->contains_region(rec),
+ "Sanity check");
+ // thread's native stack is always marked as "committed", ignore
+ // the "commit" operation for creating stack guard pages
+ if (FLAGS_TO_MEMORY_TYPE(cur->flags()) == mtThreadStack &&
+ FLAGS_TO_MEMORY_TYPE(rec->flags()) != mtThreadStack) {
+ return true;
+ }
+
+ cur = (VMMemRegion*)next();
+ while (cur != NULL && cur->is_committed_region()) {
+ // region already uncommitted, must be due to duplicated record
+ if (cur->addr() >= rec->addr() + rec->size()) {
+ break;
+ } else if (cur->contains_region(rec)) {
+ // uncommit whole region
+ if (cur->is_same_region(rec)) {
+ remove();
+ break;
+ } else if (rec->addr() == cur->addr() ||
+ rec->addr() + rec->size() == cur->addr() + cur->size()) {
+ // uncommitted from either end of current memory region.
+ cur->exclude_region(rec->addr(), rec->size());
+ break;
+ } else { // split the committed region and release the middle
+ address high_addr = cur->addr() + cur->size();
+ size_t sz = high_addr - rec->addr();
+ cur->exclude_region(rec->addr(), sz);
+ sz = high_addr - (rec->addr() + rec->size());
+ if (MemTracker::track_callsite()) {
+ MemPointerRecordEx tmp(rec->addr() + rec->size(), cur->flags(), sz,
+ ((VMMemRegionEx*)cur)->pc());
+ return insert_record_after(&tmp);
+ } else {
+ MemPointerRecord tmp(rec->addr() + rec->size(), cur->flags(), sz);
+ return insert_record_after(&tmp);
+ }
+ }
+ }
+ cur = (VMMemRegion*)next();
+ }
+
+ // we may not find committed record due to duplicated records
+ return true;
+}
+
+bool VMMemPointerIterator::remove_released_region(MemPointerRecord* rec) {
+ assert(rec->is_deallocation_record(), "Sanity check");
+ VMMemRegion* cur = (VMMemRegion*)current();
+ assert(cur->is_reserved_region() && cur->contains_region(rec),
+ "Sanity check");
+#ifdef ASSERT
+ VMMemRegion* next_reg = (VMMemRegion*)peek_next();
+ // should not have any committed memory in this reserved region
+ assert(next_reg == NULL || !next_reg->is_committed_region(), "Sanity check");
+#endif
+ if (rec->is_same_region(cur)) {
+ remove();
+ } else if (rec->addr() == cur->addr() ||
+ rec->addr() + rec->size() == cur->addr() + cur->size()) {
+ // released region is at either end of this region
+ cur->exclude_region(rec->addr(), rec->size());
+ } else { // split the reserved region and release the middle
+ address high_addr = cur->addr() + cur->size();
+ size_t sz = high_addr - rec->addr();
+ cur->exclude_region(rec->addr(), sz);
+ sz = high_addr - rec->addr() - rec->size();
+ if (MemTracker::track_callsite()) {
+ MemPointerRecordEx tmp(rec->addr() + rec->size(), cur->flags(), sz,
+ ((VMMemRegionEx*)cur)->pc());
+ return insert_reserved_region(&tmp);
+ } else {
+ MemPointerRecord tmp(rec->addr() + rec->size(), cur->flags(), sz);
+ return insert_reserved_region(&tmp);
+ }
+ }
+ return true;
+}
+
+bool VMMemPointerIterator::insert_reserved_region(MemPointerRecord* rec) {
+ // skip all 'commit' records associated with previous reserved region
+ VMMemRegion* p = (VMMemRegion*)next();
+ while (p != NULL && p->is_committed_region() &&
+ p->base() + p->size() < rec->addr()) {
+ p = (VMMemRegion*)next();
+ }
+ return insert_record(rec);
+}
+
+bool VMMemPointerIterator::split_reserved_region(VMMemRegion* rgn, address new_rgn_addr, size_t new_rgn_size) {
+ assert(rgn->contains_region(new_rgn_addr, new_rgn_size), "Not fully contained");
+ address pc = (MemTracker::track_callsite() ? ((VMMemRegionEx*)rgn)->pc() : NULL);
+ if (rgn->base() == new_rgn_addr) { // new region is at the beginning of the region
+ size_t sz = rgn->size() - new_rgn_size;
+ // the original region becomes 'new' region
+ rgn->exclude_region(new_rgn_addr + new_rgn_size, sz);
+ // remaining becomes next region
+ MemPointerRecordEx next_rgn(new_rgn_addr + new_rgn_size, rgn->flags(), sz, pc);
+ return insert_reserved_region(&next_rgn);
+ } else if (rgn->base() + rgn->size() == new_rgn_addr + new_rgn_size) {
+ rgn->exclude_region(new_rgn_addr, new_rgn_size);
+ MemPointerRecordEx next_rgn(new_rgn_addr, rgn->flags(), new_rgn_size, pc);
+ return insert_reserved_region(&next_rgn);
+ } else {
+ // the orginal region will be split into three
+ address rgn_high_addr = rgn->base() + rgn->size();
+ // first region
+ rgn->exclude_region(new_rgn_addr, (rgn_high_addr - new_rgn_addr));
+ // the second region is the new region
+ MemPointerRecordEx new_rgn(new_rgn_addr, rgn->flags(), new_rgn_size, pc);
+ if (!insert_reserved_region(&new_rgn)) return false;
+ // the remaining region
+ MemPointerRecordEx rem_rgn(new_rgn_addr + new_rgn_size, rgn->flags(),
+ rgn_high_addr - (new_rgn_addr + new_rgn_size), pc);
+ return insert_reserved_region(&rem_rgn);
+ }
+}
+
static int sort_in_seq_order(const void* p1, const void* p2) {
assert(p1 != NULL && p2 != NULL, "Sanity check");
const MemPointerRecord* mp1 = (MemPointerRecord*)p1;
@@ -61,11 +275,11 @@
}
-MemPointerArrayIteratorImpl StagingArea::virtual_memory_record_walker() {
+VMRecordIterator StagingArea::virtual_memory_record_walker() {
MemPointerArray* arr = vm_data();
// sort into seq number order
arr->sort((FN_SORT)sort_in_seq_order);
- return MemPointerArrayIteratorImpl(arr);
+ return VMRecordIterator(arr);
}
@@ -135,6 +349,8 @@
return false;
}
} else {
+ // locate matched record and/or also position the iterator to proper
+ // location for this incoming record.
p2 = (MemPointerRecord*)malloc_staging_itr.locate(p1->addr());
// we have not seen this memory block, so just add to staging area
if (p2 == NULL) {
@@ -199,7 +415,7 @@
MallocRecordIterator malloc_itr = _staging_area.malloc_record_walker();
bool promoted = false;
if (promote_malloc_records(&malloc_itr)) {
- MemPointerArrayIteratorImpl vm_itr = _staging_area.virtual_memory_record_walker();
+ VMRecordIterator vm_itr = _staging_area.virtual_memory_record_walker();
if (promote_virtual_memory_records(&vm_itr)) {
promoted = true;
}
@@ -218,7 +434,7 @@
matched_rec = (MemPointerRecord*)malloc_snapshot_itr.locate(new_rec->addr());
// found matched memory block
if (matched_rec != NULL && new_rec->addr() == matched_rec->addr()) {
- // snapshot already contains 'lived' records
+ // snapshot already contains 'live' records
assert(matched_rec->is_allocation_record() || matched_rec->is_arena_size_record(),
"Sanity check");
// update block states
@@ -277,87 +493,60 @@
bool MemSnapshot::promote_virtual_memory_records(MemPointerArrayIterator* itr) {
VMMemPointerIterator vm_snapshot_itr(_vm_ptrs);
MemPointerRecord* new_rec = (MemPointerRecord*)itr->current();
- VMMemRegionEx new_vm_rec;
- VMMemRegion* matched_rec;
+ VMMemRegion* reserved_rec;
while (new_rec != NULL) {
assert(new_rec->is_vm_pointer(), "Sanity check");
- if (MemTracker::track_callsite()) {
- new_vm_rec.init((MemPointerRecordEx*)new_rec);
- } else {
- new_vm_rec.init(new_rec);
- }
- matched_rec = (VMMemRegion*)vm_snapshot_itr.locate(new_rec->addr());
- if (matched_rec != NULL &&
- (matched_rec->contains(&new_vm_rec) || matched_rec->base() == new_vm_rec.base())) {
+
+ // locate a reserved region that contains the specified address, or
+ // the nearest reserved region has base address just above the specified
+ // address
+ reserved_rec = (VMMemRegion*)vm_snapshot_itr.locate(new_rec->addr());
+ if (reserved_rec != NULL && reserved_rec->contains_region(new_rec)) {
// snapshot can only have 'live' records
- assert(matched_rec->is_reserve_record(), "Sanity check");
- if (new_vm_rec.is_reserve_record() && matched_rec->base() == new_vm_rec.base()) {
- // resize reserved virtual memory range
- // resize has to cover committed area
- assert(new_vm_rec.size() >= matched_rec->committed_size(), "Sanity check");
- matched_rec->set_reserved_size(new_vm_rec.size());
- } else if (new_vm_rec.is_commit_record()) {
- // commit memory inside reserved memory range
- assert(new_vm_rec.committed_size() <= matched_rec->reserved_size(), "Sanity check");
- // thread stacks are marked committed, so we ignore 'commit' record for creating
- // stack guard pages
- if (FLAGS_TO_MEMORY_TYPE(matched_rec->flags()) != mtThreadStack) {
- matched_rec->commit(new_vm_rec.committed_size());
- }
- } else if (new_vm_rec.is_uncommit_record()) {
- if (FLAGS_TO_MEMORY_TYPE(matched_rec->flags()) == mtThreadStack) {
- // ignore 'uncommit' record from removing stack guard pages, uncommit
- // thread stack as whole
- if (matched_rec->committed_size() == new_vm_rec.committed_size()) {
- matched_rec->uncommit(new_vm_rec.committed_size());
+ assert(reserved_rec->is_reserved_region(), "Sanity check");
+ if (new_rec->is_allocation_record()) {
+ if (!reserved_rec->is_same_region(new_rec)) {
+ // only deal with split a bigger reserved region into smaller regions.
+ // So far, CDS is the only use case.
+ if (!vm_snapshot_itr.split_reserved_region(reserved_rec, new_rec->addr(), new_rec->size())) {
+ return false;
}
- } else {
- // uncommit memory inside reserved memory range
- assert(new_vm_rec.committed_size() <= matched_rec->committed_size(),
- "Sanity check");
- matched_rec->uncommit(new_vm_rec.committed_size());
}
- } else if (new_vm_rec.is_type_tagging_record()) {
- // tag this virtual memory range to a memory type
- // can not re-tag a memory range to different type
- assert(FLAGS_TO_MEMORY_TYPE(matched_rec->flags()) == mtNone ||
- FLAGS_TO_MEMORY_TYPE(matched_rec->flags()) == FLAGS_TO_MEMORY_TYPE(new_vm_rec.flags()),
+ } else if (new_rec->is_uncommit_record()) {
+ if (!vm_snapshot_itr.remove_uncommitted_region(new_rec)) {
+ return false;
+ }
+ } else if (new_rec->is_commit_record()) {
+ // insert or expand existing committed region to cover this
+ // newly committed region
+ if (!vm_snapshot_itr.add_committed_region(new_rec)) {
+ return false;
+ }
+ } else if (new_rec->is_deallocation_record()) {
+ // release part or all memory region
+ if (!vm_snapshot_itr.remove_released_region(new_rec)) {
+ return false;
+ }
+ } else if (new_rec->is_type_tagging_record()) {
+ // tag this reserved virtual memory range to a memory type. Can not re-tag a memory range
+ // to different type.
+ assert(FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) == mtNone ||
+ FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) == FLAGS_TO_MEMORY_TYPE(new_rec->flags()),
"Sanity check");
- matched_rec->tag(new_vm_rec.flags());
- } else if (new_vm_rec.is_release_record()) {
- // release part or whole memory range
- if (new_vm_rec.base() == matched_rec->base() &&
- new_vm_rec.size() == matched_rec->size()) {
- // release whole virtual memory range
- assert(matched_rec->committed_size() == 0, "Sanity check");
- vm_snapshot_itr.remove();
- } else {
- // partial release
- matched_rec->partial_release(new_vm_rec.base(), new_vm_rec.size());
- }
- } else {
- // multiple reserve/commit on the same virtual memory range
- assert((new_vm_rec.is_reserve_record() || new_vm_rec.is_commit_record()) &&
- (new_vm_rec.base() == matched_rec->base() && new_vm_rec.size() == matched_rec->size()),
- "Sanity check");
- matched_rec->tag(new_vm_rec.flags());
- }
+ reserved_rec->tag(new_rec->flags());
} else {
- // no matched record
- if (new_vm_rec.is_reserve_record()) {
- if (matched_rec == NULL || matched_rec->base() > new_vm_rec.base()) {
- if (!vm_snapshot_itr.insert(&new_vm_rec)) {
- return false;
+ ShouldNotReachHere();
}
} else {
- if (!vm_snapshot_itr.insert_after(&new_vm_rec)) {
+ /*
+ * The assertion failure indicates mis-matched virtual memory records. The likely
+ * scenario is, that some virtual memory operations are not going through os::xxxx_memory()
+ * api, which have to be tracked manually. (perfMemory is an example).
+ */
+ assert(new_rec->is_allocation_record(), "Sanity check");
+ if (!vm_snapshot_itr.add_reserved_region(new_rec)) {
return false;
}
- }
- } else {
- // throw out obsolete records, which are the commit/uncommit/release/tag records
- // on memory regions that are already released.
- }
}
new_rec = (MemPointerRecord*)itr->next();
}
@@ -433,5 +622,33 @@
cur = (MemPointerRecord*)vm_itr.next();
}
}
+
+void MemSnapshot::dump_all_vm_pointers() {
+ MemPointerArrayIteratorImpl itr(_vm_ptrs);
+ VMMemRegion* ptr = (VMMemRegion*)itr.current();
+ tty->print_cr("dump virtual memory pointers:");
+ while (ptr != NULL) {
+ if (ptr->is_committed_region()) {
+ tty->print("\t");
+ }
+ tty->print("[" PTR_FORMAT " - " PTR_FORMAT "] [%x]", ptr->addr(),
+ (ptr->addr() + ptr->size()), ptr->flags());
+
+ if (MemTracker::track_callsite()) {
+ VMMemRegionEx* ex = (VMMemRegionEx*)ptr;
+ if (ex->pc() != NULL) {
+ char buf[1024];
+ if (os::dll_address_to_function_name(ex->pc(), buf, sizeof(buf), NULL)) {
+ tty->print_cr("\t%s", buf);
+ } else {
+ tty->print_cr("");
+ }
+ }
+ }
+
+ ptr = (VMMemRegion*)itr.next();
+ }
+ tty->flush();
+}
#endif // ASSERT
diff --git a/hotspot/src/share/vm/services/memSnapshot.hpp b/hotspot/src/share/vm/services/memSnapshot.hpp
index 9ac6e4c..dd52f4c 100644
--- a/hotspot/src/share/vm/services/memSnapshot.hpp
+++ b/hotspot/src/share/vm/services/memSnapshot.hpp
@@ -111,33 +111,41 @@
MemPointerIterator(arr) {
}
- // locate an existing record that contains specified address, or
- // the record, where the record with specified address, should
- // be inserted.
- // virtual memory record array is sorted in address order, so
- // binary search is performed
+ // locate an existing reserved memory region that contains specified address,
+ // or the reserved region just above this address, where the incoming
+ // reserved region should be inserted.
virtual MemPointer* locate(address addr) {
- int index_low = 0;
- int index_high = _array->length();
- int index_mid = (index_high + index_low) / 2;
- int r = 1;
- while (index_low < index_high && (r = compare(index_mid, addr)) != 0) {
- if (r > 0) {
- index_high = index_mid;
- } else {
- index_low = index_mid;
+ reset();
+ VMMemRegion* reg = (VMMemRegion*)current();
+ while (reg != NULL) {
+ if (reg->is_reserved_region()) {
+ if (reg->contains_address(addr) || addr < reg->base()) {
+ return reg;
}
- index_mid = (index_high + index_low) / 2;
}
- if (r == 0) {
- // update current location
- _pos = index_mid;
- return _array->at(index_mid);
- } else {
+ reg = (VMMemRegion*)next();
+ }
return NULL;
}
- }
+ // following methods update virtual memory in the context
+ // of 'current' position, which is properly positioned by
+ // callers via locate method.
+ bool add_reserved_region(MemPointerRecord* rec);
+ bool add_committed_region(MemPointerRecord* rec);
+ bool remove_uncommitted_region(MemPointerRecord* rec);
+ bool remove_released_region(MemPointerRecord* rec);
+
+ // split a reserved region to create a new memory region with specified base and size
+ bool split_reserved_region(VMMemRegion* rgn, address new_rgn_addr, size_t new_rgn_size);
+ private:
+ bool insert_record(MemPointerRecord* rec);
+ bool insert_record_after(MemPointerRecord* rec);
+
+ bool insert_reserved_region(MemPointerRecord* rec);
+
+ // reset current position
+ inline void reset() { _pos = 0; }
#ifdef ASSERT
virtual bool is_dup_pointer(const MemPointer* ptr1,
const MemPointer* ptr2) const {
@@ -154,32 +162,17 @@
(p1->flags() & MemPointerRecord::tag_masks) == MemPointerRecord::tag_release;
}
#endif
- // compare if an address falls into a memory region,
- // return 0, if the address falls into a memory region at specified index
- // return 1, if memory region pointed by specified index is higher than the address
- // return -1, if memory region pointed by specified index is lower than the address
- int compare(int index, address addr) const {
- VMMemRegion* r = (VMMemRegion*)_array->at(index);
- assert(r->is_reserve_record(), "Sanity check");
- if (r->addr() > addr) {
- return 1;
- } else if (r->addr() + r->reserved_size() <= addr) {
- return -1;
- } else {
- return 0;
- }
- }
};
class MallocRecordIterator : public MemPointerArrayIterator {
- private:
+ protected:
MemPointerArrayIteratorImpl _itr;
public:
MallocRecordIterator(MemPointerArray* arr) : _itr(arr) {
}
- MemPointer* current() const {
+ virtual MemPointer* current() const {
MemPointerRecord* cur = (MemPointerRecord*)_itr.current();
assert(cur == NULL || !cur->is_vm_pointer(), "seek error");
MemPointerRecord* next = (MemPointerRecord*)_itr.peek_next();
@@ -194,7 +187,7 @@
}
}
- MemPointer* next() {
+ virtual MemPointer* next() {
MemPointerRecord* cur = (MemPointerRecord*)_itr.current();
assert(cur == NULL || !cur->is_vm_pointer(), "Sanity check");
MemPointerRecord* next = (MemPointerRecord*)_itr.next();
@@ -214,6 +207,63 @@
bool insert_after(MemPointer* ptr) { ShouldNotReachHere(); return false; }
};
+// collapse duplicated records. Eliminating duplicated records here, is much
+// cheaper than during promotion phase. However, it does have limitation - it
+// can only eliminate duplicated records within the generation, there are
+// still chances seeing duplicated records during promotion.
+// We want to use the record with higher sequence number, because it has
+// more accurate callsite pc.
+class VMRecordIterator : public MallocRecordIterator {
+ public:
+ VMRecordIterator(MemPointerArray* arr) : MallocRecordIterator(arr) {
+ MemPointerRecord* cur = (MemPointerRecord*)_itr.current();
+ MemPointerRecord* next = (MemPointerRecord*)_itr.peek_next();
+ while (next != NULL) {
+ assert(cur != NULL, "Sanity check");
+ assert(((SeqMemPointerRecord*)next)->seq() > ((SeqMemPointerRecord*)cur)->seq(),
+ "pre-sort order");
+
+ if (is_duplicated_record(cur, next)) {
+ _itr.next();
+ next = (MemPointerRecord*)_itr.peek_next();
+ } else {
+ break;
+ }
+ }
+ }
+
+ virtual MemPointer* current() const {
+ return _itr.current();
+ }
+
+ // get next record, but skip the duplicated records
+ virtual MemPointer* next() {
+ MemPointerRecord* cur = (MemPointerRecord*)_itr.next();
+ MemPointerRecord* next = (MemPointerRecord*)_itr.peek_next();
+ while (next != NULL) {
+ assert(cur != NULL, "Sanity check");
+ assert(((SeqMemPointerRecord*)next)->seq() > ((SeqMemPointerRecord*)cur)->seq(),
+ "pre-sort order");
+
+ if (is_duplicated_record(cur, next)) {
+ _itr.next();
+ cur = next;
+ next = (MemPointerRecord*)_itr.peek_next();
+ } else {
+ break;
+ }
+ }
+ return cur;
+ }
+
+ private:
+ bool is_duplicated_record(MemPointerRecord* p1, MemPointerRecord* p2) const {
+ bool ret = (p1->addr() == p2->addr() && p1->size() == p2->size() && p1->flags() == p2->flags());
+ assert(!(ret && FLAGS_TO_MEMORY_TYPE(p1->flags()) == mtThreadStack), "dup on stack record");
+ return ret;
+ }
+};
+
class StagingArea : public _ValueObj {
private:
MemPointerArray* _malloc_data;
@@ -233,7 +283,8 @@
return MallocRecordIterator(malloc_data());
}
- MemPointerArrayIteratorImpl virtual_memory_record_walker();
+ VMRecordIterator virtual_memory_record_walker();
+
bool init();
void clear() {
assert(_malloc_data != NULL && _vm_data != NULL, "Just check");
@@ -293,6 +344,8 @@
NOT_PRODUCT(void check_staging_data();)
NOT_PRODUCT(void check_malloc_pointers();)
NOT_PRODUCT(bool has_allocation_record(address addr);)
+ // dump all virtual memory pointers in snapshot
+ DEBUG_ONLY( void dump_all_vm_pointers();)
private:
// copy pointer data from src to dest
@@ -302,5 +355,4 @@
bool promote_virtual_memory_records(MemPointerArrayIterator* itr);
};
-
#endif // SHARE_VM_SERVICES_MEM_SNAPSHOT_HPP
diff --git a/hotspot/src/share/vm/services/memTracker.cpp b/hotspot/src/share/vm/services/memTracker.cpp
index 2af6e10..3cec678 100644
--- a/hotspot/src/share/vm/services/memTracker.cpp
+++ b/hotspot/src/share/vm/services/memTracker.cpp
@@ -364,7 +364,7 @@
if (thread != NULL) {
if (thread->is_Java_thread() && ((JavaThread*)thread)->is_safepoint_visible()) {
- JavaThread* java_thread = static_cast<JavaThread*>(thread);
+ JavaThread* java_thread = (JavaThread*)thread;
JavaThreadState state = java_thread->thread_state();
if (SafepointSynchronize::safepoint_safe(java_thread, state)) {
// JavaThreads that are safepoint safe, can run through safepoint,
@@ -472,6 +472,8 @@
// it should guarantee that NMT is fully sync-ed.
ThreadCritical tc;
+ SequenceGenerator::reset();
+
// walk all JavaThreads to collect recorders
SyncThreadRecorderClosure stc;
Threads::threads_do(&stc);
@@ -484,11 +486,12 @@
pending_recorders = _global_recorder;
_global_recorder = NULL;
}
- SequenceGenerator::reset();
// check _worker_thread with lock to avoid racing condition
if (_worker_thread != NULL) {
_worker_thread->at_sync_point(pending_recorders);
}
+
+ assert(SequenceGenerator::peek() == 1, "Should not have memory activities during sync-point");
}
}
diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp
index 62637d8..c42f01b 100644
--- a/hotspot/src/share/vm/services/memTracker.hpp
+++ b/hotspot/src/share/vm/services/memTracker.hpp
@@ -113,8 +113,10 @@
#include "thread_solaris.inline.hpp"
#endif
-#ifdef _DEBUG
- #define DEBUG_CALLER_PC os::get_caller_pc(3)
+extern bool NMT_track_callsite;
+
+#ifdef ASSERT
+ #define DEBUG_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
#else
#define DEBUG_CALLER_PC 0
#endif
@@ -261,7 +263,7 @@
// record a 'malloc' call
static inline void record_malloc(address addr, size_t size, MEMFLAGS flags,
address pc = 0, Thread* thread = NULL) {
- if (NMT_CAN_TRACK(flags)) {
+ if (is_on() && NMT_CAN_TRACK(flags)) {
assert(size > 0, "Sanity check");
create_memory_record(addr, (flags|MemPointerRecord::malloc_tag()), size, pc, thread);
}
@@ -275,7 +277,7 @@
// record a 'realloc' call
static inline void record_realloc(address old_addr, address new_addr, size_t size,
MEMFLAGS flags, address pc = 0, Thread* thread = NULL) {
- if (is_on()) {
+ if (is_on() && NMT_CAN_TRACK(flags)) {
assert(size > 0, "Sanity check");
record_free(old_addr, flags, thread);
record_malloc(new_addr, size, flags, pc, thread);
@@ -317,6 +319,7 @@
static inline void release_thread_stack(address addr, size_t size, Thread* thr) {
if (is_on()) {
assert(size > 0 && thr != NULL, "Sanity check");
+ assert(!thr->is_Java_thread(), "too early");
create_memory_record(addr, MemPointerRecord::virtual_memory_uncommit_tag() | mtThreadStack,
size, DEBUG_CALLER_PC, thr);
create_memory_record(addr, MemPointerRecord::virtual_memory_release_tag() | mtThreadStack,
@@ -326,11 +329,11 @@
// record a virtual memory 'commit' call
static inline void record_virtual_memory_commit(address addr, size_t size,
- address pc = 0, Thread* thread = NULL) {
+ address pc, Thread* thread = NULL) {
if (is_on()) {
assert(size > 0, "Sanity check");
create_memory_record(addr, MemPointerRecord::virtual_memory_commit_tag(),
- size, DEBUG_CALLER_PC, thread);
+ size, pc, thread);
}
}
diff --git a/hotspot/test/compiler/6340864/TestByteVect.java b/hotspot/test/compiler/6340864/TestByteVect.java
index ec4ba9f..5db3687 100644
--- a/hotspot/test/compiler/6340864/TestByteVect.java
+++ b/hotspot/test/compiler/6340864/TestByteVect.java
@@ -33,7 +33,7 @@
public class TestByteVect {
private static final int ARRLEN = 997;
private static final int ITERS = 11000;
- private static final int ADD_INIT = 0;
+ private static final int ADD_INIT = 63;
private static final int BIT_MASK = 0xB7;
private static final int VALUE = 3;
private static final int SHIFT = 8;
@@ -76,6 +76,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (byte)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (byte)VALUE);
test_mula(a0, a1, a2);
@@ -88,6 +89,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (byte)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (byte)BIT_MASK);
test_anda(a0, a1, a4);
@@ -97,30 +99,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (byte)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -369,6 +390,60 @@
errn += verify("test_srav_on: ", i, a0[i], (byte)((byte)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], (short)(((short)(ADD_INIT+2*i) & 0xFF) | ((short)(ADD_INIT+2*i+1) << 8)));
@@ -805,6 +880,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -1036,6 +1189,26 @@
a0[i] = (byte)(a1[i]<<b);
}
}
+ static void test_sllc_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(byte[] a0, byte[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1062,6 +1235,26 @@
a0[i] = (byte)(a1[i]>>>b);
}
}
+ static void test_srlc_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(byte[] a0, byte[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1088,6 +1281,26 @@
a0[i] = (byte)(a1[i]>>b);
}
}
+ static void test_srac_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(short[] p2, byte[] a1) {
if (p2.length*2 > a1.length) return;
diff --git a/hotspot/test/compiler/6340864/TestIntVect.java b/hotspot/test/compiler/6340864/TestIntVect.java
index 36e277f..5866b34 100644
--- a/hotspot/test/compiler/6340864/TestIntVect.java
+++ b/hotspot/test/compiler/6340864/TestIntVect.java
@@ -74,6 +74,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (int)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (int)VALUE);
test_mula(a0, a1, a2);
@@ -86,6 +87,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (int)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (int)BIT_MASK);
test_anda(a0, a1, a4);
@@ -95,30 +97,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (int)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -359,6 +380,60 @@
errn += verify("test_srav_on: ", i, a0[i], (int)((int)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], ((long)(ADD_INIT+2*i) & 0xFFFFFFFFl) | ((long)(ADD_INIT+2*i+1) << 32));
@@ -727,6 +802,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -908,6 +1061,26 @@
a0[i] = (int)(a1[i]<<b);
}
}
+ static void test_sllc_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(int[] a0, int[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -934,6 +1107,26 @@
a0[i] = (int)(a1[i]>>>b);
}
}
+ static void test_srlc_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(int[] a0, int[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -960,6 +1153,26 @@
a0[i] = (int)(a1[i]>>b);
}
}
+ static void test_srac_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(long[] p2, int[] a1) {
if (p2.length*2 > a1.length) return;
diff --git a/hotspot/test/compiler/6340864/TestLongVect.java b/hotspot/test/compiler/6340864/TestLongVect.java
index 70b41f4..436a847 100644
--- a/hotspot/test/compiler/6340864/TestLongVect.java
+++ b/hotspot/test/compiler/6340864/TestLongVect.java
@@ -73,6 +73,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (long)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (long)VALUE);
test_mula(a0, a1, a2);
@@ -85,6 +86,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (long)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (long)BIT_MASK);
test_anda(a0, a1, a4);
@@ -94,30 +96,48 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (long)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
}
// Test and verify results
System.out.println("Verification");
@@ -354,6 +374,60 @@
errn += verify("test_srav_on: ", i, a0[i], (long)((long)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
}
if (errn > 0)
@@ -696,6 +770,84 @@
end = System.currentTimeMillis();
System.out.println("test_srav_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
return errn;
}
@@ -854,6 +1006,26 @@
a0[i] = (long)(a1[i]<<b);
}
}
+ static void test_sllc_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(long[] a0, long[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -880,6 +1052,26 @@
a0[i] = (long)(a1[i]>>>b);
}
}
+ static void test_srlc_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(long[] a0, long[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -906,6 +1098,26 @@
a0[i] = (long)(a1[i]>>b);
}
}
+ static void test_srac_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)>>VALUE);
+ }
+ }
static int verify(String text, int i, long elem, long val) {
if (elem != val) {
diff --git a/hotspot/test/compiler/6340864/TestShortVect.java b/hotspot/test/compiler/6340864/TestShortVect.java
index a688e0d..9f59c8f 100644
--- a/hotspot/test/compiler/6340864/TestShortVect.java
+++ b/hotspot/test/compiler/6340864/TestShortVect.java
@@ -75,6 +75,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (short)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (short)VALUE);
test_mula(a0, a1, a2);
@@ -87,6 +88,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (short)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (short)BIT_MASK);
test_anda(a0, a1, a4);
@@ -96,30 +98,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (short)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -364,6 +385,60 @@
errn += verify("test_srav_on: ", i, a0[i], (short)((short)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], ((int)(ADD_INIT+2*i) & 0xFFFF) | ((int)(ADD_INIT+2*i+1) << 16));
@@ -762,6 +837,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -968,6 +1121,26 @@
a0[i] = (short)(a1[i]<<b);
}
}
+ static void test_sllc_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(short[] a0, short[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -994,6 +1167,26 @@
a0[i] = (short)(a1[i]>>>b);
}
}
+ static void test_srlc_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(short[] a0, short[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1020,6 +1213,26 @@
a0[i] = (short)(a1[i]>>b);
}
}
+ static void test_srac_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(int[] p2, short[] a1) {
if (p2.length*2 > a1.length) return;
diff --git a/hotspot/test/compiler/7184394/TestAESBase.java b/hotspot/test/compiler/7184394/TestAESBase.java
new file mode 100644
index 0000000..ad6c835
--- /dev/null
+++ b/hotspot/test/compiler/7184394/TestAESBase.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ *
+ */
+
+/**
+ * @author Tom Deneau
+ */
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.AlgorithmParameters;
+
+import java.util.Random;
+import java.util.Arrays;
+
+abstract public class TestAESBase {
+ int msgSize = Integer.getInteger("msgSize", 646);
+ boolean checkOutput = Boolean.getBoolean("checkOutput");
+ boolean noReinit = Boolean.getBoolean("noReinit");
+ int keySize = Integer.getInteger("keySize", 128);
+ String algorithm = System.getProperty("algorithm", "AES");
+ String mode = System.getProperty("mode", "CBC");
+ byte[] input;
+ byte[] encode;
+ byte[] expectedEncode;
+ byte[] decode;
+ byte[] expectedDecode;
+ Random random = new Random(0);
+ Cipher cipher;
+ Cipher dCipher;
+ String paddingStr = "PKCS5Padding";
+ AlgorithmParameters algParams;
+ SecretKey key;
+ int ivLen;
+
+ static int numThreads = 0;
+ int threadId;
+ static synchronized int getThreadId() {
+ int id = numThreads;
+ numThreads++;
+ return id;
+ }
+
+ abstract public void run();
+
+ public void prepare() {
+ try {
+ System.out.println("\nmsgSize=" + msgSize + ", key size=" + keySize + ", reInit=" + !noReinit + ", checkOutput=" + checkOutput);
+
+ int keyLenBytes = (keySize == 0 ? 16 : keySize/8);
+ byte keyBytes[] = new byte[keyLenBytes];
+ if (keySize == 128)
+ keyBytes = new byte[] {-8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7};
+ else
+ random.nextBytes(keyBytes);
+
+ key = new SecretKeySpec(keyBytes, algorithm);
+ if (threadId == 0) {
+ System.out.println("Algorithm: " + key.getAlgorithm() + "("
+ + key.getEncoded().length * 8 + "bit)");
+ }
+ input = new byte[msgSize];
+ for (int i=0; i<input.length; i++) {
+ input[i] = (byte) (i & 0xff);
+ }
+
+ cipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE");
+ dCipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE");
+
+ ivLen = (algorithm.equals("AES") ? 16 : algorithm.equals("DES") ? 8 : 0);
+ IvParameterSpec initVector = new IvParameterSpec(new byte[ivLen]);
+
+ cipher.init(Cipher.ENCRYPT_MODE, key, initVector);
+ algParams = cipher.getParameters();
+ dCipher.init(Cipher.DECRYPT_MODE, key, algParams);
+ if (threadId == 0) {
+ childShowCipher();
+ }
+
+ // do one encode and decode in preparation
+ // this will also create the encode buffer and decode buffer
+ encode = cipher.doFinal(input);
+ decode = dCipher.doFinal(encode);
+ if (checkOutput) {
+ expectedEncode = (byte[]) encode.clone();
+ expectedDecode = (byte[]) decode.clone();
+ showArray(key.getEncoded() , "key: ");
+ showArray(input, "input: ");
+ showArray(encode, "encode: ");
+ showArray(decode, "decode: ");
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ void showArray(byte b[], String name) {
+ System.out.format("%s [%d]: ", name, b.length);
+ for (int i=0; i<Math.min(b.length, 32); i++) {
+ System.out.format("%02x ", b[i] & 0xff);
+ }
+ System.out.println();
+ }
+
+ void compareArrays(byte b[], byte exp[]) {
+ if (b.length != exp.length) {
+ System.out.format("different lengths for actual and expected output arrays\n");
+ showArray(b, "test: ");
+ showArray(exp, "exp : ");
+ System.exit(1);
+ }
+ for (int i=0; i< exp.length; i++) {
+ if (b[i] != exp[i]) {
+ System.out.format("output error at index %d: got %02x, expected %02x\n", i, b[i] & 0xff, exp[i] & 0xff);
+ showArray(b, "test: ");
+ showArray(exp, "exp : ");
+ System.exit(1);
+ }
+ }
+ }
+
+
+ void showCipher(Cipher c, String kind) {
+ System.out.println(kind + " cipher provider: " + cipher.getProvider());
+ System.out.println(kind + " cipher algorithm: " + cipher.getAlgorithm());
+ }
+
+ abstract void childShowCipher();
+}
diff --git a/hotspot/test/compiler/7184394/TestAESDecode.java b/hotspot/test/compiler/7184394/TestAESDecode.java
new file mode 100644
index 0000000..f9ec02d
--- /dev/null
+++ b/hotspot/test/compiler/7184394/TestAESDecode.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ *
+ */
+
+/**
+ * @author Tom Deneau
+ */
+
+import javax.crypto.Cipher;
+
+public class TestAESDecode extends TestAESBase {
+ @Override
+ public void run() {
+ try {
+ if (!noReinit) dCipher.init(Cipher.DECRYPT_MODE, key, algParams);
+ if (checkOutput) {
+ // checked version creates new output buffer each time
+ decode = dCipher.doFinal(encode, 0, encode.length);
+ compareArrays(decode, expectedDecode);
+ } else {
+ // non-checked version outputs to existing encode buffer for maximum speed
+ decode = new byte[dCipher.getOutputSize(encode.length)];
+ dCipher.doFinal(encode, 0, encode.length, decode);
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ @Override
+ void childShowCipher() {
+ showCipher(dCipher, "Decryption");
+ }
+
+}
diff --git a/hotspot/test/compiler/7184394/TestAESEncode.java b/hotspot/test/compiler/7184394/TestAESEncode.java
new file mode 100644
index 0000000..1d6bf7f
--- /dev/null
+++ b/hotspot/test/compiler/7184394/TestAESEncode.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ *
+ */
+
+/**
+ * @author Tom Deneau
+ */
+
+import javax.crypto.Cipher;
+
+public class TestAESEncode extends TestAESBase {
+ @Override
+ public void run() {
+ try {
+ if (!noReinit) cipher.init(Cipher.ENCRYPT_MODE, key, algParams);
+ if (checkOutput) {
+ // checked version creates new output buffer each time
+ encode = cipher.doFinal(input, 0, msgSize);
+ compareArrays(encode, expectedEncode);
+ } else {
+ // non-checked version outputs to existing encode buffer for maximum speed
+ encode = new byte[cipher.getOutputSize(msgSize)];
+ cipher.doFinal(input, 0, msgSize, encode);
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ @Override
+ void childShowCipher() {
+ showCipher(cipher, "Encryption");
+ }
+
+}
diff --git a/hotspot/test/compiler/7184394/TestAESMain.java b/hotspot/test/compiler/7184394/TestAESMain.java
new file mode 100644
index 0000000..ca2cb43
--- /dev/null
+++ b/hotspot/test/compiler/7184394/TestAESMain.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7184394
+ * @summary add intrinsics to use AES instructions
+ *
+ * @run main/othervm/timeout=600 -Xbatch -DcheckOutput=true TestAESMain
+ *
+ * @author Tom Deneau
+ */
+
+public class TestAESMain {
+ public static void main(String[] args) {
+ int iters = (args.length > 0 ? Integer.valueOf(args[0]) : 1000000);
+ System.out.println(iters + " iterations");
+ TestAESEncode etest = new TestAESEncode();
+ etest.prepare();
+ long start = System.nanoTime();
+ for (int i=0; i<iters; i++) {
+ etest.run();
+ }
+ long end = System.nanoTime();
+ System.out.println("TestAESEncode runtime was " + (double)((end - start)/1000000000.0) + " ms");
+
+ TestAESDecode dtest = new TestAESDecode();
+ dtest.prepare();
+ start = System.nanoTime();
+ for (int i=0; i<iters; i++) {
+ dtest.run();
+ }
+ end = System.nanoTime();
+ System.out.println("TestAESDecode runtime was " + (double)((end - start)/1000000000.0) + " ms");
+ }
+}
diff --git a/hotspot/test/compiler/8000805/Test8000805.java b/hotspot/test/compiler/8000805/Test8000805.java
new file mode 100644
index 0000000..bd0b7b4
--- /dev/null
+++ b/hotspot/test/compiler/8000805/Test8000805.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 8000805
+ * @summary JMM issue: short loads are non-atomic
+ *
+ * @run main/othervm -server -XX:-TieredCompilation -Xcomp -XX:+PrintCompilation -XX:CompileOnly=Test8000805.loadS2LmaskFF,Test8000805.loadS2Lmask16,Test8000805.loadS2Lmask13,Test8000805.loadUS_signExt,Test8000805.loadB2L_mask8 Test8000805
+ */
+
+public class Test8000805 {
+ static long loadS2LmaskFF (short[] sa) { return sa[0] & 0xFF; }
+ static long loadS2LmaskFF_1 (short[] sa) { return sa[0] & 0xFF; }
+
+ static long loadS2Lmask16 (short[] sa) { return sa[0] & 0xFFFE; }
+ static long loadS2Lmask16_1 (short[] sa) { return sa[0] & 0xFFFE; }
+
+ static long loadS2Lmask13 (short[] sa) { return sa[0] & 0x0FFF; }
+ static long loadS2Lmask13_1 (short[] sa) { return sa[0] & 0x0FFF; }
+
+ static int loadUS_signExt (char[] ca) { return (ca[0] << 16) >> 16; }
+ static int loadUS_signExt_1 (char[] ca) { return (ca[0] << 16) >> 16; }
+
+ static long loadB2L_mask8 (byte[] ba) { return ba[0] & 0x55; }
+ static long loadB2L_mask8_1 (byte[] ba) { return ba[0] & 0x55; }
+
+ public static void main(String[] args) {
+ for (int i = Byte.MIN_VALUE; i < Byte.MAX_VALUE; i++) {
+ byte[] ba = new byte[] { (byte) i};
+
+ { long v1 = loadB2L_mask8(ba);
+ long v2 = loadB2L_mask8_1(ba);
+ if (v1 != v2)
+ throw new InternalError(String.format("loadB2L_mask8 failed: %x != %x", v1, v2)); }
+ }
+
+ for (int i = Short.MIN_VALUE; i < Short.MAX_VALUE; i++) {
+ short[] sa = new short[] { (short)i };
+ char[] ca = new char[] { (char)i };
+
+ { long v1 = loadS2LmaskFF(sa);
+ long v2 = loadS2LmaskFF_1(sa);
+ if (v1 != v2)
+ throw new InternalError(String.format("loadS2LmaskFF failed: %x != %x", v1, v2)); }
+
+ { long v1 = loadS2Lmask16(sa);
+ long v2 = loadS2Lmask16_1(sa);
+ if (v1 != v2)
+ throw new InternalError(String.format("loadS2Lmask16 failed: %x != %x", v1, v2)); }
+
+ { long v1 = loadS2Lmask13(sa);
+ long v2 = loadS2Lmask13_1(sa);
+ if (v1 != v2)
+ throw new InternalError(String.format("loadS2Lmask13 failed: %x != %x", v1, v2)); }
+
+ { int v1 = loadUS_signExt(ca);
+ int v2 = loadUS_signExt_1(ca);
+ if (v1 != v2)
+ throw new InternalError(String.format("loadUS_signExt failed: %x != %x", v1, v2)); }
+ }
+
+ System.out.println("TEST PASSED.");
+ }
+}
diff --git a/hotspot/test/compiler/8001183/TestCharVect.java b/hotspot/test/compiler/8001183/TestCharVect.java
new file mode 100644
index 0000000..a6ff1e2
--- /dev/null
+++ b/hotspot/test/compiler/8001183/TestCharVect.java
@@ -0,0 +1,1332 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 8001183
+ * @summary incorrect results of char vectors right shift operaiton
+ *
+ * @run main/othervm/timeout=400 -Xbatch -Xmx64m TestCharVect
+ */
+
+public class TestCharVect {
+ private static final int ARRLEN = 997;
+ private static final int ITERS = 11000;
+ private static final int ADD_INIT = Character.MAX_VALUE-500;
+ private static final int BIT_MASK = 0xB731;
+ private static final int VALUE = 7;
+ private static final int SHIFT = 16;
+
+ public static void main(String args[]) {
+ System.out.println("Testing Char vectors");
+ int errn = test();
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test() {
+ char[] a0 = new char[ARRLEN];
+ char[] a1 = new char[ARRLEN];
+ short[] a2 = new short[ARRLEN];
+ short[] a3 = new short[ARRLEN];
+ short[] a4 = new short[ARRLEN];
+ int[] p2 = new int[ARRLEN/2];
+ long[] p4 = new long[ARRLEN/4];
+ // Initialize
+ int gold_sum = 0;
+ for (int i=0; i<ARRLEN; i++) {
+ char val = (char)(ADD_INIT+i);
+ gold_sum += val;
+ a1[i] = val;
+ a2[i] = VALUE;
+ a3[i] = -VALUE;
+ a4[i] = (short)BIT_MASK;
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_sum(a1);
+ test_addc(a0, a1);
+ test_addv(a0, a1, (char)VALUE);
+ test_adda(a0, a1, a2);
+ test_subc(a0, a1);
+ test_subv(a0, a1, (char)VALUE);
+ test_suba(a0, a1, a2);
+
+ test_mulc(a0, a1);
+ test_mulv(a0, a1, (char)VALUE);
+ test_mula(a0, a1, a2);
+ test_divc(a0, a1);
+ test_divv(a0, a1, VALUE);
+ test_diva(a0, a1, a2);
+ test_mulc_n(a0, a1);
+ test_mulv(a0, a1, (char)-VALUE);
+ test_mula(a0, a1, a3);
+ test_divc_n(a0, a1);
+ test_divv(a0, a1, -VALUE);
+ test_diva(a0, a1, a3);
+
+ test_andc(a0, a1);
+ test_andv(a0, a1, (short)BIT_MASK);
+ test_anda(a0, a1, a4);
+ test_orc(a0, a1);
+ test_orv(a0, a1, (short)BIT_MASK);
+ test_ora(a0, a1, a4);
+ test_xorc(a0, a1);
+ test_xorv(a0, a1, (short)BIT_MASK);
+ test_xora(a0, a1, a4);
+
+ test_sllc(a0, a1);
+ test_sllv(a0, a1, VALUE);
+ test_srlc(a0, a1);
+ test_srlv(a0, a1, VALUE);
+ test_srac(a0, a1);
+ test_srav(a0, a1, VALUE);
+
+ test_sllc_n(a0, a1);
+ test_sllv(a0, a1, -VALUE);
+ test_srlc_n(a0, a1);
+ test_srlv(a0, a1, -VALUE);
+ test_srac_n(a0, a1);
+ test_srav(a0, a1, -VALUE);
+
+ test_sllc_o(a0, a1);
+ test_sllv(a0, a1, SHIFT);
+ test_srlc_o(a0, a1);
+ test_srlv(a0, a1, SHIFT);
+ test_srac_o(a0, a1);
+ test_srav(a0, a1, SHIFT);
+
+ test_sllc_on(a0, a1);
+ test_sllv(a0, a1, -SHIFT);
+ test_srlc_on(a0, a1);
+ test_srlv(a0, a1, -SHIFT);
+ test_srac_on(a0, a1);
+ test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
+ test_pack2(p2, a1);
+ test_unpack2(a0, p2);
+ test_pack2_swap(p2, a1);
+ test_unpack2_swap(a0, p2);
+ test_pack4(p4, a1);
+ test_unpack4(a0, p4);
+ test_pack4_swap(p4, a1);
+ test_unpack4_swap(a0, p4);
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ int sum = test_sum(a1);
+ if (sum != gold_sum) {
+ System.err.println("test_sum: " + sum + " != " + gold_sum);
+ errn++;
+ }
+
+ test_addc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_addc: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+ test_addv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_addv: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+ test_adda(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_adda: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+
+ test_subc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_subc: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+ test_subv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_subv: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+ test_suba(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_suba: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+
+ test_mulc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulc: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+ test_mulv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulv: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+ test_mula(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mula: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+
+ test_divc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divc: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+ test_divv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divv: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+ test_diva(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_diva: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+
+ test_mulc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+ test_mulv(a0, a1, (char)-VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+ test_mula(a0, a1, a3);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mula_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+
+ test_divc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+ test_divv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+ test_diva(a0, a1, a3);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_diva_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+
+ test_andc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_andc: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+ test_andv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_andv: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+ test_anda(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_anda: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+
+ test_orc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_orc: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+ test_orv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_orv: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+ test_ora(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ora: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+
+ test_xorc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xorc: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+ test_xorv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xorv: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+ test_xora(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xora: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+
+ test_sllc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc: ", i, a0[i], (char)((char)(ADD_INIT+i)<<VALUE));
+ }
+ test_sllv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv: ", i, a0[i], (char)((char)(ADD_INIT+i)<<VALUE));
+ }
+
+ test_srlc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>VALUE));
+ }
+ test_srlv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>VALUE));
+ }
+
+ test_srac(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac: ", i, a0[i], (char)((char)(ADD_INIT+i)>>VALUE));
+ }
+ test_srav(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav: ", i, a0[i], (char)((char)(ADD_INIT+i)>>VALUE));
+ }
+
+ test_sllc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-VALUE)));
+ }
+ test_sllv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-VALUE)));
+ }
+
+ test_srlc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-VALUE)));
+ }
+ test_srlv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-VALUE)));
+ }
+
+ test_srac_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-VALUE)));
+ }
+ test_srav(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-VALUE)));
+ }
+
+ test_sllc_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_o: ", i, a0[i], (char)((char)(ADD_INIT+i)<<SHIFT));
+ }
+ test_sllv(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_o: ", i, a0[i], (char)((char)(ADD_INIT+i)<<SHIFT));
+ }
+
+ test_srlc_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>SHIFT));
+ }
+ test_srlv(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>SHIFT));
+ }
+
+ test_srac_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>SHIFT));
+ }
+ test_srav(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>SHIFT));
+ }
+
+ test_sllc_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_on: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-SHIFT)));
+ }
+ test_sllv(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_on: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-SHIFT)));
+ }
+
+ test_srlc_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-SHIFT)));
+ }
+ test_srlv(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-SHIFT)));
+ }
+
+ test_srac_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-SHIFT)));
+ }
+ test_srav(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-SHIFT)));
+ }
+
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
+ test_pack2(p2, a1);
+ for (int i=0; i<ARRLEN/2; i++) {
+ errn += verify("test_pack2: ", i, p2[i], ((int)(ADD_INIT+2*i) & 0xFFFF) | ((int)(ADD_INIT+2*i+1) << 16));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack2(a0, p2);
+ for (int i=0; i<(ARRLEN&(-2)); i++) {
+ errn += verify("test_unpack2: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack2_swap(p2, a1);
+ for (int i=0; i<ARRLEN/2; i++) {
+ errn += verify("test_pack2_swap: ", i, p2[i], ((int)(ADD_INIT+2*i+1) & 0xFFFF) | ((int)(ADD_INIT+2*i) << 16));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack2_swap(a0, p2);
+ for (int i=0; i<(ARRLEN&(-2)); i++) {
+ errn += verify("test_unpack2_swap: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack4(p4, a1);
+ for (int i=0; i<ARRLEN/4; i++) {
+ errn += verify("test_pack4: ", i, p4[i], ((long)(ADD_INIT+4*i+0) & 0xFFFFl) |
+ (((long)(ADD_INIT+4*i+1) & 0xFFFFl) << 16) |
+ (((long)(ADD_INIT+4*i+2) & 0xFFFFl) << 32) |
+ (((long)(ADD_INIT+4*i+3) & 0xFFFFl) << 48));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack4(a0, p4);
+ for (int i=0; i<(ARRLEN&(-4)); i++) {
+ errn += verify("test_unpack4: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack4_swap(p4, a1);
+ for (int i=0; i<ARRLEN/4; i++) {
+ errn += verify("test_pack4_swap: ", i, p4[i], ((long)(ADD_INIT+4*i+3) & 0xFFFFl) |
+ (((long)(ADD_INIT+4*i+2) & 0xFFFFl) << 16) |
+ (((long)(ADD_INIT+4*i+1) & 0xFFFFl) << 32) |
+ (((long)(ADD_INIT+4*i+0) & 0xFFFFl) << 48));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack4_swap(a0, p4);
+ for (int i=0; i<(ARRLEN&(-4)); i++) {
+ errn += verify("test_unpack4_swap: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ }
+
+ if (errn > 0)
+ return errn;
+
+ System.out.println("Time");
+ long start, end;
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sum(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sum: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_addc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_addc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_addv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_addv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_adda(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_adda: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_subc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_subc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_subv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_subv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_suba(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_suba: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mula(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mula: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_diva(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_diva: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulv(a0, a1, (char)-VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulv_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mula(a0, a1, a3);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mula_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divv_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_diva(a0, a1, a3);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_diva_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_andc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_andc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_andv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_andv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_anda(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_anda: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_orc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_orc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_orv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_orv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ora(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ora: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xorc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xorc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xorv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xorv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xora(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xora: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack2(p2, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack2: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack2(a0, p2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack2: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack2_swap(p2, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack2_swap: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack2_swap(a0, p2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack2_swap: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack4(p4, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack4: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack4(a0, p4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack4: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack4_swap(p4, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack4_swap: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack4_swap(a0, p4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack4_swap: " + (end - start));
+
+ return errn;
+ }
+
+ static int test_sum(char[] a1) {
+ int sum = 0;
+ for (int i = 0; i < a1.length; i+=1) {
+ sum += a1[i];
+ }
+ return sum;
+ }
+
+ static void test_addc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+VALUE);
+ }
+ }
+ static void test_addv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+b);
+ }
+ }
+ static void test_adda(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+a2[i]);
+ }
+ }
+
+ static void test_subc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-VALUE);
+ }
+ }
+ static void test_subv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-b);
+ }
+ }
+ static void test_suba(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-a2[i]);
+ }
+ }
+
+ static void test_mulc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*VALUE);
+ }
+ }
+ static void test_mulc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*(-VALUE));
+ }
+ }
+ static void test_mulv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*b);
+ }
+ }
+ static void test_mula(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*a2[i]);
+ }
+ }
+
+ static void test_divc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/VALUE);
+ }
+ }
+ static void test_divc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/(-VALUE));
+ }
+ }
+ static void test_divv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/b);
+ }
+ }
+ static void test_diva(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/a2[i]);
+ }
+ }
+
+ static void test_andc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&BIT_MASK);
+ }
+ }
+ static void test_andv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&b);
+ }
+ }
+ static void test_anda(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&a2[i]);
+ }
+ }
+
+ static void test_orc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|BIT_MASK);
+ }
+ }
+ static void test_orv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|b);
+ }
+ }
+ static void test_ora(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|a2[i]);
+ }
+ }
+
+ static void test_xorc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^BIT_MASK);
+ }
+ }
+ static void test_xorv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^b);
+ }
+ }
+ static void test_xora(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^a2[i]);
+ }
+ }
+
+ static void test_sllc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<VALUE);
+ }
+ }
+ static void test_sllc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<(-VALUE));
+ }
+ }
+ static void test_sllc_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<SHIFT);
+ }
+ }
+ static void test_sllc_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<(-SHIFT));
+ }
+ }
+ static void test_sllv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<b);
+ }
+ }
+ static void test_sllc_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)<<VALUE);
+ }
+ }
+
+ static void test_srlc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>VALUE);
+ }
+ }
+ static void test_srlc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>(-VALUE));
+ }
+ }
+ static void test_srlc_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>SHIFT);
+ }
+ }
+ static void test_srlc_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>(-SHIFT));
+ }
+ }
+ static void test_srlv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>b);
+ }
+ }
+ static void test_srlc_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)>>>VALUE);
+ }
+ }
+
+ static void test_srac(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>VALUE);
+ }
+ }
+ static void test_srac_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>(-VALUE));
+ }
+ }
+ static void test_srac_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>SHIFT);
+ }
+ }
+ static void test_srac_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>(-SHIFT));
+ }
+ }
+ static void test_srav(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>b);
+ }
+ }
+ static void test_srac_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)>>VALUE);
+ }
+ }
+
+ static void test_pack2(int[] p2, char[] a1) {
+ if (p2.length*2 > a1.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l0 = (int)a1[i*2+0];
+ int l1 = (int)a1[i*2+1];
+ p2[i] = (l1 << 16) | (l0 & 0xFFFF);
+ }
+ }
+ static void test_unpack2(char[] a0, int[] p2) {
+ if (p2.length*2 > a0.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l = p2[i];
+ a0[i*2+0] = (char)(l & 0xFFFF);
+ a0[i*2+1] = (char)(l >> 16);
+ }
+ }
+ static void test_pack2_swap(int[] p2, char[] a1) {
+ if (p2.length*2 > a1.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l0 = (int)a1[i*2+0];
+ int l1 = (int)a1[i*2+1];
+ p2[i] = (l0 << 16) | (l1 & 0xFFFF);
+ }
+ }
+ static void test_unpack2_swap(char[] a0, int[] p2) {
+ if (p2.length*2 > a0.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l = p2[i];
+ a0[i*2+0] = (char)(l >> 16);
+ a0[i*2+1] = (char)(l & 0xFFFF);
+ }
+ }
+
+ static void test_pack4(long[] p4, char[] a1) {
+ if (p4.length*4 > a1.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l0 = (long)a1[i*4+0];
+ long l1 = (long)a1[i*4+1];
+ long l2 = (long)a1[i*4+2];
+ long l3 = (long)a1[i*4+3];
+ p4[i] = (l0 & 0xFFFFl) |
+ ((l1 & 0xFFFFl) << 16) |
+ ((l2 & 0xFFFFl) << 32) |
+ ((l3 & 0xFFFFl) << 48);
+ }
+ }
+ static void test_unpack4(char[] a0, long[] p4) {
+ if (p4.length*4 > a0.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l = p4[i];
+ a0[i*4+0] = (char)(l & 0xFFFFl);
+ a0[i*4+1] = (char)(l >> 16);
+ a0[i*4+2] = (char)(l >> 32);
+ a0[i*4+3] = (char)(l >> 48);
+ }
+ }
+ static void test_pack4_swap(long[] p4, char[] a1) {
+ if (p4.length*4 > a1.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l0 = (long)a1[i*4+0];
+ long l1 = (long)a1[i*4+1];
+ long l2 = (long)a1[i*4+2];
+ long l3 = (long)a1[i*4+3];
+ p4[i] = (l3 & 0xFFFFl) |
+ ((l2 & 0xFFFFl) << 16) |
+ ((l1 & 0xFFFFl) << 32) |
+ ((l0 & 0xFFFFl) << 48);
+ }
+ }
+ static void test_unpack4_swap(char[] a0, long[] p4) {
+ if (p4.length*4 > a0.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l = p4[i];
+ a0[i*4+0] = (char)(l >> 48);
+ a0[i*4+1] = (char)(l >> 32);
+ a0[i*4+2] = (char)(l >> 16);
+ a0[i*4+3] = (char)(l & 0xFFFFl);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+
+ static int verify(String text, int i, long elem, long val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + Long.toHexString(elem) + " != " + Long.toHexString(val));
+ return 1;
+ }
+ return 0;
+ }
+}
diff --git a/hotspot/test/runtime/7158800/BadUtf8.java b/hotspot/test/runtime/7158800/BadUtf8.java
deleted file mode 100644
index 8b79762..0000000
--- a/hotspot/test/runtime/7158800/BadUtf8.java
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
- * Copyright (c) 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.
- *
- * 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 7158800
- * @summary Test that 1200 symbols that hash to the same value triggers
- * the symbol table alternate hashing mechanism. There isn't actually a
- * way to verify this.
- */
-//
-// Generate large number of strings that hash to the same value
-// to slow down symbol table lookup.
-
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-
-public class BadUtf8 {
-static String[] strings = {
- "EOcLKvbddZyPxYpb",
- "DncLKvbdPxmAGrqj",
- "DoCjjvbdpxoIHQdY",
- "EPCkKvbdqYoHfqEY",
- "DnbkKvbdezvYdiUX",
- "DnbjjvbdeEoRbXCj",
- "EObkKvbdbsCkUEKB",
- "EOcLKvbdnUtyjiqf",
- "DncLKvbdRWnDcMHc",
- "DoCkKvbdrSUkOLAm",
- "DncLKvbdfNFwGmJk",
- "EPDLKvbdvAdYroFI",
- "DoDLKvbdiGibyViu",
- "DncLKvbdYqNEhmFR",
- "DoCkKvbdEARhlzXX",
- "DncLKvbdSZjHsCvA",
- "DncKjvbdqTsgRqkU",
- "DnbjjvbdqAiFAXHd",
- "EPDKjvbdGcjvJaij",
- "DnbkKvbdwtldpxkn",
- "DoDKjvbdYkrETnMN",
- "EPCjjvbdbBWEfQQX",
- "EPCjjvbduMXwAtBX",
- "DncLKvbdbsCkTcia",
- "DoCjjvbdczYpYZRC",
- "EOcKjvbdFeiqmhsq",
- "DoCkKvbdKCicQibx",
- "EOcKjvbdZLrEUOLm",
- "DoCjjvbdaNKbStmH",
- "DoDKjvbdJbjDQjDY",
- "EPCkKvbdemFwGmKL",
- "EPDKjvbdZQleImEq",
- "DncKjvbdZjShPfbG",
- "DnbjjvbdqYnhHREY",
- "DoCkKvbdaRfDIUGL",
- "DoDKjvbdLrWlyuQz",
- "DnbjjvbdZisHofaf",
- "EObjjvbdhtydvrUb",
- "DnbjjvbdRotHKGEX",
- "EObjjvbdNeEThhkE",
- "EPCjjvbdZtJJZESn",
- "DoDKjvbdnPyxvLYb",
- "EPDKjvbdeEoRbWbj",
- "EOcLKvbdFxttaEXb",
- "EObjjvbddwystRez",
- "EPCjjvbdJpzEnenF",
- "DnbkKvbdTppntuIN",
- "EPCkKvbdTukpKUBR",
- "DnbkKvbdhlFEOUcZ",
- "EObkKvbdlhdUQuRa",
- "DnbjjvbdkClKqHUg",
- "EOcKjvbdqTtGqqkU",
- "DncKjvbdtkwvaUBX",
- "DoDKjvbdsQWOjCuf",
- "DncLKvbdEKIJuwjA",
- "DncKjvbdGLErcIMu",
- "EOcLKvbdNPwpumfs",
- "EObkKvbdnVUzLJrG",
- "DoCkKvbdcTDKsdKB",
- "DncKjvbdKRZdoFme",
- "EOcLKvbdemFvgNKL",
- "EPCkKvbdznopdblY",
- "EPDLKvbdOYPVzdOU",
- "DnbjjvbdsZlPsAhO",
- "DoDLKvbdKCjDRKDY",
- "DoCkKvbdhuZeXSVC",
- "EPDKjvbdOStVgEtp",
- "DncLKvbdvwMAvBWV",
- "EPDKjvbdBcoaWJlf",
- "EOcKjvbdZxdKODMS",
- "DoCjjvbdbsCkTcjB",
- "EOcLKvbdwWlAuaWV",
- "DnbjjvbdFejRnJUR",
- "DnbjjvbdmIdTqVSB",
- "DnbkKvbdqBIeAWhE",
- "DncKjvbdrMzJyMIJ",
- "DoCkKvbdZGvdAOsJ",
- "DncLKvbdjggLfFnL",
- "DoCjjvbdYqNFJMdq",
- "DoCkKvbdqZPHfqDx",
- "DncLKvbdOEdThiLE",
- "DoCkKvbdZirgpGaf",
- "EPDLKvbdziuQPdSt",
- "EObkKvbdKQyeOenF",
- "DoDLKvbduaDySndh",
- "DoCjjvbdVUNUGLvK",
- "DncKjvbdAMhYrvzY",
- "DnbkKvbdnQZxvKxb",
- "EPCjjvbdBhjakJFj",
- "DncLKvbdmfeYNNfy",
- "DoDLKvbdjlbLydfo",
- "DoDLKvbdpyPIGpcx",
- "EOcLKvbdnVUzLJqf",
- "DoCjjvbdmJETqVSB",
- "DoDLKvbdJTZAsMxM",
- "DoCkKvbdnQZxvLZC",
- "DoDKjvbdACqwizJQ",
- "DncKjvbdvBEZSoFI",
- "DncKjvbdGckVjCJj",
- "DncLKvbdiMFENtcZ",
- "Dnbjjvbdjuvmcaww",
- "DnbkKvbdZyEKNblS",
- "DoCjjvbduMYXBUBX",
- "DnbjjvbdFWYopNJe",
- "DoDKjvbdelfXGljL",
- "DnbjjvbdakLenmcA",
- "EPDKjvbdfILWRmpg",
- "EObjjvbdSLYeuHLT",
- "DoCjjvbdMfbolotk",
- "EPDLKvbdrRuKnKaN",
- "EOcKjvbdyzdnRhIh",
- "DoDLKvbdGAoRZJzm",
- "DoCjjvbdhlFDnUcZ",
- "EPDLKvbdmpZyVkYb",
- "DncKjvbdTpqPUuIN",
- "DncLKvbdHDjvJaij",
- "EPDLKvbdYlRcsmkm",
- "EPDLKvbdvlvAMdFN",
- "DncKjvbdIsZArmYM",
- "EOcLKvbdegjuqnQg",
- "EOcLKvbdZQmFJNFR",
- "DoCjjvbdZxdJmcMS",
- "EPCkKvbdlZTSTYgU",
- "DoDKjvbdqceJPnWB",
- "DncLKvbdVgwuxGxz",
- "DncKjvbdDnbkLXDE",
- "EPDLKvbdatbHYKsh",
- "DncKjvbdEzsqFLbi",
- "EPDLKvbdnVVZkKRf",
- "EOcKjvbdKeegbBQu",
- "EPCkKvbdKfGHaaRV",
- "EPDKjvbdmIctRVRa",
- "EPCjjvbdRMxBxnUz",
- "DnbjjvbdJYTbILpp",
- "EPCkKvbdTAEiHbPE",
- "EOcLKvbdfelZnGgA",
- "DoCjjvbdOStWGeUp",
- "EOcLKvbdemGXHNJk",
- "DoDKjvbdYTMAmUOx",
- "EPCkKvbdpyOhGpcx",
- "EPCkKvbdAMgxsWzY",
- "DnbjjvbdYkrETnMN",
- "EPDLKvbdUQqPUtgm",
- "DncKjvbdehKurNqH",
- "DoCjjvbdZMSETnLm",
- "DoDKjvbdIHGyyXwg",
- "EObjjvbdXGYzUAPT",
- "DoCjjvbdhbPCeWqR",
- "DoCkKvbdKNADzGuB",
- "DnbjjvbdFeirOJTq",
- "DncLKvbdaRecHtFk",
- "DnbkKvbdzoPpeClY",
- "EObkKvbdZRMeJMeR",
- "DnbjjvbdYfvdAPSi",
- "DncLKvbdJcKCqJcY",
- "EOcLKvbdqvokbhyR",
- "DoDLKvbdrRuLNjaN",
- "DoCjjvbdTlWPBWOi",
- "DoCkKvbdjvWnEBxX",
- "DoDLKvbdTkunaVoJ",
- "DoCkKvbdQZNAHTSK",
- "EObjjvbdqwPkbhyR",
- "EOcLKvbdNHDPlpUk",
- "DncLKvbdIHHZxxYH",
- "DncLKvbdtkxXAtAw",
- "DncLKvbdSCEFMJZL",
- "DnbjjvbdZQmEhldq",
- "DoCjjvbdNGbolotk",
- "DnbjjvbdnCKWwnmu",
- "DncLKvbdzHZMANEw",
- "DoDKjvbdmttykJrG",
- "DnbkKvbdlrZUzSci",
- "EPDKjvbdSKyGVHKs",
- "DoCjjvbdKVuGEFGi",
- "EPCjjvbdCIkBkIej",
- "DncLKvbdzHZMAMeX",
- "DnbkKvbdaSFbgsek",
- "DncLKvbdHDjujBij",
- "DoDKjvbdGZVUaDwb",
- "DnbjjvbdZnnJFEzK",
- "DoCkKvbdtcDUwWOo",
- "DoCkKvbdlBMoNALA",
- "EOcKjvbdNsUWHFUp",
- "DoDLKvbdVUNUFlVj",
- "DnbkKvbdhkdcnUcZ",
- "DncLKvbdLiBkqYAS",
- "EOcKjvbdzoPpdcLx",
- "EPDKjvbdijGIJmXr",
- "EOcKjvbdZisHofaf",
- "DoDLKvbdeOdrkUUS",
- "DoDLKvbdnPyxvKxb",
- "EPDKjvbdIxUBhMRQ",
- "DncLKvbdlhctRUqa",
- "DoDLKvbdmgFXlnGy",
- "DncKjvbdCJKbKiGK",
- "EOcLKvbddndrjtUS",
- "DnbjjvbdkDLjqGuH",
- "DncKjvbdmIcsptqa",
- "DoCkKvbdvvlAvBWV",
- "EObjjvbdjblLQftg",
- "DnbjjvbdCEQBWKMf",
- "DnbjjvbdBdPaVilf",
- "DoCkKvbdZxcjODLr",
- "DoCkKvbdEObjjwCd",
- "EPDKjvbdyTNhlqbH",
- "EPCkKvbdUMVoAvPJ",
- "DncKjvbdUxhUZjoO",
- "DncKjvbdqqtjmkAm",
- "DncKjvbdKfGICBRV",
- "EPCjjvbdVrOXaeLc",
- "EPDLKvbdwXLaWBWV",
- "EPCkKvbdjblKqHUg",
- "DnbjjvbduDCuWuoP",
- "EPDKjvbdNGbpMouL",
- "EObjjvbdBcoaVjNG",
- "DncLKvbdrWpMDIxq",
- "DncLKvbdhaoCdwRR",
- "DnbkKvbdFxtuBDwb",
- "DncKjvbdIjEAKPgE",
- "EOcLKvbduCbuXVoP",
- "DoDKjvbdZtIiZDsO",
- "DnbjjvbdEztRElCi",
- "DncLKvbdxmsHwsJD",
- "DnbjjvbdRbEElIxk",
- "DoDKjvbdWHwvXgYz",
- "EOcKjvbdQlwbYnUz",
- "EOcLKvbdVTltFkuj",
- "DncKjvbdliETptqa",
- "DnbkKvbddoErjtTr",
- "DoCkKvbdgPazvdXh",
- "DncKjvbdySmhlqag",
- "DoCjjvbdbPgHDkzd",
- "DoCkKvbdFWZPomKF",
- "EObjjvbdssSSxydc",
- "EObjjvbdzQnliJwA",
- "EObkKvbdKCjCpibx",
- "EPCjjvbdpyOhHREY",
- "DncLKvbddjJqutzn",
- "EObkKvbdBdQAujMf",
- "EPCkKvbdLAjflbXq",
- "DncLKvbdLBLGlaxR",
- "DoDLKvbdrpWPJbuf",
- "DoCjjvbdEKHiuxKA",
- "DoCjjvbdXsMAlsnx",
- "EObkKvbdptTgSSLU",
- "DoDKjvbdnHFXmNfy",
- "DncKjvbdCJKbKhej",
- "EPCjjvbdhlEdOUby",
- "EOcKjvbdKWUfEFGi",
- "DoDKjvbdZQmFJMdq",
- "EPCjjvbdiGjDZWKV",
- "EObkKvbdVAbQrprZ",
- "DoDKjvbdfekzNgHA",
- "DoDLKvbdnHEwlmgZ",
- "DncKjvbdwzHeexEr",
- "DoCjjvbdmpZxujyC",
- "EPDKjvbdwMvAMcdm",
- "DoCjjvbdfHkVrNqH",
- "EPCkKvbdYzbfRiuy",
- "EPCkKvbdZtIiZDrn",
- "DnbjjvbdjvWnDbYX",
- "DoCjjvbdOStVgEtp",
- "EPDLKvbdZMSETmlN",
- "EPDKjvbdBhjajhej",
- "EPCjjvbddoFTLUUS",
- "DnbkKvbdsQVoJcWG",
- "EPCjjvbdrEFJQNvB",
- "DoCjjvbdMpYRWOGs",
- "EOcLKvbdZirgpHBf",
- "EPDLKvbdyOTIXsJD",
- "DoCkKvbdKRZdnfNe",
- "DnbjjvbdbBWFFoow",
- "EPCjjvbdgFlZnHHA",
- "DnbkKvbdGGJrOIsq",
- "DoDLKvbduDCtwWPP",
- "EObjjvbdNddUIhjd",
- "DnbjjvbdxsNiMqag",
- "EObjjvbddeOrCWbj",
- "EObjjvbdPxmAGsRj",
- "EOcLKvbddeOrCXDK",
- "DoDLKvbddeOrBwCj",
- "DoCjjvbdVqnYCElD",
- "DnbkKvbdUyIUZjoO",
- "EObjjvbdeFOrCXDK",
- "EObkKvbdVrNxCFLc",
- "EObjjvbdTfzmkwWF",
- "EOcKjvbdIHGzZYYH",
- "EPDKjvbdtbbuXWPP",
- "DoCjjvbdZisIQHBf",
- "EObjjvbdbsCkUDjB",
- "EPCkKvbdVwJXudFH",
- "EPDKjvbdrouoKDVf",
- "EPCkKvbdFyVVBEYC",
- "DncLKvbdZnnIeEzK",
- "EPDLKvbdxVNFQxkn",
- "DoDKjvbdpxnggRDx",
- "DoDLKvbdqZOgfpcx",
- "DncKjvbdCIjakJGK",
- "EPCkKvbdCJLBjhej",
- "DoDLKvbdnPzYvKxb",
- "EOcKjvbdqTsgSRkU",
- "EOcLKvbdLBLGlaxR",
- "DoDLKvbdcbTMrAUN",
- "DncLKvbdzitoodSt",
- "DoDKjvbdJvUfDdfi",
- "EOcLKvbdHDjvKCJj",
- "EPCkKvbdeOeTKssr",
- "DnbkKvbdlYrqsYft",
- "DncLKvbdiiehKMxS",
- "DncKjvbdURQoVUhN",
- "DnbkKvbduMYXBUAw",
- "DoDLKvbdSPtHJfEX",
- "EObkKvbdqBJFAWgd",
- "EOcKjvbdFpATWgFy",
- "DoDLKvbdBsBDTfXS",
- "DncKjvbdjhHLfFmk",
- "DoCjjvbdCJKakIfK",
- "DnbkKvbddoFSjtTr",
- "EObkKvbdANIYsWzY",
- "EObjjvbdCTAbtFvr",
- "EObjjvbdrRtkOLAm",
- "DnbkKvbdkxsSTYgU",
- "DoCjjvbdnBiwXnmu",
- "EObjjvbdwtmEqYlO",
- "EPDKjvbdrylQTAhO",
- "DoDLKvbdtbbtvvOo",
- "EPCjjvbdZLrETmlN",
- "EPDLKvbdWXJYWDdg",
- "DoCkKvbdKQzFOfOF",
- "EPCjjvbdwzIFfXeS",
- "DncKjvbdRjyFuHLT",
- "EPDLKvbdULunaWPJ",
- "DncKjvbdUxhTykOn",
- "DnbkKvbdJcKCqKDY",
- "EPDLKvbdcbSmSATm",
- "DnbkKvbdegjurNqH",
- "EPDKjvbdZjTIQGbG",
- "EPCjjvbdiLddNuCy",
- "DoCjjvbdZQldiNEq",
- "EOcLKvbdakMGPODA",
- "EObjjvbdnHEwlmgZ",
- "EOcLKvbdBsAcUGXS",
- "EPCkKvbdiVZdwSUb",
- "EOcLKvbddCTNSAUN",
- "DnbkKvbdEXxMUUUM",
- "DncKjvbdYpldiMeR",
- "DoDKjvbdNddTiIjd",
- "DoDLKvbdZLqdUNlN",
- "EPCkKvbdiBncFWpq",
- "DncLKvbdiCPDEvqR",
- "EOcKjvbdUyHszKoO",
- "DncKjvbdhtydvqtb",
- "EPCjjvbdpxoHgQcx",
- "EObkKvbdkWWnDaxX",
- "DnbjjvbdBhkBkJFj",
- "DoCkKvbdRacdkhyL",
- "EOcLKvbdZjTHpHCG",
- "EPCkKvbdMowqWOGs",
- "DncLKvbdegjurNpg",
- "EObjjvbdfMfWfmKL",
- "EPDLKvbdZirgpGaf",
- "DoDLKvbdiZuFlQnG",
- "DncLKvbdFxuVAcxC",
- "EObkKvbdZisHofaf",
- "EOcKjvbdJSyBSmYM",
- "EPDLKvbdVYgtZkPO",
- "EOcKjvbdRbEFMJYk",
- "DncLKvbdrEFIonWB",
- "DncKjvbdKDJbqJcY",
- "EOcLKvbdhfjCxuiu",
- "EObjjvbdLLAhWAKZ",
- "DoCkKvbdRXNcblID",
- "DoDLKvbdcbSmSATm",
- "EOcLKvbdwWlAvAuu",
- "EObkKvbdiBnbdvpq",
- "DoCkKvbdNQXpumgT",
- "DncLKvbdkVwOECYX",
- "DnbkKvbdfoazwDxI",
- "DoDLKvbdbBWFFpPw",
- "DoDLKvbdvBDxsPEh",
- "EPDKjvbdJqZdoFme",
- "DoDLKvbdIryArmXl",
- "EPCjjvbdANIZSwZx",
- "EPCkKvbdVhYVxGxz",
- "DncKjvbdLAjgNCYR",
- "DncKjvbdxxIjCQZk",
- "DncKjvbdbiNKKewY",
- "EPCjjvbdlrZVZsEJ",
- "EPDKjvbdIryAsMwl",
- "DoCkKvbdtAHRIAAr",
- "EPDKjvbdJmAEZfuB",
- "EPCkKvbdZjSgogBf",
- "DoDLKvbdOXnuzcnU",
- "DnbkKvbdehKvRnQg",
- "EObjjvbdZyDimbkr",
- "DoDKjvbdmajWwoOV",
- "EOcKjvbdkMalZeHP",
- "EOcKjvbdIjEAJpHE",
- "EPCkKvbdDihKVxKA",
- "DncKjvbdNddUIiKd",
- "EObjjvbdqdFIpOWB",
- "DoCkKvbdxnShXsJD",
- "DoDLKvbdjmBkzEfo",
- "EOcLKvbdatagYLTh",
- "DoCjjvbdVhYVxHYz",
- "DnbjjvbdJbjDRKDY",
- "EPCjjvbdLBLHNCYR",
- "DnbjjvbdnGeYNOGy",
- "EOcLKvbdUsmTekvK",
- "EPCjjvbdtkxXBTaX",
- "EPCjjvbdzoPqFCkx",
- "DncKjvbdCIjbKhej",
- "DncKjvbdZLqdTmkm",
- "DoDKjvbdsPunicVf",
- "EOcKjvbdmgFXmNgZ",
- "EObkKvbdiMFENuCy",
- "DoDKjvbdhanbeXRR",
- "EObkKvbdACqwiyhp",
- "DncKjvbdZisIQHBf",
- "EPCjjvbdgQBzwDwh",
- "DnbjjvbdyYJJaoyk",
- "DoDKjvbdxUldqZMO",
- "EObkKvbdkClLQgVH",
- "EPCjjvbdZQldiMeR",
- "EPDLKvbdZyEKOClS",
- "EPDLKvbdcIlikFvx",
- "DoDKjvbdrzMQTBHn",
- "DnbjjvbdVYgtZkPO",
- "DoDLKvbdHEKuiajK",
- "EPCkKvbdczZQXxqC",
- "DoDKjvbdrDdiQNua",
- "DncLKvbdcImKLGWx",
- "DoCjjvbdVYgtZkPO",
- "EPDLKvbdZnnIeFZj",
- "EPDKjvbdMIakqYAS",
- "DoCkKvbdSLYfUgLT",
- "EPDLKvbdiCObdvpq",
- "DnbjjvbdRpUHKFcw",
- "DoDLKvbdIHHZyYXg",
- "EPCjjvbdypoMhiwA",
- "DnbkKvbdCEPaVjMf",
- "DnbkKvbderAvzlDP",
- "DnbkKvbdZQleImFR",
- "EOcKjvbdKRZdneme",
- "DoDLKvbdiBnbeXQq",
- "DncLKvbdEPDKjvcE",
- "EOcLKvbdauCGwkTh",
- "DncLKvbdEvZQPmJe",
- "EPCkKvbdURQnuVIN",
- "DncLKvbdegjvSOQg",
- "EPCjjvbdKaKgMawq",
- "DnbkKvbdRzKISbvA",
- "DncLKvbdiLdcnUcZ",
- "EPDLKvbdkDMKpfuH",
- "DoDLKvbdRbDdkhyL",
- "DnbjjvbdDwxMUUTl",
- "DnbkKvbdrpWPKCuf",
- "DnbkKvbdNVSqjmAX",
- "DoDKjvbdRbDeMIxk",
- "EOcLKvbdcyxpXyRC",
- "DncLKvbdRMwbYnUz",
- "EObjjvbdqlzJxlHi",
- "DoCkKvbdJYUCIMQp",
- "DncLKvbdLZQjSzuG",
- "EOcKjvbdxVNEqYkn",
- "DnbkKvbdZoOIeFZj",
- "DoCjjvbdBraCtFwS",
- "EOcLKvbdliDsqVSB",
- "EPCkKvbdeATqNXif",
- "DncLKvbdkMbLydgP",
- "EObjjvbdZxdJmbkr",
- "DoCjjvbdraellHLZ",
- "EObkKvbduDCuWvPP",
- "DoCkKvbdpstGrSLU",
- "DoCjjvbdLGFgbBQu",
- "DnbkKvbdhtzFWquC",
- "EObjjvbdoAKztHdO",
- "EPDLKvbdatafxKtI",
- "EPDKjvbdkWXNcaww",
- "DoCkKvbdwkXEHzzG",
- "EObkKvbdmgEwmNgZ",
- "DncKjvbdBiLCLJFj",
- "DoCjjvbdeOdsKssr",
- "EOcLKvbdfILWSORH",
- "EObkKvbdCDpAujMf",
- "EPDKjvbdKDKDQibx",
- "DoDKjvbdVUMtGLuj",
- "EObkKvbdrXQMCiYq",
- "DncKjvbdePEsLTtS",
- "DncLKvbdDxYLtUTl",
- "EPCkKvbdGYuVBEYC",
- "DncLKvbdNeEUIiKd",
- "EPCkKvbdpxoIHRDx",
- "EObjjvbdFkEsDHlu",
- "EObjjvbdssSSxzFD",
- "DoCkKvbdUtNTfMVj",
- "DnbjjvbdJcKDRKDY",
- "DncKjvbdqiAKEmOe",
- "DoDKjvbdtlXwAtBX",
- "DnbkKvbdxmsIYTIc",
- "EObkKvbdLrXMzUpz",
- "DoCjjvbdkxsSSxft",
- "DncKjvbdQlwaxnUz",
- "EObkKvbdjhGlFfNk",
- "EPCkKvbdxsNhmRag",
- "DoDLKvbdMfcPmQUk",
- "DoDKjvbdQvnEDLhD",
- "EObjjvbdVgxVxHYz",
- "DoDLKvbdlrYtyrdJ",
- "DoCjjvbdezvYeIsw",
- "DncLKvbdNddTiIjd",
- "EPDLKvbdGGJrNiUR",
- "EPDLKvbdRzJhTDWA",
- "EPCjjvbdvvkaWBVu",
- "EOcKjvbdRXNdCkgc",
- "EOcKjvbdQZNAHTSK",
- "EPCkKvbdsCGNLfkZ",
- "EOcLKvbdDwwktTsl",
- "EOcLKvbdqlzJyLgi",
- "EOcLKvbdxsNiMqag",
- "EOcLKvbdhzVFlROG",
- "EOcKjvbdEztRFMCi",
- "DnbkKvbdqiAJdmPF",
- "EPDLKvbdjcMKqGtg",
- "EObkKvbdTlWOaWOi",
- "EPDLKvbdURRPUuHm",
- "DoDKjvbdelfWgNKL",
- "EOcLKvbdGAnqZJzm",
- "EObjjvbdGZUuAdXb",
- "DoDLKvbduLwwAtAw",
- "DoCjjvbdZjTIQGbG",
- "EPCjjvbdRNXbYnUz",
- "EPDLKvbdiLeENtby",
- "EObjjvbdMowpunGs",
- "EOcKjvbdbiNJjevx",
- "DoDKjvbdEYYLstTl",
- "DoDLKvbdqUTfrRjt",
- "DoDKjvbdbsCkUEJa",
- "DoDKjvbdXsMBNUPY",
- "EPCjjvbdRNXaxnUz",
- "DoDLKvbdNGcQNQUk",
- "DnbjjvbdEARiMywX",
- "EPDKjvbdSKxfUfkT",
- "DncKjvbdhtyeXRtb",
- "DncKjvbdZLqcsnLm",
- "EObkKvbdZnmheEzK",
- "EObjjvbdtbcUvuno",
- "DnbjjvbdrzMQTBHn",
- "DnbjjvbdDwwktTsl",
- "EPDKjvbdkxsSTYgU",
- "DoDKjvbdIryArlxM",
- "DoDKjvbdnBivxOnV",
- "DoDKjvbdeATplwif",
- "EOcLKvbdKeegbApu",
- "EPCjjvbdMgDQMotk",
- "DoCjjvbduCbtwWOo",
- "DnbkKvbdyNsHwrhc",
- "DnbkKvbdtvNxJpsA",
- "EOcLKvbdqAheAWgd",
- "DoCkKvbdURQoUtgm",
- "EOcKjvbdqceIpOWB",
- "DoCkKvbdVwIwudFH",
- "DnbkKvbdbLMFnmcA",
- "EOcLKvbdZjTHpHBf",
- "EOcKjvbdRXNdCkhD",
- "EPDLKvbdiHJcZViu",
- "DoCjjvbdxxIjCPzL",
- "DnbkKvbdBcpBWJmG",
- "EPCkKvbdZyEKOCkr",
- "EPDKjvbdOTUWHFVQ",
- "DoCjjvbdIGgZxwwg",
- "EPDLKvbdFjeSbhMu",
- "EPDLKvbdhgKCxvJu",
- "EOcLKvbdNsUWGdtp",
- "EPDKjvbduVnXipsA",
- "DncLKvbdGYuVBEXb",
- "EPDLKvbdZtIhyESn",
- "DoDKjvbdZxdJmcLr",
- "DoCjjvbdUsltGLuj",
- "DoDKjvbdDoDLKvbd",
- "DncLKvbdrDdhpNvB",
- "EPDLKvbdKCjDRJbx",
- "DoDLKvbdxLWdHzyf",
- "EObkKvbdrzMQTAhO",
- "EOcLKvbdOFDtJJKd",
- "EPCkKvbdrSVKmjaN",
- "EOcKjvbdWWiYVdEg",
- "EOcKjvbdWWhwvDdg",
- "DncKjvbdpstHRqjt",
- "EPCkKvbdKWVFceGi",
- "DoCkKvbdZjShPfbG",
- "DoCkKvbdSxKlNzkY",
- "EPDLKvbdIwtCHkqQ",
- "EOcKjvbdsCGNLgLZ",
- "DncKjvbdzaAOfgCM",
- "DoDLKvbdxmrhYSiD",
- "DncLKvbdfMfWgMjL",
- "EPDKjvbdqFdEsuaI",
- "EOcLKvbdiLeDnUcZ",
- "DoCjjvbdKVuFceHJ",
- "DoCjjvbdfekzNgHA",
- "EOcKjvbdOFEThiLE",
- "EPDLKvbdqceJPnWB",
- "DoDLKvbduCbtwWOo",
- "DncKjvbdTqROtuIN",
- "DncKjvbdpedFUWBI",
- "DoDLKvbdrEFJQNua",
- "DoDLKvbdyXhjCPyk",
- "EPCkKvbdJYUBhLqQ",
- "EPCkKvbdtcCuXVno",
- "DoDLKvbdZLrEUOLm",
- "EPCkKvbdpstGrRjt",
- "DncLKvbddePSCXCj",
- "EObkKvbdauCHXjsh",
- "DoDLKvbdkHfkefNk",
- "EObjjvbdMRwMzUpz",
- "EObjjvbdaMkCTVNH",
- "DoCkKvbdGGJrNhtR",
- "EPDLKvbdvBDxrneI",
- "EPDLKvbdIHHZxwxH",
- "EOcLKvbdrJAJdmPF",
- "EOcKjvbdGZUuAdXb",
- "EOcLKvbdbUbHYLUI",
- "DnbjjvbdJzofYEAN",
- "EPDKjvbdFxtuBDxC",
- "DnbkKvbdQvnDbkgc",
- "EPDKjvbdJmADzGta",
- "DoDKjvbdZRMdhleR",
- "DnbkKvbdsrqsZZeD",
- "EObkKvbdrovPJbuf",
- "EPCjjvbddeOqbXCj",
- "EObjjvbdtcDVXVoP",
- "DncKjvbdMfbpNQVL",
- "DoCkKvbdhbPCeXQq",
- "DoCkKvbdNHComQVL",
- "EObjjvbdvBDxroFI",
- "EPCjjvbdnBivwoNu",
- "EObjjvbdbhljKewY",
- "EPDKjvbdZyDimcMS",
- "EObkKvbdWSOXbElD",
- "EOcKjvbdTfznMXVe",
- "EPCjjvbdZtJJYcsO",
- "DoCjjvbdRjxfVHLT",
- "DoCkKvbdVTltGMVj",
- "DncKjvbdYfwEAOri",
- "DncKjvbdYkrEUOMN",
- "EObkKvbdqGEEsuaI",
- "DncLKvbdjJfHimXr",
- "EPDLKvbddndsLUTr",
- "DnbkKvbdqBJFAWhE",
- "EPDLKvbdEOcKjwDE",
- "EPCkKvbdtvOYJqTA",
- "DncLKvbdkyTRsZHU",
- "DoCjjvbdTppnuVIN",
- "DncLKvbdwyhFeweS",
- "DncKjvbdsBelkgKy",
- "DoCjjvbdKDKCqJcY",
- "DoCjjvbdkClKqHVH",
- "DoCjjvbdcTCjtDia",
- "EPDLKvbdUVkpJtAq",
- "EPDLKvbdRyjITCvA",
- "DnbjjvbdJuuFcdgJ",
- "DoDKjvbdrJAJdmOe",
- "DncKjvbdJcJbqKCx",
- "DoDLKvbdJcJbqJcY",
- "DoDKjvbdeEoSCXDK",
- "DoDLKvbdSwjlNzkY",
- "EObjjvbdzitopDrt",
- "DoCkKvbdKWVGEEgJ",
- "DncKjvbdpssfqrKt",
- "EOcLKvbdUMWPBVoJ",
- "DncKjvbdyzdmrIIh",
- "EPCjjvbdxUldqZLn",
- "DoDLKvbdySnImRbH",
- "DoCjjvbdGdKvJaij",
- "DoCkKvbdxZgeewdr",
- "EObkKvbdiLddNuDZ",
- "DnbjjvbdSCDdkiZL",
- "DncKjvbdznpREcMY",
- "EOcLKvbdaRebhTfL",
- "DnbjjvbdZQldiMdq",
- "EPCjjvbdbrbjtEKB",
- "EOcKjvbdEARiMzXX",
- "DoDLKvbdXrkaNTnx",
- "EPCkKvbdQZNAHTRj",
- "DoDLKvbdEzspeLcJ",
- "EPCjjvbduVnYKRTA",
- "EObjjvbdJXtBhMQp",
- "EPDKjvbdeOdrjssr",
- "EPCjjvbdLqwMytpz",
- "EPDKjvbdUMVoBVoJ",
- "DncKjvbdRpUGifDw",
- "EPDLKvbdZyDinDLr",
- "DnbkKvbdNrsufeVQ",
- "EPCkKvbdZMSDtNlN",
- "EPCkKvbdySnJNSCH",
- "EPCjjvbdfMevfljL",
- "DncLKvbdXsMBNTnx",
- "DnbkKvbdpxoHfqDx",
- "DncLKvbdUQpntthN",
- "DncKjvbdIsZArlwl",
- "DoDLKvbdZGwEAOsJ",
- "EOcKjvbdVvhwvDdg",
- "EOcLKvbduWNxJqTA",
- "EPCjjvbdHEKvJaij",
- "DoDKjvbdrpWOjCuf",
- "DncLKvbdrpWOjDVf",
- "DoCjjvbdIHGzYwwg",
- "DoDLKvbdpxoIGqEY",
- "DoDLKvbdJcJbqKDY",
- "DoCjjvbdRWmdClHc",
- "EPCjjvbdFWYopNJe",
- "DncKjvbdmfdwlmfy",
- "DoCkKvbdxUleQxlO",
- "EObjjvbdnGdxMnGy",
- "EPCjjvbdvvlAvBVu",
- "DncLKvbddndsKssr",
- "EObjjvbdZMRcsnLm",
- "EOcKjvbdFxttaEXb",
- "DncKjvbdVUNTfMVj",
- "EOcLKvbdNrtWHFUp",
- "DoDKjvbdwuMdqYlO",
- "EPDLKvbdrXPkbhxq",
- "EObjjvbdrEFIpNua",
- "EObjjvbdziuQQDrt",
- "EOcLKvbdqYoIGpcx",
- "DnbjjvbdsQVoJcVf",
- "EObkKvbdkDMKpgUg",
- "EObjjvbdvBDyTPFI",
- "DncKjvbduCbuWvOo",
- "EPCjjvbdkVvnECYX",
- "DncLKvbdZGvdAOri",
- "DoCkKvbdrXPlDJZR",
- "EOcLKvbduCcVWvOo",
- "DoDKjvbdCEPaWJlf",
- "EPDKjvbddoErjssr",
- "DncKjvbdACqxKZiQ",
- "EPCjjvbdUVlPitAq",
- "EPDKjvbdjJfHjMxS",
- "EObkKvbdAMhYsWzY",
- "DoDKjvbdnBivxOmu",
- "EOcLKvbdbiNKKfXY",
- "EPDKjvbdYqMeIleR",
- "EObkKvbdJmADygUa",
- "EObjjvbdEPDLLWcE",
- "EPCjjvbdrXPkcIxq",
- "EOcLKvbdliDtQtqa",
- "DoCjjvbdmoyxujyC",
- "EPDLKvbddoFTLTsr",
- "EOcLKvbdCWzdJEpW",
- "DnbjjvbdrEEhpOWB",
- "DoDKjvbdZLrDtNkm",
- "EOcLKvbdLFfHbAqV",
- "EOcKjvbdmttzLKSG",
- "EOcLKvbdmbJvwoOV",
- "EOcKjvbdUaCQrqSZ",
- "DnbjjvbdmgExMnGy",
- "EPDKjvbddndrkUUS",
- "EObkKvbdDwwkstTl",
- "DoCkKvbdcJMjLFwY",
- "DnbjjvbdaNLBruMg",
- "DoDLKvbdQYmAHTRj",
- "DnbkKvbdsQWOicWG",
- "EObkKvbdMRwMzUpz",
- "DoDLKvbdZshiZDrn",
- "EPDLKvbdnPzYujxb",
- "EOcKjvbdCEQAujMf",
- "EPDLKvbdKefHbApu",
- "DoDLKvbdYpldiNFR",
- "DoCkKvbdFWZQQNJe",
- "DncLKvbdznpQeCkx",
- "EOcKjvbdnQZxvKxb",
- "DoCkKvbdVBBprpqy",
- "DnbkKvbdZirhPfaf",
- "DnbkKvbdegjvSNqH",
- "EOcLKvbdqdEiPnWB",
- "EObjjvbdBhkCKiGK",
- "EObjjvbdxZgfGYFS",
- "DnbjjvbdNQYQumgT",
- "EPCjjvbdxsNhlrBg",
- "DoCkKvbdQdDApRDr",
- "DoCkKvbdxxIiaoyk",
- "EPDKjvbdFeirNhtR",
- "DoCjjvbdegjvSOQg",
- "EObkKvbdqcdiQNvB",
- "DncLKvbdiMEdNtcZ",
- "DncLKvbdTqRPUthN",
- "EPCkKvbdwygeexFS",
- "DoDKjvbdyTOJMrBg",
- "DncLKvbdeEoRavbj",
- "EPCjjvbdtbcUvvOo",
- "EObjjvbdKCicRJcY",
- "EObjjvbdZyEKODMS",
- "DnbjjvbdmJDtQtrB",
- "DncLKvbdEARhlyvw",
- "DnbjjvbdIxTbILqQ",
- "EOcLKvbdwygefYFS",
- "DoCjjvbdznoqFCkx",
- "DoCjjvbdRpUGjGDw",
- "DncKjvbdhzVGMQnG",
- "EPCjjvbdhkeDnVCy",
- "EObkKvbdOEdUIiKd",
- "DncKjvbdrDeIomua",
- "DncLKvbdiHJbxuiu",
- "EPDKjvbddxZstRez",
- "EPDLKvbdmSYuZrdJ",
- "EObkKvbdVUNUFkvK",
- "EPDLKvbdNeEUJIjd",
- "DoCkKvbdiMEdNuCy",
- "DoDLKvbdRDcApQcr",
- "EPCjjvbdTlVoBVoJ",
- "EObjjvbdLBKgNBwq",
- "EPCkKvbdsCFllHKy",
- "EObjjvbdnVUzLJqf",
- "DoDKjvbdqrVLNkBN",
- "DoCkKvbdqFcdtWBI",
- "DncLKvbdbVCGxLTh",
- "EOcLKvbdeFPSCXCj",
- "EOcLKvbdRpTgKFdX",
- "EObjjvbdznpQeDLx",
- "EOcKjvbdjvXNcaxX",
- "DnbjjvbdHDkWJbJj",
- "DncKjvbdhkeENuDZ",
- "DnbkKvbdnUtyjjSG",
- "DoDKjvbdSQUHJfDw",
- "DncKjvbdbUbHYLUI",
- "EOcLKvbdNsTvGduQ",
- "EPDLKvbdSZigsCvA",
- "DncKjvbdMfcPlpUk",
- "DoDLKvbdxrnIlrBg",
- "DncKjvbdiLdcnVCy",
- "EPCjjvbdmfeYNOHZ",
- "DoCkKvbdjvWmcaxX",
- "DoDKjvbdbUbHXkUI",
- "DncKjvbdBhkBjiFj",
- "DoDLKvbdNHColpVL",
- "EOcKjvbdrykosAhO",
- "DncLKvbdqGDeUVaI",
- "DnbkKvbdhgJcZViu",
- "DnbjjvbduLxXAtBX",
- "EPCjjvbdYpleJNFR",
- "EPDLKvbdQvmdClHc",
- "DnbjjvbdJYTbIMRQ",
- "DncLKvbdznpRFDMY",
- "EOcLKvbdZnmiFEyj",
- "DnbkKvbdrRuLOLAm",
- "EObkKvbdhkeEOUby",
- "DncLKvbdYlSEUOLm",
- "DoCjjvbdhkdcmtby",
- "DncLKvbdddnrCXDK",
- "DoDLKvbdKaLHNCYR",
- "EOcKjvbdcyxpYZQb",
- "EPDLKvbdACqwjZhp",
- "DoCkKvbdBsBDTevr",
- "EObkKvbdeKJqvUzn",
- "EObkKvbdcImJkGWx",
- "DncLKvbdYSlAltOx",
- "DncLKvbdlrYtyrdJ",
- "EObkKvbdKxqJrztf",
- "EOcKjvbdsQWPJcVf",
- "DoDKjvbdkySqrxgU",
- "EObjjvbdeEoRbXCj",
- "EOcKjvbdHDkVjBij",
- "DoDLKvbdCTBCsfXS",
- "DoCjjvbdKCjDQibx",
- "DoCjjvbdlhdTqUrB",
- "DoDKjvbdTulQKTaR",
- "DoCkKvbdRjxetfkT",
- "EPCjjvbdEuyQQNKF",
- "EPCjjvbdDoDKkXDE",
- "DoCjjvbdsQWPJbuf",
- "DoDKjvbdhuZdvqtb",
- "EPDLKvbdiHKCyWJu",
- "EPDLKvbdLFegaaQu",
- "DoCjjvbdqZPHgRDx",
- "DncKjvbdUWMPjUAq",
- "DoDLKvbdTYKkmzjx",
- "DoDKjvbdegjvSOQg",
- "DnbkKvbdUtNTekvK",
- "EObkKvbdNsTvGeVQ",
- "DoDLKvbdfNFvgMjL",
- "EOcLKvbdZQmEiNEq",
- "EPDKjvbdBraDTfWr",
- "EPDKjvbdNGcQNQVL",
- "EPDLKvbdZyEKODMS",
- "EOcKjvbdBvzdIdpW",
- "EPCjjvbdACqwiyiQ",
- "DoCjjvbddePRawCj",
- "EPDKjvbdWWiXucdg",
- "DoDKjvbdWexzUAPT",
- "DnbjjvbdwXMBWBWV",
- "EOcLKvbdUyHszLOn",
- "EPCkKvbdOYOuzcnU",
- "EPCkKvbdhancEwQq",
- "DnbkKvbdjggLefOL",
- "EPCkKvbdFjdsDIMu",
- "DoDKjvbdrSUjmkBN",
- "DoDLKvbdZjTIQGaf",
- "DoDKjvbdMgDPmPtk",
- "EPDLKvbdWRmwbFMD",
- "DoCkKvbdzROmJKXA",
- "DnbkKvbdrDdiQNvB",
- "DnbjjvbduDCtwVoP",
- "EOcLKvbdCIjbLJFj",
- "EPDKjvbdXrkaMsnx",
- "EPDKjvbdVhXvXfxz",
- "DncKjvbdhbPDEwRR",
- "DoCkKvbdpxoHgQcx",
- "DoCkKvbduMXwBUBX",
- "EObjjvbdNeEThhjd",
- "DoCjjvbdirzhrkJz",
- "DoDLKvbdaMkCTUlg",
- "DncLKvbdWRnYBeLc",
- "DnbjjvbdGBPRZJzm",
- "EOcLKvbdeOeSjstS",
- "DoDLKvbdmIctRVSB",
- "DoCjjvbdZxdJnDMS",
- "DoCkKvbdRpTgKFcw",
- "DncLKvbdTukojTaR",
- "DnbjjvbdKRZdoFme",
- "DnbkKvbdURQoVUhN",
- "DoDLKvbdyYJKBozL",
- "EObkKvbdfNFwHMjL",
- "DoDLKvbdZisIQHBf",
- "EObkKvbdqFcdsuaI",
- "DncLKvbdzoPqFDLx",
- "DoDKjvbdSKxeuHLT",
- "EPDKjvbdsBemLfjy",
- "DoCjjvbdJbjCqJcY",
- "DoCjjvbdNPxRVnGs",
- "DncLKvbdGcjvJbKK",
- "EOcKjvbdrWpMDIxq",
- "EOcLKvbdQdDApQcr",
- "DoDKjvbdZMRdTnLm",
- "EOcLKvbddxZssrFz",
- "EObjjvbdUtNTfLuj",
- "EPCjjvbdLLBIWAKZ",
- "DoCkKvbdgFlZmfgA",
- "EPCjjvbdUVkoitAq",
- "DoDKjvbdDncKjvcE",
- "DoDLKvbdRpUHJfEX",
- "EPDKjvbdLqvlzVQz",
- "EPDKjvbdZMRdUOLm",
- "EOcLKvbdCJLBkIfK",
- "DncKjvbdaSFbhUFk",
- "EPDLKvbdZoNheEzK",
- "DncKjvbdUVlPjUAq",
- "DnbkKvbdKNADyfuB",
- "EObkKvbdZdwfzghb",
- "EPDLKvbdZtIhxcrn",
- "EObkKvbdGckViajK",
- "DncLKvbdFfJqmiUR",
- "DncKjvbdKWUfDdgJ",
- "DoDKjvbdMtrqjmAX",
- "EOcLKvbdsQWPKDVf",
- "DoCjjvbdwtleRZMO",
- "EObjjvbduaDxsPEh",
- "EPDLKvbdKxqJrzuG",
- "EOcKjvbdVAaprprZ",
- "EObjjvbdEuxopMjF",
- "DnbjjvbdyOTHwriD",
- "EPDLKvbdrpVnibvG",
- "EPDKjvbdkWWnDaww",
- "DncLKvbdrXPkbiYq",
- "DoDLKvbddxZssqez",
- "EOcLKvbdHDkWJbJj",
- "DncLKvbdEPCkLWcE",
- "DnbkKvbdEXwkstTl",
- "EObjjvbdqiAKEmOe",
- "DncLKvbdjAQGaQGj",
- "EPCjjvbdNeDtJJKd",
- "EPCjjvbdvwMBWBVu",
- "EPDKjvbdFejSOItR",
- "EOcLKvbdNPwqWOHT",
- "EPDKjvbdbsCjscia",
- "EObkKvbdyYIiaoyk",
- "DoDKjvbdLZQirzuG",
- "EObjjvbdSLZGVGjs",
- "DoCjjvbdAMgxsWzY",
- "DoDLKvbdEObjjwCd",
- "DnbkKvbdsPvOicWG",
- "EPCkKvbdrJAKElne",
- "EPCkKvbdauCGwjsh",
- "DncLKvbdegkWRnQg",
- "EPCkKvbdYpmEiNFR",
- "DoDKjvbduaDxsPFI",
- "DoCjjvbdcyxoxYqC",
- "DoCkKvbdkMakzFHP",
- "DnbjjvbdJbibqJbx",
- "DnbkKvbdWWhxWDeH",
- "DoCjjvbdssRsYzFD",
- "DoDKjvbdpyPIHRDx",
- "DncLKvbdwNWANDeN",
- "DoDKjvbdJYUBglRQ",
- "EObkKvbdXnRAYVVt",
- "DoCjjvbdUWLpKTaR",
- "DoDKjvbdTqROttgm",
- "EPCkKvbdVqnXaeMD",
- "EObjjvbdADRwiyiQ",
- "DoDKjvbdlrZUyrci",
- "EPDKjvbdvAdZSndh",
- "DoCkKvbdzoQQeDLx",
- "DnbkKvbdSQUGjFdX",
- "EOcLKvbdqBJFAXIE",
- "EObkKvbdSCEFLiZL",
- "DnbjjvbdzoQQdcMY",
- "DnbkKvbdpxngfqEY",
- "DncLKvbdbsDLUEKB",
- "DoCjjvbdXrlBMtOx",
- "EObjjvbdKCjDQicY",
- "DncLKvbdLrWlzUpz",
- "EObjjvbdaaWEfQQX",
- "EObjjvbdtlYWaTaX",
- "DnbkKvbdMowpunGs",
- "EObkKvbdSLYeuHKs",
- "EObkKvbdTAEhhCOd",
- "EPCkKvbdmSYtyrci",
- "DncLKvbdYkqcsnLm",
- "DoDLKvbdrylQTAgn",
- "DncLKvbdJXtCIMRQ",
- "EObkKvbdSBdElIyL",
- "DoDLKvbdwygefYFS",
- "DncKjvbdyXhibPzL",
- "EPCjjvbduaDxsPFI",
- "EObjjvbdZoNiFEzK",
- "EPCjjvbdkNBkyeHP",
- "EPCkKvbdWRnXadlD",
- "DncLKvbdRWmdDLhD",
- "DnbkKvbdmSYtzTDi",
- "EOcKjvbdkVwODbXw",
- "DncLKvbdQlxCZOUz",
- "EObjjvbdbhlijfXY",
- "EOcLKvbdXmqAXtut",
- "EOcLKvbdmbKXXnnV",
- "DoDKjvbdkHgMFfOL",
- "EPCkKvbdfekymgHA",
- "DoCjjvbdeKKRvUzn",
- "DoDKjvbdkHfkefNk",
- "DoCjjvbdyqPMiKXA",
- "DnbjjvbdUQqOtuIN",
- "EOcKjvbdEPCkKwDE",
- "DoDLKvbdZRNFIleR",
- "DnbjjvbdRacdlJZL",
- "EOcLKvbdTukoitAq",
- "EOcLKvbdZLrDtOMN",
- "EOcLKvbdgKfzcGAE",
- "EObjjvbdzjVQQESt",
- "EOcLKvbdcIlijevx",
- "EOcKjvbdGKdsDHmV",
- "DncLKvbdKkBHvAJy",
- "EOcKjvbdZMRctOLm",
- "EPCkKvbdADRxKZiQ",
- "EObjjvbdDwxLsssl",
- "EPDLKvbdUxgszLPO",
- "EPCkKvbdSQTfiedX",
- "EPCjjvbdNeEUJIkE",
- "DoDLKvbdpyPHfqDx",
- "DnbkKvbdyOShXsJD",
- "DncLKvbdLiBkpxAS",
- "DoDKjvbdaaWEepQX",
- "DoCjjvbdWSOYBeLc",
- "EOcKjvbdLFegbAqV",
- "EPDKjvbdffLzOGgA",
- "EObkKvbdFkErbglu",
- "DncLKvbdiZuFlROG",
- "DncKjvbdegkWRnQg",
- "DoDLKvbdQdDApRDr",
- "EOcLKvbdeYZtURez",
- "EObjjvbdrXQLcIxq",
- "DoDLKvbdxZhGGXeS",
- "DoDLKvbdGGKSOItR",
- "EObjjvbdjhHLfFnL",
- "EOcLKvbdUQpoUuHm",
- "DoCkKvbdXrlBNUPY",
- "DoDKjvbdJXtCIMRQ",
- "DnbkKvbdZMSDsnLm",
- "DncKjvbdCTBDUGWr",
- "DncKjvbdbhlikGXY",
- "DoDKjvbdXmqAYVWU",
- "DnbjjvbdliDsqVRa",
- "DnbkKvbdmajXYOnV",
- "EObjjvbdJpyePGNe",
- "DnbkKvbdCTAcUGXS",
- "DoDLKvbdCDpBVjNG",
- "EOcLKvbdxwhiaoyk",
- "DoDKjvbdxVNFQyMO",
- "EPCkKvbdVvhwvEEg",
- "DnbkKvbdFWYoomJe",
- "EOcKjvbdlrZUysEJ",
- "EPDKjvbdqquKnKaN",
- "DoCkKvbdTkunaVoJ",
- "EOcLKvbdfHkVrOQg",
- "EPDLKvbdiUzFWrUb",
- "DoDLKvbdtAGqIABS",
- "DoCkKvbdZRMdhmEq",
- "DnbkKvbdNsUVfeVQ",
- "EPDLKvbdqwPkbiZR",
- "DoCkKvbdNUsSLNAX",
- "DncKjvbdmpZxvKyC",
- "EPCkKvbdLYqKSztf",
- "EPDKjvbdZyEKODMS",
- "EPDKjvbdNGbomPuL",
- "DncKjvbdZMSDtNlN",
- "EPCjjvbdTXjkmzjx",
- "EObkKvbdBdQAvKMf",
- "EOcLKvbdkySrTYgU",
- "DnbkKvbdZoOIddzK",
- "DoCkKvbdZMSDsmkm",
- "EPCkKvbdCWzdIdpW",
- "DncLKvbdBvzdIdov",
- "DoCjjvbdaRfDHtFk",
- "DnbkKvbdWeyZtAOs",
- "DoDLKvbdnCJwYPOV",
- "DoCjjvbdEYYLstUM",
- "EOcLKvbdwtldqZMO",
- "EPCjjvbdFVxoomKF",
- "EObkKvbdyqPMhiwA",
- "DoDLKvbdkxrrSxgU",
- "DoCjjvbdeATqNYKG",
- "DncLKvbdJKEAJpHE",
- "DoCkKvbddndsLUTr",
- "DnbjjvbdqFceUWBI",
- "DoDLKvbdhkddOUby",
- "DncKjvbdGKdrcIMu",
- "EPCkKvbdelevflik",
- "DoDKjvbdhaoDFWqR",
- "DoCjjvbdYlSDsmlN",
- "EPCjjvbdiZuGLpmf",
- "EObkKvbdnCJvxPNu",
- "DnbkKvbdhzUelRNf",
- "DnbkKvbdZeYGzgiC",
- "DoCkKvbdDnbkLWbd",
- "DnbkKvbdnHFYMmfy",
- "DoCjjvbdePEsKtTr",
- "DnbjjvbdZQmEhleR",
- "DnbkKvbdTkunaVoJ",
- "DnbkKvbdFWZPpMjF",
- "DoDKjvbdSwkMNzkY",
- "EOcLKvbdwtldpyMO",
- "EOcKjvbdhkdcmtby",
- "DoCjjvbdNQXqWNfs",
- "EPDKjvbdzjUpPdTU",
- "DnbjjvbdqceJPnWB",
- "EPDKjvbdUyHsyjoO",
- "EPCkKvbdZshhxcsO",
- "DncKjvbdqAiFAWgd",
- "EObkKvbdgFkzOGgA",
- "DncKjvbdmgFYNNgZ",
- "DoDLKvbdDjHjWYKA",
- "DnbjjvbdJbicRKCx",
- "DnbkKvbdfNFwHMjL",
- "EPCkKvbdWSNxBdlD",
- "EPDLKvbdCJKbLJFj",
- "EPDKjvbdEOcKkXDE",
- "EPCkKvbdVrOYCElD",
- "DnbjjvbdCIkBjhej",
- "DoDLKvbddoFTKstS",
- "DnbjjvbduDDVXVoP",
- "EObkKvbdxwiKCPzL",
- "DnbkKvbdZGvdAPTJ",
- "DoDLKvbdBdPaVjNG",
- "EOcKjvbdIHGzYwxH",
- "DoCjjvbdGFjSNhsq",
- "DnbjjvbdlYsSSxgU",
- "EPCjjvbdqrUjnKaN",
- "EOcLKvbdtvOXipsA",
- "DoDLKvbdrounjCuf",
- "DoCkKvbdFVyPomKF",
- "EOcKjvbdNHCpNPtk",
- "EPDLKvbdWeyZtAPT",
- "EPDKjvbdjcLkQfuH",
- "EOcLKvbdzHZMAMeX",
- "DoCjjvbdUMWPBVni",
- "EOcKjvbdHELWKBjK",
- "DoDKjvbdMgComQUk",
- "DnbkKvbdiGjDZWJu",
- "DncKjvbdyqOmJKXA",
- "DoDKjvbdVZITyjoO",
- "DoCjjvbdzQoNJJwA",
- "EOcLKvbdGAoQxizm",
- "DoDKjvbdatagYKsh",
- "EPDKjvbdSBceMJYk",
- "DoDLKvbdMpYQvOHT",
- "DncKjvbdiCOcFWpq",
- "DoCjjvbdUGznLvvF",
- "EPDLKvbdANIYrvyx",
- "EPCjjvbdIwtCHkpp",
- "EObkKvbdJSyBSmYM",
- "EObkKvbdwuMdqYlO",
- "EObjjvbdmuVZkKSG",
- "DncLKvbdSPsfjFdX",
- "DoDLKvbdSQUHJedX",
- "DoDKjvbdiVZdwSUb",
- "EPDLKvbdRjxfVGkT",
- "EObjjvbdmpZyVkZC",
- "DncLKvbdhzUelROG",
- "EPCkKvbdxVMeRZMO",
- "EOcKjvbdxxIiapZk",
- "EOcKjvbdJSyBTNYM",
- "EPDKjvbdMSXMzUpz",
- "EObkKvbdJmADzHVB" };
-
- public static void main(java.lang.String[] unused) {
- try {
- BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream("bad.out"));
- for (int i = 0; i < strings.length; i++) {
- out.write(strings[i].getBytes());
- out.write("\n".getBytes());
- }
- out.close();
- } catch (Exception e) {
- System.out.println("Some exception occurred");
- }
- }
-}
diff --git a/hotspot/test/runtime/7158800/InternTest.java b/hotspot/test/runtime/7158800/InternTest.java
deleted file mode 100644
index d0cd1c0..0000000
--- a/hotspot/test/runtime/7158800/InternTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 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.
- *
- * 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 7158800
- * @run shell/timeout=400 Test7158800.sh
- * @summary This test performs poorly if alternate hashing isn't used for
- * string table.
- * The timeout is handled by the shell file (which kills the process)
- */
-import java.util.*;
-import java.io.*;
-
-public class InternTest {
- public static void main (String args[]) throws Exception {
- final String badStringsFilename = "badstrings.txt";
-
- if (args.length == 0 || (!args[0].equals("bad") && !args[0].equals("normal"))) {
- System.out.println("Usage: java InternTest [normal|bad]");
- System.exit(1);
- }
-
- FileInputStream fstream = new FileInputStream(badStringsFilename);
- DataInputStream in = new DataInputStream(fstream);
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
- String toIntern, toDiscard;
- int count = 0;
- long current = 0L;
- long last = System.currentTimeMillis();
-
- if (args[0].equals("bad")) {
- while ((toIntern = br.readLine()) != null) {
- toDiscard = new String((new Integer((int)(Math.random() * Integer.MAX_VALUE))).toString());
- toIntern.intern();
- count++;
- if (count % 10000 == 0 && count != 0) {
- current = System.currentTimeMillis();
- System.out.println(new Date(current) + ": interned " + count + " 0-hash strings - last 10000 took " + ((float)(current - last))/1000 + "s (" + ((float)(current - last))/10000000 + "s per String)");
- last = current;
- }
- }
- }
- if (args[0].equals("normal")) {
- while ((toDiscard = br.readLine()) != null) { // do the same read from the file to try and make the test fair
- toIntern = new String((new Integer((int)(Math.random() * Integer.MAX_VALUE))).toString());
- toIntern.intern();
- count++;
- if (count % 10000 == 0 && count != 0) {
- current = System.currentTimeMillis();
- System.out.println(new Date(current) + ": interned " + count + " normal strings - last 10000 took " + ((float)(current - last))/1000 + "s (" + ((float)(current - last))/10000000 + "s per String)");
- last = current;
- }
- }
- }
- in.close();
- }
-}
-
-
diff --git a/hotspot/test/runtime/7158800/Test7158800.sh b/hotspot/test/runtime/7158800/Test7158800.sh
deleted file mode 100644
index 81fa7ac..0000000
--- a/hotspot/test/runtime/7158800/Test7158800.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 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.
-#
-# 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.
-#
-#
-# Run test for InternTest.java
-#
-
-if [ "${TESTSRC}" = "" ]
-then TESTSRC=.
-fi
-
-if [ "${TESTJAVA}" = "" ]
-then
- PARENT=`dirname \`which java\``
- TESTJAVA=`dirname ${PARENT}`
- echo "TESTJAVA not set, selecting " ${TESTJAVA}
- echo "If this is incorrect, try setting the variable manually."
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
- ;;
- Windows_* )
- NULL=NUL
- PS=";"
- FS="\\"
- ;;
- CYGWIN_* )
- NULL=/dev/null
- PS=";"
- FS="/"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-JEMMYPATH=${CPAPPEND}
-CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
-
-THIS_DIR=`pwd`
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
-
-${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}InternTest.java
-
-cp ${TESTSRC}${FS}badstrings.txt .
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -XX:+PrintStringTableStatistics -XX:+TraceSafepointCleanupTime InternTest bad > test.out 2>&1 &
-C_PID=$!
-
-sleep 60
-
-ps | grep ${C_PID} | grep -v grep
-
-if [ $? = 0 ]
-then
- kill -9 ${C_PID}
- echo "Test Failed"
- exit 1
-else
- echo "Test Passed"
- exit 0
-fi
diff --git a/hotspot/test/runtime/7158800/badstrings.txt b/hotspot/test/runtime/7158800/badstrings.txt
deleted file mode 100644
index d7f76fb..0000000
--- a/hotspot/test/runtime/7158800/badstrings.txt
+++ /dev/null
@@ -1,30001 +0,0 @@
-EOcLKvbddZyPxYpb
-DncLKvbdPxmAGrqj
-DoCjjvbdpxoIHQdY
-EPCkKvbdqYoHfqEY
-DnbkKvbdezvYdiUX
-DnbjjvbdeEoRbXCj
-EObkKvbdbsCkUEKB
-EOcLKvbdnUtyjiqf
-DncLKvbdRWnDcMHc
-DoCkKvbdrSUkOLAm
-DncLKvbdfNFwGmJk
-EPDLKvbdvAdYroFI
-DoDLKvbdiGibyViu
-DncLKvbdYqNEhmFR
-DoCkKvbdEARhlzXX
-DncLKvbdSZjHsCvA
-DncKjvbdqTsgRqkU
-DnbjjvbdqAiFAXHd
-EPDKjvbdGcjvJaij
-DnbkKvbdwtldpxkn
-DoDKjvbdYkrETnMN
-EPCjjvbdbBWEfQQX
-EPCjjvbduMXwAtBX
-DncLKvbdbsCkTcia
-DoCjjvbdczYpYZRC
-EOcKjvbdFeiqmhsq
-DoCkKvbdKCicQibx
-EOcKjvbdZLrEUOLm
-DoCjjvbdaNKbStmH
-DoDKjvbdJbjDQjDY
-EPCkKvbdemFwGmKL
-EPDKjvbdZQleImEq
-DncKjvbdZjShPfbG
-DnbjjvbdqYnhHREY
-DoCkKvbdaRfDIUGL
-DoDKjvbdLrWlyuQz
-DnbjjvbdZisHofaf
-EObjjvbdhtydvrUb
-DnbjjvbdRotHKGEX
-EObjjvbdNeEThhkE
-EPCjjvbdZtJJZESn
-DoDKjvbdnPyxvLYb
-EPDKjvbdeEoRbWbj
-EOcLKvbdFxttaEXb
-EObjjvbddwystRez
-EPCjjvbdJpzEnenF
-DnbkKvbdTppntuIN
-EPCkKvbdTukpKUBR
-DnbkKvbdhlFEOUcZ
-EObkKvbdlhdUQuRa
-DnbjjvbdkClKqHUg
-EOcKjvbdqTtGqqkU
-DncKjvbdtkwvaUBX
-DoDKjvbdsQWOjCuf
-DncLKvbdEKIJuwjA
-DncKjvbdGLErcIMu
-EOcLKvbdNPwpumfs
-EObkKvbdnVUzLJrG
-DoCkKvbdcTDKsdKB
-DncKjvbdKRZdoFme
-EOcLKvbdemFvgNKL
-EPCkKvbdznopdblY
-EPDLKvbdOYPVzdOU
-DnbjjvbdsZlPsAhO
-DoDLKvbdKCjDRKDY
-DoCkKvbdhuZeXSVC
-EPDKjvbdOStVgEtp
-DncLKvbdvwMAvBWV
-EPDKjvbdBcoaWJlf
-EOcKjvbdZxdKODMS
-DoCjjvbdbsCkTcjB
-EOcLKvbdwWlAuaWV
-DnbjjvbdFejRnJUR
-DnbjjvbdmIdTqVSB
-DnbkKvbdqBIeAWhE
-DncKjvbdrMzJyMIJ
-DoCkKvbdZGvdAOsJ
-DncLKvbdjggLfFnL
-DoCjjvbdYqNFJMdq
-DoCkKvbdqZPHfqDx
-DncLKvbdOEdThiLE
-DoCkKvbdZirgpGaf
-EPDLKvbdziuQPdSt
-EObkKvbdKQyeOenF
-DoDLKvbduaDySndh
-DoCjjvbdVUNUGLvK
-DncKjvbdAMhYrvzY
-DnbkKvbdnQZxvKxb
-EPCjjvbdBhjakJFj
-DncLKvbdmfeYNNfy
-DoDLKvbdjlbLydfo
-DoDLKvbdpyPIGpcx
-EOcLKvbdnVUzLJqf
-DoCjjvbdmJETqVSB
-DoDLKvbdJTZAsMxM
-DoCkKvbdnQZxvLZC
-DoDKjvbdACqwizJQ
-DncKjvbdvBEZSoFI
-DncKjvbdGckVjCJj
-DncLKvbdiMFENtcZ
-Dnbjjvbdjuvmcaww
-DnbkKvbdZyEKNblS
-DoCjjvbduMYXBUBX
-DnbjjvbdFWYopNJe
-DoDKjvbdelfXGljL
-DnbjjvbdakLenmcA
-EPDKjvbdfILWRmpg
-EObjjvbdSLYeuHLT
-DoCjjvbdMfbolotk
-EPDLKvbdrRuKnKaN
-EOcKjvbdyzdnRhIh
-DoDLKvbdGAoRZJzm
-DoCjjvbdhlFDnUcZ
-EPDLKvbdmpZyVkYb
-DncKjvbdTpqPUuIN
-DncLKvbdHDjvJaij
-EPDLKvbdYlRcsmkm
-EPDLKvbdvlvAMdFN
-DncKjvbdIsZArmYM
-EOcLKvbdegjuqnQg
-EOcLKvbdZQmFJNFR
-DoCjjvbdZxdJmcMS
-EPCkKvbdlZTSTYgU
-DoDKjvbdqceJPnWB
-DncLKvbdVgwuxGxz
-DncKjvbdDnbkLXDE
-EPDLKvbdatbHYKsh
-DncKjvbdEzsqFLbi
-EPDLKvbdnVVZkKRf
-EOcKjvbdKeegbBQu
-EPCkKvbdKfGHaaRV
-EPDKjvbdmIctRVRa
-EPCjjvbdRMxBxnUz
-DnbjjvbdJYTbILpp
-EPCkKvbdTAEiHbPE
-EOcLKvbdfelZnGgA
-DoCjjvbdOStWGeUp
-EOcLKvbdemGXHNJk
-DoDKjvbdYTMAmUOx
-EPCkKvbdpyOhGpcx
-EPCkKvbdAMgxsWzY
-DnbjjvbdYkrETnMN
-EPDLKvbdUQqPUtgm
-DncKjvbdehKurNqH
-DoCjjvbdZMSETnLm
-DoDKjvbdIHGyyXwg
-EObjjvbdXGYzUAPT
-DoCjjvbdhbPCeWqR
-DoCkKvbdKNADzGuB
-DnbjjvbdFeirOJTq
-DncLKvbdaRecHtFk
-DnbkKvbdzoPpeClY
-EObkKvbdZRMeJMeR
-DnbjjvbdYfvdAPSi
-DncLKvbdJcKCqJcY
-EOcLKvbdqvokbhyR
-DoDLKvbdrRuLNjaN
-DoCjjvbdTlWPBWOi
-DoCkKvbdjvWnEBxX
-DoDLKvbdTkunaVoJ
-DoCkKvbdQZNAHTSK
-EObjjvbdqwPkbhyR
-EOcLKvbdNHDPlpUk
-DncLKvbdIHHZxxYH
-DncLKvbdtkxXAtAw
-DncLKvbdSCEFMJZL
-DnbjjvbdZQmEhldq
-DoCjjvbdNGbolotk
-DnbjjvbdnCKWwnmu
-DncLKvbdzHZMANEw
-DoDKjvbdmttykJrG
-DnbkKvbdlrZUzSci
-EPDKjvbdSKyGVHKs
-DoCjjvbdKVuGEFGi
-EPCjjvbdCIkBkIej
-DncLKvbdzHZMAMeX
-DnbkKvbdaSFbgsek
-DncLKvbdHDjujBij
-DoDKjvbdGZVUaDwb
-DnbjjvbdZnnJFEzK
-DoCkKvbdtcDUwWOo
-DoCkKvbdlBMoNALA
-EOcKjvbdNsUWHFUp
-DoDLKvbdVUNUFlVj
-DnbkKvbdhkdcnUcZ
-DncLKvbdLiBkqYAS
-EOcKjvbdzoPpdcLx
-EPDKjvbdijGIJmXr
-EOcKjvbdZisHofaf
-DoDLKvbdeOdrkUUS
-DoDLKvbdnPyxvKxb
-EPDKjvbdIxUBhMRQ
-DncLKvbdlhctRUqa
-DoDLKvbdmgFXlnGy
-DncKjvbdCJKbKiGK
-EOcLKvbddndrjtUS
-DnbjjvbdkDLjqGuH
-DncKjvbdmIcsptqa
-DoCkKvbdvvlAvBWV
-EObjjvbdjblLQftg
-DnbjjvbdCEQBWKMf
-DnbjjvbdBdPaVilf
-DoCkKvbdZxcjODLr
-DoCkKvbdEObjjwCd
-EPDKjvbdyTNhlqbH
-EPCkKvbdUMVoAvPJ
-DncKjvbdUxhUZjoO
-DncKjvbdqqtjmkAm
-DncKjvbdKfGICBRV
-EPCjjvbdVrOXaeLc
-EPDLKvbdwXLaWBWV
-EPCkKvbdjblKqHUg
-DnbjjvbduDCuWuoP
-EPDKjvbdNGbpMouL
-EObjjvbdBcoaVjNG
-DncLKvbdrWpMDIxq
-DncLKvbdhaoCdwRR
-DnbkKvbdFxtuBDwb
-DncKjvbdIjEAKPgE
-EOcLKvbduCbuXVoP
-DoDKjvbdZtIiZDsO
-DnbjjvbdEztRElCi
-DncLKvbdxmsHwsJD
-DnbjjvbdRbEElIxk
-DoDKjvbdWHwvXgYz
-EOcKjvbdQlwbYnUz
-EOcLKvbdVTltFkuj
-DncKjvbdliETptqa
-DnbkKvbddoErjtTr
-DoCkKvbdgPazvdXh
-DncKjvbdySmhlqag
-DoCjjvbdbPgHDkzd
-DoCkKvbdFWZPomKF
-EObjjvbdssSSxydc
-EObjjvbdzQnliJwA
-EObkKvbdKCjCpibx
-EPCjjvbdpyOhHREY
-DncLKvbddjJqutzn
-EObkKvbdBdQAujMf
-EPCkKvbdLAjflbXq
-DncLKvbdLBLGlaxR
-DoDLKvbdrpWPJbuf
-DoCjjvbdEKHiuxKA
-DoCjjvbdXsMAlsnx
-EObkKvbdptTgSSLU
-DoDKjvbdnHFXmNfy
-DncKjvbdCJKbKhej
-EPCjjvbdhlEdOUby
-EOcKjvbdKWUfEFGi
-DoDKjvbdZQmFJMdq
-EPCjjvbdiGjDZWKV
-EObkKvbdVAbQrprZ
-DoDKjvbdfekzNgHA
-DoDLKvbdnHEwlmgZ
-DncKjvbdwzHeexEr
-DoCjjvbdmpZxujyC
-EPDKjvbdwMvAMcdm
-DoCjjvbdfHkVrNqH
-EPCkKvbdYzbfRiuy
-EPCkKvbdZtIiZDrn
-DnbjjvbdjvWnDbYX
-DoCjjvbdOStVgEtp
-EPDLKvbdZMSETmlN
-EPDKjvbdBhjajhej
-EPCjjvbddoFTLUUS
-DnbkKvbdsQVoJcWG
-EPCjjvbdrEFJQNvB
-DoCjjvbdMpYRWOGs
-EOcLKvbdZirgpHBf
-EPDLKvbdyOTIXsJD
-DoCkKvbdKRZdnfNe
-DnbjjvbdbBWFFoow
-EPCjjvbdgFlZnHHA
-DnbkKvbdGGJrOIsq
-DoDLKvbduDCtwWPP
-EObjjvbdNddUIhjd
-DnbjjvbdxsNiMqag
-EObjjvbddeOrCWbj
-EObjjvbdPxmAGsRj
-EOcLKvbddeOrCXDK
-DoDLKvbddeOrBwCj
-DoCjjvbdVqnYCElD
-DnbkKvbdUyIUZjoO
-EObjjvbdeFOrCXDK
-EObkKvbdVrNxCFLc
-EObjjvbdTfzmkwWF
-EOcKjvbdIHGzZYYH
-EPDKjvbdtbbuXWPP
-DoCjjvbdZisIQHBf
-EObjjvbdbsCkUDjB
-EPCkKvbdVwJXudFH
-EPDKjvbdrouoKDVf
-EPCkKvbdFyVVBEYC
-DncLKvbdZnnIeEzK
-EPDLKvbdxVNFQxkn
-DoDKjvbdpxnggRDx
-DoDLKvbdqZOgfpcx
-DncKjvbdCIjakJGK
-EPCkKvbdCJLBjhej
-DoDLKvbdnPzYvKxb
-EOcKjvbdqTsgSRkU
-EOcLKvbdLBLGlaxR
-DoDLKvbdcbTMrAUN
-DncLKvbdzitoodSt
-DoDKjvbdJvUfDdfi
-EOcLKvbdHDjvKCJj
-EPCkKvbdeOeTKssr
-DnbkKvbdlYrqsYft
-DncLKvbdiiehKMxS
-DncKjvbdURQoVUhN
-DnbkKvbduMYXBUAw
-DoDLKvbdSPtHJfEX
-EObkKvbdqBJFAWgd
-EOcKjvbdFpATWgFy
-DoDLKvbdBsBDTfXS
-DncKjvbdjhHLfFmk
-DoCjjvbdCJKakIfK
-DnbkKvbddoFSjtTr
-EObkKvbdANIYsWzY
-EObjjvbdCTAbtFvr
-EObjjvbdrRtkOLAm
-DnbkKvbdkxsSTYgU
-DoCjjvbdnBiwXnmu
-EObjjvbdwtmEqYlO
-EPDKjvbdrylQTAhO
-DoDLKvbdtbbtvvOo
-EPCjjvbdZLrETmlN
-EPDLKvbdWXJYWDdg
-DoCkKvbdKQzFOfOF
-EPCjjvbdwzIFfXeS
-DncKjvbdRjyFuHLT
-EPDLKvbdULunaWPJ
-DncKjvbdUxhTykOn
-DnbkKvbdJcKCqKDY
-EPDLKvbdcbSmSATm
-DnbkKvbdegjurNqH
-EPDKjvbdZjTIQGbG
-EPCjjvbdiLddNuCy
-DoCjjvbdZQldiNEq
-EOcLKvbdakMGPODA
-EObjjvbdnHEwlmgZ
-EOcLKvbdBsAcUGXS
-EPCkKvbdiVZdwSUb
-EOcLKvbddCTNSAUN
-DnbkKvbdEXxMUUUM
-DncKjvbdYpldiMeR
-DoDKjvbdNddTiIjd
-DoDLKvbdZLqdUNlN
-EPCkKvbdiBncFWpq
-DncLKvbdiCPDEvqR
-EOcKjvbdUyHszKoO
-DncKjvbdhtydvqtb
-EPCjjvbdpxoHgQcx
-EObkKvbdkWWnDaxX
-DnbjjvbdBhkBkJFj
-DoCkKvbdRacdkhyL
-EOcLKvbdZjTHpHCG
-EPCkKvbdMowqWOGs
-DncLKvbdegjurNpg
-EObjjvbdfMfWfmKL
-EPDLKvbdZirgpGaf
-DoDLKvbdiZuFlQnG
-DncLKvbdFxuVAcxC
-EObkKvbdZisHofaf
-EOcKjvbdJSyBSmYM
-EPDLKvbdVYgtZkPO
-EOcKjvbdRbEFMJYk
-DncLKvbdrEFIonWB
-DncKjvbdKDJbqJcY
-EOcLKvbdhfjCxuiu
-EObjjvbdLLAhWAKZ
-DoCkKvbdRXNcblID
-DoDLKvbdcbSmSATm
-EOcLKvbdwWlAvAuu
-EObkKvbdiBnbdvpq
-DoCkKvbdNQXpumgT
-DncLKvbdkVwOECYX
-DnbkKvbdfoazwDxI
-DoDLKvbdbBWFFpPw
-DoDLKvbdvBDxsPEh
-EPDKjvbdJqZdoFme
-DoDLKvbdIryArmXl
-EPCjjvbdANIZSwZx
-EPCkKvbdVhYVxGxz
-DncKjvbdLAjgNCYR
-DncKjvbdxxIjCQZk
-DncKjvbdbiNKKewY
-EPCjjvbdlrZVZsEJ
-EPDKjvbdIryAsMwl
-DoCkKvbdtAHRIAAr
-EPDKjvbdJmAEZfuB
-EPCkKvbdZjSgogBf
-DoDLKvbdOXnuzcnU
-DnbkKvbdehKvRnQg
-EObjjvbdZyDimbkr
-DoDKjvbdmajWwoOV
-EOcKjvbdkMalZeHP
-EOcKjvbdIjEAJpHE
-EPCkKvbdDihKVxKA
-DncKjvbdNddUIiKd
-EObjjvbdqdFIpOWB
-DoCkKvbdxnShXsJD
-DoDLKvbdjmBkzEfo
-EOcLKvbdatagYLTh
-DoCjjvbdVhYVxHYz
-DnbjjvbdJbjDRKDY
-EPCjjvbdLBLHNCYR
-DnbjjvbdnGeYNOGy
-EOcLKvbdUsmTekvK
-EPCjjvbdtkxXBTaX
-EPCjjvbdzoPqFCkx
-DncKjvbdCIjbKhej
-DncKjvbdZLqdTmkm
-DoDKjvbdsPunicVf
-EOcKjvbdmgFXmNgZ
-EObkKvbdiMFENuCy
-DoDKjvbdhanbeXRR
-EObkKvbdACqwiyhp
-DncKjvbdZisIQHBf
-EPCjjvbdgQBzwDwh
-DnbjjvbdyYJJaoyk
-DoDKjvbdxUldqZMO
-EObkKvbdkClLQgVH
-EPCjjvbdZQldiMeR
-EPDLKvbdZyEKOClS
-EPDLKvbdcIlikFvx
-DoDKjvbdrzMQTBHn
-DnbjjvbdVYgtZkPO
-DoDLKvbdHEKuiajK
-EPCkKvbdczZQXxqC
-DoDKjvbdrDdiQNua
-DncLKvbdcImKLGWx
-DoCjjvbdVYgtZkPO
-EPDLKvbdZnnIeFZj
-EPDKjvbdMIakqYAS
-DoCkKvbdSLYfUgLT
-EPDLKvbdiCObdvpq
-DnbjjvbdRpUHKFcw
-DoDLKvbdIHHZyYXg
-EPCjjvbdypoMhiwA
-DnbkKvbdCEPaVjMf
-DnbkKvbderAvzlDP
-DnbkKvbdZQleImFR
-EOcKjvbdKRZdneme
-DoDLKvbdiBnbeXQq
-DncLKvbdEPDKjvcE
-EOcLKvbdauCGwkTh
-DncLKvbdEvZQPmJe
-EPCkKvbdURQnuVIN
-DncLKvbdegjvSOQg
-EPCjjvbdKaKgMawq
-DnbkKvbdRzKISbvA
-DncLKvbdiLdcnUcZ
-EPDLKvbdkDMKpfuH
-DoDLKvbdRbDdkhyL
-DnbjjvbdDwxMUUTl
-DnbkKvbdrpWPKCuf
-DnbkKvbdNVSqjmAX
-DoDKjvbdRbDeMIxk
-EOcLKvbdcyxpXyRC
-DncLKvbdRMwbYnUz
-EObjjvbdqlzJxlHi
-DoCkKvbdJYUCIMQp
-DncLKvbdLZQjSzuG
-EOcKjvbdxVNEqYkn
-DnbkKvbdZoOIeFZj
-DoCjjvbdBraCtFwS
-EOcLKvbdliDsqVSB
-EPCkKvbdeATqNXif
-DncLKvbdkMbLydgP
-EObjjvbdZxdJmbkr
-DoCjjvbdraellHLZ
-EObkKvbduDCuWvPP
-DoCkKvbdpstGrSLU
-DoCjjvbdLGFgbBQu
-DnbkKvbdhtzFWquC
-EObjjvbdoAKztHdO
-EPDLKvbdatafxKtI
-EPDKjvbdkWXNcaww
-DoCkKvbdwkXEHzzG
-EObkKvbdmgEwmNgZ
-DncKjvbdBiLCLJFj
-DoCjjvbdeOdsKssr
-EOcLKvbdfILWSORH
-EObkKvbdCDpAujMf
-EPDKjvbdKDKDQibx
-DoDKjvbdVUMtGLuj
-EObkKvbdrXQMCiYq
-DncKjvbdePEsLTtS
-DncLKvbdDxYLtUTl
-EPCkKvbdGYuVBEYC
-DncLKvbdNeEUIiKd
-EPCkKvbdpxoIHRDx
-EObjjvbdFkEsDHlu
-EObjjvbdssSSxzFD
-DoCkKvbdUtNTfMVj
-DnbjjvbdJcKDRKDY
-DncKjvbdqiAKEmOe
-DoDKjvbdtlXwAtBX
-DnbkKvbdxmsIYTIc
-EObkKvbdLrXMzUpz
-DoCjjvbdkxsSSxft
-DncKjvbdQlwaxnUz
-EObkKvbdjhGlFfNk
-EPCkKvbdxsNhmRag
-DoDLKvbdMfcPmQUk
-DoDKjvbdQvnEDLhD
-EObjjvbdVgxVxHYz
-DoDLKvbdlrYtyrdJ
-DoCjjvbdezvYeIsw
-DncLKvbdNddTiIjd
-EPDLKvbdGGJrNiUR
-EPDLKvbdRzJhTDWA
-EPCjjvbdvvkaWBVu
-EOcKjvbdRXNdCkgc
-EOcKjvbdQZNAHTSK
-EPCkKvbdsCGNLfkZ
-EOcLKvbdDwwktTsl
-EOcLKvbdqlzJyLgi
-EOcLKvbdxsNiMqag
-EOcLKvbdhzVFlROG
-EOcKjvbdEztRFMCi
-DnbkKvbdqiAJdmPF
-EPDLKvbdjcMKqGtg
-EObkKvbdTlWOaWOi
-EPDLKvbdURRPUuHm
-DoDKjvbdelfWgNKL
-EOcLKvbdGAnqZJzm
-EObjjvbdGZUuAdXb
-DoDLKvbduLwwAtAw
-DoCjjvbdZjTIQGbG
-EPCjjvbdRNXbYnUz
-EPDLKvbdiLeENtby
-EObjjvbdMowpunGs
-EOcKjvbdbiNJjevx
-DoDKjvbdEYYLstTl
-DoDLKvbdqUTfrRjt
-DoDKjvbdbsCkUEJa
-DoDKjvbdXsMBNUPY
-EPCjjvbdRNXaxnUz
-DoDLKvbdNGcQNQUk
-DnbjjvbdEARiMywX
-EPDKjvbdSKxfUfkT
-DncKjvbdhtyeXRtb
-DncKjvbdZLqcsnLm
-EObkKvbdZnmheEzK
-EObjjvbdtbcUvuno
-DnbjjvbdrzMQTBHn
-DnbjjvbdDwwktTsl
-EPDKjvbdkxsSTYgU
-DoDKjvbdIryArlxM
-DoDKjvbdnBivxOnV
-DoDKjvbdeATplwif
-EOcLKvbdKeegbApu
-EPCjjvbdMgDQMotk
-DoCjjvbduCbtwWOo
-DnbkKvbdyNsHwrhc
-DnbkKvbdtvNxJpsA
-EOcLKvbdqAheAWgd
-DoCkKvbdURQoUtgm
-EOcKjvbdqceIpOWB
-DoCkKvbdVwIwudFH
-DnbkKvbdbLMFnmcA
-EOcLKvbdZjTHpHBf
-EOcKjvbdRXNdCkhD
-EPDLKvbdiHJcZViu
-DoCjjvbdxxIjCPzL
-DnbkKvbdBcpBWJmG
-EPCkKvbdZyEKOCkr
-EPDKjvbdOTUWHFVQ
-DoCjjvbdIGgZxwwg
-EPDLKvbdFjeSbhMu
-EPDLKvbdhgKCxvJu
-EOcLKvbdNsUWGdtp
-EPDKjvbduVnXipsA
-DncLKvbdGYuVBEXb
-EPDLKvbdZtIhyESn
-DoDKjvbdZxdJmcLr
-DoCjjvbdUsltGLuj
-DoDKjvbdDoDLKvbd
-DncLKvbdrDdhpNvB
-EPDLKvbdKCjDRJbx
-DoDLKvbdxLWdHzyf
-EObkKvbdrzMQTAhO
-EOcLKvbdOFDtJJKd
-EPCkKvbdrSVKmjaN
-EOcKjvbdWWiYVdEg
-EOcKjvbdWWhwvDdg
-DncKjvbdpstHRqjt
-EPCkKvbdKWVFceGi
-DoCkKvbdZjShPfbG
-DoCkKvbdSxKlNzkY
-EPDLKvbdIwtCHkqQ
-EOcKjvbdsCGNLgLZ
-DncKjvbdzaAOfgCM
-DoDLKvbdxmrhYSiD
-DncLKvbdfMfWgMjL
-EPDKjvbdqFdEsuaI
-EOcLKvbdiLeDnUcZ
-DoCjjvbdKVuFceHJ
-DoCjjvbdfekzNgHA
-EOcKjvbdOFEThiLE
-EPDLKvbdqceJPnWB
-DoDLKvbduCbtwWOo
-DncKjvbdTqROtuIN
-DncKjvbdpedFUWBI
-DoDLKvbdrEFJQNua
-DoDLKvbdyXhjCPyk
-EPCkKvbdJYUBhLqQ
-EPCkKvbdtcCuXVno
-DoDLKvbdZLrEUOLm
-EPCkKvbdpstGrRjt
-DncLKvbddePSCXCj
-EObkKvbdauCHXjsh
-DoDLKvbdkHfkefNk
-EObjjvbdMRwMzUpz
-EObjjvbdaMkCTVNH
-DoCkKvbdGGJrNhtR
-EPDLKvbdvBDxrneI
-EPDLKvbdIHHZxwxH
-EOcLKvbdrJAJdmPF
-EOcKjvbdGZUuAdXb
-EOcLKvbdbUbHYLUI
-DnbjjvbdJzofYEAN
-EPDKjvbdFxtuBDxC
-DnbkKvbdQvnDbkgc
-EPDKjvbdJmADzGta
-DoDKjvbdZRMdhleR
-DnbkKvbdsrqsZZeD
-EObkKvbdrovPJbuf
-EPCjjvbddeOqbXCj
-EObjjvbdtcDVXVoP
-DncKjvbdMfbpNQVL
-DoCkKvbdhbPCeXQq
-DoCkKvbdNHComQVL
-EObjjvbdvBDxroFI
-EPCjjvbdnBivwoNu
-EObjjvbdbhljKewY
-EPDKjvbdZyDimcMS
-EObkKvbdWSOXbElD
-EOcKjvbdTfznMXVe
-EPCjjvbdZtJJYcsO
-DoCjjvbdRjxfVHLT
-DoCkKvbdVTltGMVj
-DncKjvbdYfwEAOri
-DncKjvbdYkrEUOMN
-EObkKvbdqGEEsuaI
-DncLKvbdjJfHimXr
-EPDLKvbddndsLUTr
-DnbkKvbdqBJFAWhE
-EPDLKvbdEOcKjwDE
-EPCkKvbdtvOYJqTA
-DncLKvbdkyTRsZHU
-DoCjjvbdTppnuVIN
-DncLKvbdwyhFeweS
-DncKjvbdsBelkgKy
-DoCjjvbdKDKCqJcY
-DoCjjvbdkClKqHVH
-DoCjjvbdcTCjtDia
-EPDLKvbdUVkpJtAq
-EPDLKvbdRyjITCvA
-DnbjjvbdJuuFcdgJ
-DoDKjvbdrJAJdmOe
-DncKjvbdJcJbqKCx
-DoDLKvbdJcJbqJcY
-DoDKjvbdeEoSCXDK
-DoDLKvbdSwjlNzkY
-EObjjvbdzitopDrt
-DoCkKvbdKWVGEEgJ
-DncKjvbdpssfqrKt
-EOcLKvbdUMWPBVoJ
-DncKjvbdyzdmrIIh
-EPCjjvbdxUldqZLn
-DoDLKvbdySnImRbH
-DoCjjvbdGdKvJaij
-DoCkKvbdxZgeewdr
-EObkKvbdiLddNuDZ
-DnbjjvbdSCDdkiZL
-DncKjvbdznpREcMY
-EOcLKvbdaRebhTfL
-DnbjjvbdZQldiMdq
-EPCjjvbdbrbjtEKB
-EOcKjvbdEARiMzXX
-DoDLKvbdXrkaNTnx
-EPCkKvbdQZNAHTRj
-DoDLKvbdEzspeLcJ
-EPCjjvbduVnYKRTA
-EObjjvbdJXtBhMQp
-EPDKjvbdeOdrjssr
-EPCjjvbdLqwMytpz
-EPDKjvbdUMVoBVoJ
-DncKjvbdRpUGifDw
-EPDLKvbdZyDinDLr
-DnbkKvbdNrsufeVQ
-EPCkKvbdZMSDtNlN
-EPCkKvbdySnJNSCH
-EPCjjvbdfMevfljL
-DncLKvbdXsMBNTnx
-DnbkKvbdpxoHfqDx
-DncLKvbdUQpntthN
-DncKjvbdIsZArlwl
-DoDLKvbdZGwEAOsJ
-EOcKjvbdVvhwvDdg
-EOcLKvbduWNxJqTA
-EPCjjvbdHEKvJaij
-DoDKjvbdrpWOjCuf
-DncLKvbdrpWOjDVf
-DoCjjvbdIHGzYwwg
-DoDLKvbdpxoIGqEY
-DoDLKvbdJcJbqKDY
-DoCjjvbdRWmdClHc
-EPCjjvbdFWYopNJe
-DncKjvbdmfdwlmfy
-DoCkKvbdxUleQxlO
-EObjjvbdnGdxMnGy
-EPCjjvbdvvlAvBVu
-DncLKvbddndsKssr
-EObjjvbdZMRcsnLm
-EOcKjvbdFxttaEXb
-DncKjvbdVUNTfMVj
-EOcLKvbdNrtWHFUp
-DoDKjvbdwuMdqYlO
-EPDLKvbdrXPkbhxq
-EObjjvbdrEFIpNua
-EObjjvbdziuQQDrt
-EOcLKvbdqYoIGpcx
-DnbjjvbdsQVoJcVf
-EObkKvbdkDMKpgUg
-EObjjvbdvBDyTPFI
-DncKjvbduCbuWvOo
-EPCjjvbdkVvnECYX
-DncLKvbdZGvdAOri
-DoCkKvbdrXPlDJZR
-EOcLKvbduCcVWvOo
-DoDKjvbdCEPaWJlf
-EPDKjvbddoErjssr
-DncKjvbdACqxKZiQ
-EPCjjvbdUVlPitAq
-EPDKjvbdjJfHjMxS
-EObkKvbdAMhYsWzY
-DoDKjvbdnBivxOmu
-EOcLKvbdbiNKKfXY
-EPDKjvbdYqMeIleR
-EObkKvbdJmADygUa
-EObjjvbdEPDLLWcE
-EPCjjvbdrXPkcIxq
-EOcLKvbdliDtQtqa
-DoCjjvbdmoyxujyC
-EPDLKvbddoFTLTsr
-EOcLKvbdCWzdJEpW
-DnbjjvbdrEEhpOWB
-DoDKjvbdZLrDtNkm
-EOcLKvbdLFfHbAqV
-EOcKjvbdmttzLKSG
-EOcLKvbdmbJvwoOV
-EOcKjvbdUaCQrqSZ
-DnbjjvbdmgExMnGy
-EPDKjvbddndrkUUS
-EObkKvbdDwwkstTl
-DoCkKvbdcJMjLFwY
-DnbjjvbdaNLBruMg
-DoDLKvbdQYmAHTRj
-DnbkKvbdsQWOicWG
-EObkKvbdMRwMzUpz
-DoDLKvbdZshiZDrn
-EPDLKvbdnPzYujxb
-EOcKjvbdCEQAujMf
-EPDLKvbdKefHbApu
-DoDLKvbdYpldiNFR
-DoCkKvbdFWZQQNJe
-DncLKvbdznpQeCkx
-EOcKjvbdnQZxvKxb
-DoCkKvbdVBBprpqy
-DnbkKvbdZirhPfaf
-DnbkKvbdegjvSNqH
-EOcLKvbdqdEiPnWB
-EObjjvbdBhkCKiGK
-EObjjvbdxZgfGYFS
-DnbjjvbdNQYQumgT
-EPCjjvbdxsNhlrBg
-DoCkKvbdQdDApRDr
-DoCkKvbdxxIiaoyk
-EPDKjvbdFeirNhtR
-DoCjjvbdegjvSOQg
-EObkKvbdqcdiQNvB
-DncLKvbdiMEdNtcZ
-DncLKvbdTqRPUthN
-EPCkKvbdwygeexFS
-DoDKjvbdyTOJMrBg
-DncLKvbdeEoRavbj
-EPCjjvbdtbcUvvOo
-EObjjvbdKCicRJcY
-EObjjvbdZyEKODMS
-DnbjjvbdmJDtQtrB
-DncLKvbdEARhlyvw
-DnbjjvbdIxTbILqQ
-EOcLKvbdwygefYFS
-DoCjjvbdznoqFCkx
-DoCjjvbdRpUGjGDw
-DncKjvbdhzVGMQnG
-EPCjjvbdhkeDnVCy
-EObkKvbdOEdUIiKd
-DncKjvbdrDeIomua
-DncLKvbdiHJbxuiu
-EPDKjvbddxZstRez
-EPDLKvbdmSYuZrdJ
-EObkKvbdVUNUFkvK
-EPDLKvbdNeEUJIjd
-DoCkKvbdiMEdNuCy
-DoDLKvbdRDcApQcr
-EPCjjvbdTlVoBVoJ
-EObjjvbdLBKgNBwq
-EPCkKvbdsCFllHKy
-EObjjvbdnVUzLJqf
-DoDKjvbdqrVLNkBN
-DoCkKvbdqFcdtWBI
-DncLKvbdbVCGxLTh
-EOcLKvbdeFPSCXCj
-EOcLKvbdRpTgKFdX
-EObjjvbdznpQeDLx
-EOcKjvbdjvXNcaxX
-DnbjjvbdHDkWJbJj
-DncKjvbdhkeENuDZ
-DnbkKvbdnUtyjjSG
-DoDKjvbdSQUHJfDw
-DncKjvbdbUbHYLUI
-EOcLKvbdNsTvGduQ
-EPDLKvbdSZigsCvA
-DncKjvbdMfcPlpUk
-DoDLKvbdxrnIlrBg
-DncKjvbdiLdcnVCy
-EPCjjvbdmfeYNOHZ
-DoCkKvbdjvWmcaxX
-DoDKjvbdbUbHXkUI
-DncKjvbdBhkBjiFj
-DoDLKvbdNHColpVL
-EOcKjvbdrykosAhO
-DncLKvbdqGDeUVaI
-DnbkKvbdhgJcZViu
-DnbjjvbduLxXAtBX
-EPCjjvbdYpleJNFR
-EPDLKvbdQvmdClHc
-DnbjjvbdJYTbIMRQ
-DncLKvbdznpRFDMY
-EOcLKvbdZnmiFEyj
-DnbkKvbdrRuLOLAm
-EObkKvbdhkeEOUby
-DncLKvbdYlSEUOLm
-DoCjjvbdhkdcmtby
-DncLKvbdddnrCXDK
-DoDLKvbdKaLHNCYR
-EOcKjvbdcyxpYZQb
-EPDLKvbdACqwjZhp
-DoCkKvbdBsBDTevr
-EObkKvbdeKJqvUzn
-EObkKvbdcImJkGWx
-DncLKvbdYSlAltOx
-DncLKvbdlrYtyrdJ
-EObkKvbdKxqJrztf
-EOcKjvbdsQWPJcVf
-DoDKjvbdkySqrxgU
-EObjjvbdeEoRbXCj
-EOcKjvbdHDkVjBij
-DoDLKvbdCTBCsfXS
-DoCjjvbdKCjDQibx
-DoCjjvbdlhdTqUrB
-DoDKjvbdTulQKTaR
-DoCkKvbdRjxetfkT
-EPCjjvbdEuyQQNKF
-EPCjjvbdDoDKkXDE
-DoCjjvbdsQWPJbuf
-DoDKjvbdhuZdvqtb
-EPDLKvbdiHKCyWJu
-EPDLKvbdLFegaaQu
-DoCjjvbdqZPHgRDx
-DncKjvbdUWMPjUAq
-DoDLKvbdTYKkmzjx
-DoDKjvbdegjvSOQg
-DnbkKvbdUtNTekvK
-EObkKvbdNsTvGeVQ
-DoDLKvbdfNFvgMjL
-EOcLKvbdZQmEiNEq
-EPDKjvbdBraDTfWr
-EPDKjvbdNGcQNQVL
-EPDLKvbdZyEKODMS
-EOcKjvbdBvzdIdpW
-EPCjjvbdACqwiyiQ
-DoCjjvbddePRawCj
-EPDKjvbdWWiXucdg
-DoDKjvbdWexzUAPT
-DnbjjvbdwXMBWBWV
-EOcLKvbdUyHszLOn
-EPCkKvbdOYOuzcnU
-EPCkKvbdhancEwQq
-DnbkKvbdjggLefOL
-EPCkKvbdFjdsDIMu
-DoDKjvbdrSUjmkBN
-DoDLKvbdZjTIQGaf
-DoDKjvbdMgDPmPtk
-EPDLKvbdWRmwbFMD
-DoCkKvbdzROmJKXA
-DnbkKvbdrDdiQNvB
-DnbjjvbduDCtwVoP
-EOcLKvbdCIjbLJFj
-EPDKjvbdXrkaMsnx
-EPDKjvbdVhXvXfxz
-DncKjvbdhbPDEwRR
-DoCkKvbdpxoHgQcx
-DoCkKvbduMXwBUBX
-EObjjvbdNeEThhjd
-DoCjjvbdirzhrkJz
-DoDLKvbdaMkCTUlg
-DncLKvbdWRnYBeLc
-DnbjjvbdGBPRZJzm
-EOcLKvbdeOeSjstS
-DoDLKvbdmIctRVSB
-DoCjjvbdZxdJnDMS
-DoCkKvbdRpTgKFcw
-DncLKvbdTukojTaR
-DnbjjvbdKRZdoFme
-DnbkKvbdURQoVUhN
-DoDLKvbdyYJKBozL
-EObkKvbdfNFwHMjL
-DoDLKvbdZisIQHBf
-EObkKvbdqFcdsuaI
-DncLKvbdzoPqFDLx
-DoDKjvbdSKxeuHLT
-EPDKjvbdsBemLfjy
-DoCjjvbdJbjCqJcY
-DoCjjvbdNPxRVnGs
-DncLKvbdGcjvJbKK
-EOcKjvbdrWpMDIxq
-EOcLKvbdQdDApQcr
-DoDKjvbdZMRdTnLm
-EOcLKvbddxZssrFz
-EObjjvbdUtNTfLuj
-EPCjjvbdLLBIWAKZ
-DoCkKvbdgFlZmfgA
-EPCjjvbdUVkoitAq
-DoDKjvbdDncKjvcE
-DoDLKvbdRpUHJfEX
-EPDKjvbdLqvlzVQz
-EPDKjvbdZMRdUOLm
-EOcLKvbdCJLBkIfK
-DncKjvbdaSFbhUFk
-EPDLKvbdZoNheEzK
-DncKjvbdUVlPjUAq
-DnbkKvbdKNADyfuB
-EObkKvbdZdwfzghb
-EPDLKvbdZtIhxcrn
-EObkKvbdGckViajK
-DncLKvbdFfJqmiUR
-DncKjvbdKWUfDdgJ
-DoDKjvbdMtrqjmAX
-EOcLKvbdsQWPKDVf
-DoCjjvbdwtleRZMO
-EObjjvbduaDxsPEh
-EPDLKvbdKxqJrzuG
-EOcKjvbdVAaprprZ
-EObjjvbdEuxopMjF
-DnbjjvbdyOTHwriD
-EPDLKvbdrpVnibvG
-EPDKjvbdkWWnDaww
-DncLKvbdrXPkbiYq
-DoDLKvbddxZssqez
-EOcLKvbdHDkWJbJj
-DncLKvbdEPCkLWcE
-DnbkKvbdEXwkstTl
-EObjjvbdqiAKEmOe
-DncLKvbdjAQGaQGj
-EPCjjvbdNeDtJJKd
-EPCjjvbdvwMBWBVu
-EPDKjvbdFejSOItR
-EOcLKvbdNPwqWOHT
-EPDKjvbdbsCjscia
-EObkKvbdyYIiaoyk
-DoDKjvbdLZQirzuG
-EObjjvbdSLZGVGjs
-DoCjjvbdAMgxsWzY
-DoDLKvbdEObjjwCd
-DnbkKvbdsPvOicWG
-EPCkKvbdrJAKElne
-EPCkKvbdauCGwjsh
-DncLKvbdegkWRnQg
-EPCkKvbdYpmEiNFR
-DoDKjvbduaDxsPFI
-DoCjjvbdcyxoxYqC
-DoCkKvbdkMakzFHP
-DnbjjvbdJbibqJbx
-DnbkKvbdWWhxWDeH
-DoCjjvbdssRsYzFD
-DoDKjvbdpyPIHRDx
-DncLKvbdwNWANDeN
-DoDKjvbdJYUBglRQ
-EObkKvbdXnRAYVVt
-DoCjjvbdUWLpKTaR
-DoDKjvbdTqROttgm
-EPCkKvbdVqnXaeMD
-EObjjvbdADRwiyiQ
-DoDKjvbdlrZUyrci
-EPDKjvbdvAdZSndh
-DoCkKvbdzoQQeDLx
-DnbkKvbdSQUGjFdX
-EOcLKvbdqBJFAXIE
-EObkKvbdSCEFLiZL
-DnbjjvbdzoQQdcMY
-DnbkKvbdpxngfqEY
-DncLKvbdbsDLUEKB
-DoCjjvbdXrlBMtOx
-EObjjvbdKCjDQicY
-DncLKvbdLrWlzUpz
-EObjjvbdaaWEfQQX
-EObjjvbdtlYWaTaX
-DnbkKvbdMowpunGs
-EObkKvbdSLYeuHKs
-EObkKvbdTAEhhCOd
-EPCkKvbdmSYtyrci
-DncLKvbdYkqcsnLm
-DoDLKvbdrylQTAgn
-DncLKvbdJXtCIMRQ
-EObkKvbdSBdElIyL
-DoDLKvbdwygefYFS
-DncKjvbdyXhibPzL
-EPCjjvbduaDxsPFI
-EObjjvbdZoNiFEzK
-EPCjjvbdkNBkyeHP
-EPCkKvbdWRnXadlD
-DncLKvbdRWmdDLhD
-DnbkKvbdmSYtzTDi
-EOcKjvbdkVwODbXw
-DncLKvbdQlxCZOUz
-EObjjvbdbhlijfXY
-EOcLKvbdXmqAXtut
-EOcLKvbdmbKXXnnV
-DoDKjvbdkHgMFfOL
-EPCkKvbdfekymgHA
-DoCjjvbdeKKRvUzn
-DoDKjvbdkHfkefNk
-DoCjjvbdyqPMiKXA
-DnbjjvbdUQqOtuIN
-EOcKjvbdEPCkKwDE
-DoDLKvbdZRNFIleR
-DnbjjvbdRacdlJZL
-EOcLKvbdTukoitAq
-EOcLKvbdZLrDtOMN
-EOcLKvbdgKfzcGAE
-EObjjvbdzjVQQESt
-EOcLKvbdcIlijevx
-EOcKjvbdGKdsDHmV
-DncLKvbdKkBHvAJy
-EOcKjvbdZMRctOLm
-EPCkKvbdADRxKZiQ
-EObjjvbdDwxLsssl
-EPDLKvbdUxgszLPO
-EPCkKvbdSQTfiedX
-EPCjjvbdNeEUJIkE
-DoDLKvbdpyPHfqDx
-DnbkKvbdyOShXsJD
-DncLKvbdLiBkpxAS
-DoDKjvbdaaWEepQX
-DoCjjvbdWSOYBeLc
-EOcKjvbdLFegbAqV
-EPDKjvbdffLzOGgA
-EObkKvbdFkErbglu
-DncLKvbdiZuFlROG
-DncKjvbdegkWRnQg
-DoDLKvbdQdDApRDr
-EOcLKvbdeYZtURez
-EObjjvbdrXQLcIxq
-DoDLKvbdxZhGGXeS
-DoDLKvbdGGKSOItR
-EObjjvbdjhHLfFnL
-EOcLKvbdUQpoUuHm
-DoCkKvbdXrlBNUPY
-DoDKjvbdJXtCIMRQ
-DnbkKvbdZMSDsnLm
-DncKjvbdCTBDUGWr
-DncKjvbdbhlikGXY
-DoDKjvbdXmqAYVWU
-DnbjjvbdliDsqVRa
-DnbkKvbdmajXYOnV
-EObjjvbdJpyePGNe
-DnbkKvbdCTAcUGXS
-DoDLKvbdCDpBVjNG
-EOcLKvbdxwhiaoyk
-DoDKjvbdxVNFQyMO
-EPCkKvbdVvhwvEEg
-DnbkKvbdFWYoomJe
-EOcKjvbdlrZUysEJ
-EPDKjvbdqquKnKaN
-DoCkKvbdTkunaVoJ
-EOcLKvbdfHkVrOQg
-EPDLKvbdiUzFWrUb
-DoDLKvbdtAGqIABS
-DoCkKvbdZRMdhmEq
-DnbkKvbdNsUVfeVQ
-EPDLKvbdqwPkbiZR
-DoCkKvbdNUsSLNAX
-DncKjvbdmpZxvKyC
-EPCkKvbdLYqKSztf
-EPDKjvbdZyEKODMS
-EPDKjvbdNGbomPuL
-DncKjvbdZMSDtNlN
-EPCjjvbdTXjkmzjx
-EObkKvbdBdQAvKMf
-EOcLKvbdkySrTYgU
-DnbkKvbdZoOIddzK
-DoCkKvbdZMSDsmkm
-EPCkKvbdCWzdIdpW
-DncLKvbdBvzdIdov
-DoCjjvbdaRfDHtFk
-DnbkKvbdWeyZtAOs
-DoDLKvbdnCJwYPOV
-DoCjjvbdEYYLstUM
-EOcLKvbdwtldqZMO
-EPCjjvbdFVxoomKF
-EObkKvbdyqPMhiwA
-DoDLKvbdkxrrSxgU
-DoCjjvbdeATqNYKG
-DncLKvbdJKEAJpHE
-DoCkKvbddndsLUTr
-DnbjjvbdqFceUWBI
-DoDLKvbdhkddOUby
-DncKjvbdGKdrcIMu
-EPCkKvbdelevflik
-DoDKjvbdhaoDFWqR
-DoCjjvbdYlSDsmlN
-EPCjjvbdiZuGLpmf
-EObkKvbdnCJvxPNu
-DnbkKvbdhzUelRNf
-DnbkKvbdZeYGzgiC
-DoCkKvbdDnbkLWbd
-DnbkKvbdnHFYMmfy
-DoCjjvbdePEsKtTr
-DnbjjvbdZQmEhleR
-DnbkKvbdTkunaVoJ
-DnbkKvbdFWZPpMjF
-DoDKjvbdSwkMNzkY
-EOcLKvbdwtldpyMO
-EOcKjvbdhkdcmtby
-DoCjjvbdNQXqWNfs
-EPDKjvbdzjUpPdTU
-DnbjjvbdqceJPnWB
-EPDKjvbdUyHsyjoO
-EPCkKvbdZshhxcsO
-DncKjvbdqAiFAWgd
-EObkKvbdgFkzOGgA
-DncKjvbdmgFYNNgZ
-DoDLKvbdDjHjWYKA
-DnbjjvbdJbicRKCx
-DnbkKvbdfNFwHMjL
-EPCkKvbdWSNxBdlD
-EPDLKvbdCJKbLJFj
-EPDKjvbdEOcKkXDE
-EPCkKvbdVrOYCElD
-DnbjjvbdCIkBjhej
-DoDLKvbddoFTKstS
-DnbjjvbduDDVXVoP
-EObkKvbdxwiKCPzL
-DnbkKvbdZGvdAPTJ
-DoDLKvbdBdPaVjNG
-EOcKjvbdIHGzYwxH
-DoCjjvbdGFjSNhsq
-DnbjjvbdlYsSSxgU
-EPCjjvbdqrUjnKaN
-EOcLKvbdtvOXipsA
-DoDLKvbdrounjCuf
-DoCkKvbdFVyPomKF
-EOcKjvbdNHCpNPtk
-EPDLKvbdWeyZtAPT
-EPDKjvbdjcLkQfuH
-EOcLKvbdzHZMAMeX
-DoCjjvbdUMWPBVni
-EOcKjvbdHELWKBjK
-DoDKjvbdMgComQUk
-DnbkKvbdiGjDZWJu
-DncKjvbdyqOmJKXA
-DoDKjvbdVZITyjoO
-DoCjjvbdzQoNJJwA
-EOcLKvbdGAoQxizm
-DoDKjvbdatagYKsh
-EPDKjvbdSBceMJYk
-DoDLKvbdMpYQvOHT
-DncKjvbdiCOcFWpq
-DoCjjvbdUGznLvvF
-EPDLKvbdANIYrvyx
-EPCjjvbdIwtCHkpp
-EObkKvbdJSyBSmYM
-EObkKvbdwuMdqYlO
-EObjjvbdmuVZkKSG
-DncLKvbdSPsfjFdX
-DoDLKvbdSQUHJedX
-DoDKjvbdiVZdwSUb
-EPDLKvbdRjxfVGkT
-EObjjvbdmpZyVkZC
-DncLKvbdhzUelROG
-EPCkKvbdxVMeRZMO
-EOcKjvbdxxIiapZk
-EOcKjvbdJSyBTNYM
-EPDKjvbdMSXMzUpz
-EPCkKvbdNddThhjd
-DoDKjvbdznpREcLx
-DncLKvbdqYoHgREY
-DnbjjvbdiCPCdvqR
-DoCjjvbdsQVoKDVf
-DoCjjvbdqFcdtWBI
-EPCkKvbdFkFTDIMu
-DnbkKvbdQvmdCkgc
-DnbjjvbduCbtwWOo
-DoCjjvbdaNKaruNH
-EOcLKvbdrpWPKCvG
-DoCjjvbdEKHiuwjA
-DoDLKvbdsBfMlHKy
-EObjjvbduCcVWuno
-DoCkKvbdNddUIiLE
-DoDLKvbdVrNwbElD
-EPCkKvbdTqQoUuHm
-DoCjjvbdcJMikFvx
-EOcKjvbdijGIJmYS
-DncKjvbdtvNwipsA
-EPDKjvbdGQASwGey
-DoCkKvbdmJEUQtqa
-DncKjvbdpxnggQcx
-EOcLKvbdDnbjjwDE
-DnbjjvbdxVMdqZLn
-EPCkKvbdTkvPAvOi
-DnbkKvbddijRvUzn
-DnbjjvbdJuuFceGi
-DoDLKvbdeATplxJf
-EObjjvbdiLeDmuDZ
-EObkKvbdzHYlANFX
-EObkKvbdSBdFLiYk
-DncLKvbdMgCpNPuL
-DncLKvbdNsTufeVQ
-EPCjjvbdUQqOtuIN
-EPCkKvbdKDJcQicY
-DnbkKvbdsCFmLfjy
-DnbjjvbdNdctJIjd
-DoDLKvbdzjUpPdSt
-EPDLKvbdMoxRVmgT
-EOcKjvbdbsCjscia
-DoCjjvbdrDeIpOWB
-EPDKjvbdOTUVgFVQ
-EOcLKvbduWNwipsA
-DoDKjvbdJcJcRKCx
-DncKjvbdGZUtaDwb
-EPCjjvbdZtJJYdSn
-DoDLKvbdtcDVWuoP
-EObjjvbdKaLGmCXq
-DoCjjvbddZxoxYpb
-DnbkKvbdWRmxCEkc
-EOcLKvbdNrsufduQ
-DoDLKvbdqlzJxlIJ
-DoCkKvbdFVyPoljF
-DnbkKvbdjggMGGOL
-DoDLKvbdLAkHMawq
-DncLKvbdwuMdpxlO
-DoDKjvbdtSqrxydc
-DoCjjvbdSLZGVHKs
-DnbjjvbdrMzKYlIJ
-DnbjjvbdTAFIhBnd
-EPDLKvbdIxTbIMRQ
-DoDLKvbdbBVeGQPw
-DnbkKvbdvlvANEEm
-EPDLKvbdEOcKkXCd
-DoCkKvbdYqMdhmFR
-EObjjvbdnUtzKiqf
-EPCkKvbdtunXjQsA
-DnbkKvbdddoSBwDK
-DnbjjvbdTqROttgm
-EPCkKvbdzQnmJJwA
-EObjjvbdfpBzwDwh
-DncKjvbdRotHJecw
-EPCjjvbdhtzFWrVC
-DncLKvbdqdEhpNvB
-DnbjjvbdkWWmcbYX
-EOcLKvbdYSkaMsoY
-EObjjvbdDjIKVxKA
-DnbkKvbdrounjDVf
-EObkKvbdJzpFwdAN
-DoDLKvbdsBelkgLZ
-DoDLKvbdwtmEqZMO
-DncKjvbdxmrgwriD
-EOcKjvbdDoDLLWbd
-EPDKjvbdIwtBhLpp
-EPDLKvbdUaBqTRRy
-DoCjjvbdjKFhJlwr
-DoCkKvbdGLFTDIMu
-EPCjjvbdrbFmMHKy
-DoDLKvbdehKurOQg
-DncKjvbdijFhJlwr
-DoCjjvbdjvXOEBww
-EPCjjvbdTXjkmzkY
-EOcKjvbdaSFcHtGL
-EPDLKvbdpyPIHQcx
-EOcKjvbdmaiwXoNu
-DoDKjvbdSBdFMJZL
-DoDKjvbdjKGIKMwr
-DncLKvbdyXiKBozL
-DoCkKvbdqlzJxkhJ
-EObkKvbdrNZiyLhJ
-DoCkKvbdrpWPKCvG
-DncLKvbdVrOXbEkc
-DnbkKvbdOAIrtJrA
-DnbkKvbdrXQMChyR
-EOcLKvbdDnbjjwCd
-EPCjjvbdjvXOECXw
-EPCkKvbdMgDPmPtk
-DoDLKvbdYfwEAPSi
-EPCjjvbdzGxlANEw
-DoDKjvbdmbKWwoNu
-EOcLKvbddZxpXxqC
-DoDLKvbdLGGHbApu
-DoCjjvbdVTltGLuj
-EPCjjvbdOEdThiKd
-DoCjjvbdUyHtZkPO
-DncLKvbdHELWJajK
-EOcKjvbdcarmSAUN
-EObjjvbdqiAJdmOe
-EObkKvbdZQleImFR
-EObkKvbdQccBQRDr
-DoCkKvbdLAjfmBwq
-DncKjvbdSKxeuHKs
-DncLKvbdmJDsqUrB
-EOcLKvbdGFirNhtR
-DncLKvbdEARiMywX
-DnbjjvbdZxcjNblS
-DncLKvbdWXIwudEg
-DoDLKvbdhkeDmuCy
-EObkKvbdUslselWK
-DoCkKvbdLhakqYAS
-DoCjjvbdIMBzmvpk
-EPCjjvbdKaKgMbXq
-EPCjjvbdiLeDmtcZ
-DnbjjvbdsPvPKCvG
-DncLKvbdnVUzLKRf
-DoDLKvbdiUyeWrVC
-EOcLKvbdjblLRGuH
-DnbkKvbdhtydvqtb
-EOcKjvbdTqQnuVIN
-DoCjjvbdMtsRkNAX
-EPCjjvbdGKdrbglu
-DncKjvbdMoxQvOGs
-DoDKjvbdiHKDZWKV
-DoDKjvbdULvPAvPJ
-DnbkKvbdEvZQPmKF
-EObjjvbdkxrrTZGt
-EObjjvbdKCicQibx
-DoCjjvbdKkAgvAKZ
-EOcKjvbdNxOuzcmt
-EPDLKvbdbsCjsdJa
-EObjjvbdHDkVjBjK
-EPCjjvbdYqMdiMeR
-EPCkKvbdczYoxZRC
-DncKjvbdnPzYujxb
-DnbjjvbdMpYRWOHT
-DncLKvbdLFegbBRV
-DncKjvbdxVMdqYlO
-DoDKjvbdFkErbhNV
-DncKjvbdLLBHvAJy
-DoDKjvbdTfzmkwWF
-EPCjjvbdyXiKCQZk
-DoDKjvbdqUUGrSLU
-EObjjvbdGcjuiaij
-EOcLKvbdZRMdhmFR
-DoCjjvbdZoNiEdzK
-DoCjjvbdEARiNZwX
-DoCkKvbdwXMBVaWV
-EPCjjvbdVZHsyjoO
-DoDKjvbdyXhjBpZk
-EObkKvbdtkxWaUAw
-DnbkKvbdLrWmZuQz
-DncLKvbdySnJNRbH
-EPCjjvbdezvYdhsw
-DoDLKvbdhancFWqR
-EObjjvbdyzeORgiI
-EPCjjvbdyXiJbPyk
-EObjjvbduVnXiqTA
-DnbjjvbdZjTHofaf
-EPDLKvbdLrXMyuQz
-DnbjjvbdHffyxxXg
-DoDLKvbdOStWGdtp
-DnbjjvbddijRvUzn
-DoCjjvbdYNqAXtut
-EPCjjvbdUQpntuHm
-DoDKjvbduWOXjQsA
-DoDLKvbdtTRsYydc
-DncKjvbdpfDeUVaI
-DoDLKvbdULuoAvOi
-DnbjjvbdqmZjYkhJ
-EPDKjvbdZMSETmkm
-DoDLKvbdZshhyETO
-DncLKvbdQdCaQQcr
-DncKjvbdQccBQRES
-EOcKjvbdrNZjYlIJ
-EPDKjvbdjAQHBPgK
-DoCjjvbdnUuZkJqf
-DoDKjvbdLAjfmBxR
-EObjjvbdUsltFkuj
-DoDLKvbdZQleJMeR
-DnbjjvbdBraCtGXS
-DoDLKvbdaSFbhUGL
-EObjjvbdrbGMkgLZ
-EPCkKvbdJYUCHlRQ
-EOcKjvbdgFkzNfgA
-DoCjjvbdaRecHtFk
-EPDKjvbdnUuZkKSG
-EPDLKvbdkWWmdBww
-EObkKvbdypoNJKXA
-EOcKjvbdZxdJmblS
-DncLKvbdZirhPgCG
-DoDLKvbddeOrCXCj
-DoCjjvbdOXoVzcnU
-DncLKvbdSBdFMJZL
-DncKjvbdrzMPraHn
-DncLKvbdqZPHfpcx
-DncKjvbdVAbQsQqy
-DoDKjvbdySnJNSCH
-EPDLKvbdtSqsZZeD
-DncLKvbdtvOYKRTA
-DncLKvbdLGGICBQu
-DoDLKvbdDncLKwDE
-EObjjvbdNrtVgEtp
-EOcKjvbdUQqOtthN
-EObjjvbdZtIiYcrn
-EOcKjvbdmuVZjjRf
-DnbjjvbdcJNKKevx
-DoCkKvbdDxXlTtUM
-DncLKvbdqZOhHQcx
-EPDKjvbdIsZBSlwl
-EOcKjvbdNUsRkNAX
-DoDLKvbdRbEFMJYk
-DnbjjvbdiBncFWqR
-EOcLKvbdRzKIScWA
-EOcKjvbdRbEFMIyL
-EPDKjvbdsPunjDVf
-DoCjjvbdhzVFkpmf
-EOcKjvbddxZtUSFz
-DncKjvbdnVUykJrG
-EOcLKvbdEPCkKvbd
-EPCjjvbdnUuZkKSG
-DnbjjvbdnCKWxOmu
-DnbkKvbdYzcFrKVy
-DoDKjvbdvmWAMcdm
-EObkKvbdhkdcmuDZ
-DncKjvbdNsUVgFVQ
-EPDLKvbdYzbeqiuy
-EOcLKvbdUxgszLOn
-DnbjjvbdZQmEiMeR
-DoCjjvbdkHflFemk
-EPDLKvbdhbPCdwRR
-DoDLKvbdWXIwucdg
-DoCjjvbdOYOuzcnU
-DoDLKvbdcSbkTdJa
-EOcKjvbdEvYpQMjF
-EPDLKvbdrykosAhO
-EObkKvbdrovPJbvG
-DoDLKvbdkHflGGNk
-DoCjjvbdZtIiYcsO
-DoDLKvbdZnmiEdzK
-EObjjvbdZMSDsnLm
-EPCjjvbdLAjfmBxR
-DncLKvbdptUGrRjt
-EOcLKvbdNQXqVmgT
-DoDLKvbdCIkCLIfK
-EPDLKvbduVmxKRTA
-EPDKjvbdHbLzEzAD
-EPCjjvbdbUbGxKsh
-DoCkKvbdjlbLzEgP
-EPCkKvbdXGYzUAPT
-DnbkKvbduLxXAsaX
-EObkKvbdJvUfEFHJ
-EOcKjvbdmbKXXoNu
-EPDKjvbdQvnDbkgc
-DoDLKvbdiUzFWrVC
-EObkKvbdZyEKNcLr
-DoDKjvbdrEEhpNua
-DnbkKvbdzitoocsU
-EPCjjvbdmbJvxOnV
-EOcLKvbdNddTiIjd
-DncKjvbdfpBzvdYI
-EObkKvbdBhjbLIfK
-DoCjjvbdFjeTDHmV
-EOcKjvbdRjyGVGkT
-DoCkKvbdZQldhmFR
-EPDKjvbdqlzKZLhJ
-DnbkKvbdZoOIeEyj
-DncKjvbdBdPaVjNG
-EPCkKvbdTulPjUBR
-EPDLKvbdGGJqmiTq
-DoDLKvbdGGJqmhsq
-EOcKjvbdIryBTNXl
-EPDLKvbdIsYaSmXl
-DoCjjvbdVwJXudEg
-EPCkKvbduDCtvuoP
-EOcLKvbddBsMrAUN
-DncLKvbdrouoJcWG
-DoDKjvbdCgLfHAzc
-DncLKvbdhtzEvqtb
-DoDKjvbdZtIiYcsO
-DncKjvbdMfbomPtk
-DncKjvbdYqNEiMdq
-DnbkKvbdCTBCtFvr
-DncLKvbdhtzEvquC
-DoCjjvbdAMhZSvyx
-DoDKjvbdjlbLzEfo
-EOcKjvbdZLrETmkm
-DncKjvbdULvPAuni
-DoCjjvbdtcCtvuoP
-EPCkKvbdOTTugEtp
-EObjjvbdhtzEvquC
-DoCjjvbdkHgLfFmk
-DncKjvbdmoyyVkZC
-DnbkKvbdsBemLgKy
-DoDKjvbddCTMrAUN
-DoCjjvbdmuUykJqf
-DnbjjvbdbQHGckzd
-DoDLKvbdyOShXriD
-EPDLKvbdZRNFImFR
-EOcLKvbdDoDKkWcE
-EPCkKvbdwMvAMcdm
-DnbjjvbdbKlFoNcA
-DoCkKvbdMfbpMpVL
-DncLKvbdhkeDnUby
-DoDKjvbdMSWmZtpz
-EPCjjvbdmfeYMmgZ
-DnbjjvbdqiAKFMoF
-DoCkKvbdSBdElIxk
-EOcLKvbduoTzpkPU
-DncLKvbdDoCjjwCd
-EObjjvbdLGGHbBQu
-DnbkKvbdQcbaQRDr
-EPDLKvbdyNrgxTJD
-EObjjvbdtSqryZdc
-DoDLKvbdegkWSNpg
-EOcKjvbdZLrDsnLm
-EObjjvbdFkEsCgmV
-DoDKjvbdatagXjtI
-DncLKvbdGZUuBDwb
-DoDLKvbduDDUvuno
-EObjjvbdURROtuIN
-DnbkKvbdyXhjBpZk
-DoDLKvbdKaLGlaxR
-DoCkKvbdlZTRrxgU
-EPDLKvbdUsltFlWK
-DncLKvbdGGKRnIsq
-DnbkKvbdijFhKNXr
-DoDKjvbdrWokbiYq
-EObjjvbdUaCRSqRy
-EObjjvbdRkYfVHKs
-DnbkKvbdQvnDcMID
-EObjjvbdvBEYrneI
-DnbkKvbdySmiNRbH
-EPDKjvbdjuvmcaxX
-DoCjjvbdVTmUGLuj
-EPDLKvbdxVMeRYlO
-DnbjjvbdNPwpvNgT
-DoDKjvbdJTZArlxM
-EPDLKvbdjbkkRHUg
-DnbkKvbdSBdFMIyL
-EPDKjvbdMgColpUk
-DncLKvbdVAbQsQrZ
-DncLKvbdyTOJNRag
-DnbjjvbdmgFYMmgZ
-EPDKjvbdTAFIgbOd
-EObkKvbdFWYoomJe
-DoDKjvbdIxUBhMRQ
-DoCjjvbdFWYopNKF
-DoDKjvbdNdcshiLE
-EOcLKvbdwWlBWAuu
-EPCkKvbdYpldiNFR
-EPDLKvbdQwODbkgc
-EPCkKvbdqZOhHQcx
-EObjjvbdHDjujCKK
-DoDLKvbdnBjWwnmu
-EPDLKvbdUQqPUuHm
-DnbkKvbdIryBSlxM
-DnbkKvbdjhGlFfNk
-DnbkKvbdqlyiyMHi
-EPDLKvbdxmsIYTIc
-EPCjjvbdNrsufduQ
-DncLKvbdaaWEepPw
-DnbjjvbdkVvnDaxX
-EOcKjvbdUQpntuIN
-EOcKjvbdQdDAopcr
-DoCkKvbduMXvaUAw
-DnbkKvbdMRwNZuQz
-DoCkKvbdNGcQMotk
-EPDLKvbduWOYJpsA
-DncKjvbdZtJIxcrn
-DnbjjvbdwyhFfXeS
-EOcLKvbdIryAsNYM
-EObjjvbdyTNiNRag
-EPCkKvbdiZuGLqOG
-DncKjvbdHELWJbKK
-DoDKjvbdIGfyxwxH
-EPCkKvbdeOdrkTsr
-DoDKjvbdpstGrRjt
-EOcKjvbdZtJIxdSn
-EObjjvbdZtIiZDrn
-DnbjjvbdOEctIhkE
-DncLKvbdKDJbqJbx
-DncKjvbdEOcLKvcE
-EOcLKvbdgLGzcGAE
-DoCjjvbdGBPQxizm
-EPCjjvbdeFOqbXDK
-EObkKvbdehKuqnQg
-DncKjvbdRosgKFcw
-EOcLKvbdUsmUGLuj
-EOcLKvbdrXQMCiZR
-DoDKjvbdjcMLQftg
-EPDLKvbdHEKvKBjK
-EPDKjvbdbVCHYLUI
-DncKjvbdFfKSOItR
-DncKjvbdYSkaNToY
-DncLKvbdQvmccLhD
-EOcKjvbdnVUykKSG
-DoCkKvbdbsDKsdJa
-EObkKvbdGLFTChMu
-DoCkKvbdqGEFTuaI
-EPCkKvbdddoRbXCj
-EPCjjvbdMfbpNQVL
-DoDKjvbdFjdrbgmV
-EPCkKvbdmRxuZsDi
-DncKjvbdaRfChUGL
-DncLKvbdMJBkqYAS
-EObkKvbdxUmEqYlO
-EPDLKvbdtbbtvuoP
-DoDKjvbdxsOJNSBg
-EPDKjvbdZtIhyDrn
-DncLKvbdKCicRKDY
-EPDLKvbdUtNUFlVj
-EPCjjvbdeATqMxJf
-EOcLKvbdaNLBsUmH
-DoDKjvbdJcJcQjDY
-EPCkKvbdiMEdNtby
-DoCjjvbdiGibyWJu
-DncKjvbdeEnrCXDK
-EPCjjvbdUVlPisaR
-DncLKvbdXGZZtAPT
-DoDKjvbdddoRbXDK
-DoDLKvbdSBdElIyL
-DoCjjvbdRNXbZOUz
-DnbjjvbdTAEhhCPE
-EObjjvbdUMVoBWOi
-DnbkKvbdFjdrcHmV
-DoCjjvbdfIKurORH
-DoDLKvbdVBCRTQrZ
-EOcLKvbdZoNhddzK
-DoCkKvbdULvOaVoJ
-DnbjjvbdZirhPgCG
-EOcKjvbdVBBprqSZ
-DoDLKvbdaSFcIUGL
-DoDLKvbdfIKuqnRH
-DncKjvbdijGIKNXr
-EPDLKvbdrzMPsAgn
-EPDKjvbdNUsSKmAX
-EPCkKvbdLLAhWAKZ
-DncKjvbdkWWnDaww
-DnbkKvbdJYUCHlQp
-EPDLKvbdNwoVzdNt
-DoCjjvbdSLYetfjs
-DoDLKvbdptTgSSLU
-DncKjvbdxVMdqZLn
-DncKjvbdZyDinDMS
-DnbkKvbdnPyxujxb
-EPCkKvbdSiZjRABM
-EPDKjvbdPyNAHSqj
-DncLKvbdqwPlChyR
-EPDKjvbdGckWJbKK
-DoDLKvbdbBWFFoow
-DoCkKvbdkCkkRGuH
-DncLKvbdmJDtQuSB
-EObkKvbdQdCaQQdS
-DncKjvbdKfFhBaQu
-DncKjvbdaNKaruMg
-EOcKjvbdnPzZWLYb
-EObjjvbdxUldqZMO
-DnbkKvbdGckWJaij
-DncKjvbdkVwODaww
-EObjjvbdGKdsDHlu
-EObkKvbdKQyeOfOF
-EPCkKvbdGdKvKCJj
-DnbkKvbdGdKuibKK
-DoDKjvbdOFDtJJKd
-DoCkKvbdwuMdpxkn
-EObjjvbdZjShPgBf
-DoDKjvbdcyxpYZQb
-DnbjjvbdrbGMkgLZ
-DnbjjvbdxsNiMqbH
-DoDKjvbdWSOXbFLc
-EPCjjvbdrDeIomvB
-EOcKjvbdEuxopNJe
-DoDKjvbdKDKCqKCx
-DoCkKvbdkIHLfGNk
-EOcKjvbdnUuZjirG
-DncKjvbdIryArmXl
-DoDKjvbdraemMGkZ
-DncKjvbdEJgivYKA
-DoDLKvbdbhmJkGWx
-DnbjjvbdZyDimcMS
-EOcKjvbdhuZeWrVC
-DnbkKvbdRbEFMJZL
-EPCkKvbdeOdrkUTr
-DoCkKvbdlhdUQuRa
-DnbjjvbdZtIiZDsO
-EPCjjvbdZyEJmcMS
-DnbjjvbdFpATWgGZ
-EOcLKvbduaDxroEh
-DnbkKvbdpeceUWBI
-EOcKjvbdjcMLQftg
-DncLKvbdnPzZWLZC
-DnbjjvbdZyEKNcMS
-DoDKjvbdZMSDsnLm
-DnbjjvbdOAIsTjSA
-DoCjjvbdWSNxCFLc
-DoDKjvbdkClLRHVH
-DncKjvbdZxdJmcLr
-EPCjjvbdOYOuzdOU
-DncKjvbdWHxVxHYz
-DoDLKvbdwXMBWBVu
-EObjjvbdZxdJmcMS
-EOcKjvbdrEFJPmvB
-EOcKjvbdQcbaQQcr
-EPCkKvbdfHkWRnRH
-EOcKjvbdrEEiQNvB
-EObkKvbdcTCjtDia
-DoCkKvbdnCJvwoOV
-DoDLKvbdxnTIYSiD
-EOcKjvbdGQASvfey
-DoDKjvbdUtNTekvK
-DoDLKvbdbUbHXkTh
-DncKjvbdaNLBsVNH
-EPCkKvbdmtuZjirG
-EPDKjvbdvlvANEEm
-DnbkKvbdcIljLGWx
-EOcKjvbdJSyArmYM
-EObjjvbdVTltFlVj
-DncKjvbdTAFIgbOd
-EOcLKvbdUsltGLuj
-EObjjvbdZRNEhmFR
-EOcKjvbdUGznMXVe
-DnbjjvbdTqQoUthN
-DncLKvbdZRNEhmEq
-EObkKvbdKxpirzuG
-EOcKjvbdiVZdvqtb
-EOcLKvbdatbGxKtI
-DnbkKvbdpfDdsvBI
-DnbjjvbdpyPIGqDx
-DoCkKvbdqUUGrRjt
-DoCjjvbdfHjuqmqH
-EPDKjvbdqlzJyLgi
-DoCjjvbdznpREcMY
-EObjjvbdjuvnEBww
-DoCkKvbdQwNdCkgc
-DoCjjvbdxsNhlqag
-EOcKjvbdbsDKtEJa
-EPDLKvbdfIKuqnQg
-DncLKvbdJXsbILqQ
-DoDLKvbdiUydwRuC
-EOcLKvbdUtMsfMVj
-DnbkKvbdfNGWflik
-DoDLKvbdqwQLcJZR
-DncLKvbdYqMeIleR
-DoCjjvbdzaAPGgBl
-EPCkKvbdauBgYLUI
-EPDLKvbdiUydvqtb
-DnbjjvbdRyjITCvA
-DncLKvbdIwsahLqQ
-EPCjjvbdRacdkiYk
-EOcKjvbdRbEFMJZL
-DoCjjvbdrzLoraHn
-EObkKvbdxxIiaozL
-EOcLKvbdJcJbqJbx
-EPCjjvbdZisHogBf
-EOcKjvbdVTmUGMWK
-EPDKjvbdrylQSaIO
-DncLKvbdSCEEkiYk
-DoDLKvbdhtyeXRuC
-EObjjvbdQvmcblID
-DoDKjvbdauCGwjtI
-DnbkKvbdGYtuBEYC
-DoCkKvbdkyTSSxft
-EPDLKvbdIGfyyYYH
-EObjjvbdjlbLzEgP
-EPCjjvbdIwsbHkpp
-EPDKjvbdmuUyjjSG
-DoCkKvbdUQpoUtgm
-EObkKvbdUQqPVVIN
-DncLKvbdXrkaMsnx
-DncLKvbdaMjbTUlg
-DncLKvbdhgJbyVjV
-DnbkKvbdURQoUuIN
-DnbjjvbdFWZQQMie
-EPCjjvbdnCJwYPNu
-EOcLKvbdBcpBVimG
-DoCkKvbdyqPMiKXA
-EObkKvbdnVUzKjRf
-DnbkKvbdVgwvXgYz
-EObkKvbdZsiJZDsO
-EPDKjvbdiCPCdwRR
-EObkKvbdGYuUaEYC
-DnbkKvbdpyPIHREY
-DnbjjvbdiZtfLpnG
-EPCkKvbdVUNTelWK
-DnbkKvbdTppoVUhN
-DnbjjvbdxrnIlrBg
-EPDKjvbdmIdUQtrB
-EObjjvbdkNBkzFGo
-DncKjvbdhbOcFXQq
-DoDLKvbdNGcPmQVL
-EPDKjvbdZoNheEyj
-DnbkKvbdjlbLzEfo
-DoCjjvbdZRMdiNEq
-EObjjvbdczYoxYqC
-EPDKjvbdLAkHMaxR
-DoDLKvbdsPunibuf
-DoDLKvbdNdcshhkE
-EPDKjvbdhkdcnVCy
-EPCkKvbdVZHtZkOn
-DnbjjvbdsrrTYzFD
-DoCjjvbdatbGxKtI
-EOcLKvbdnGdxMnHZ
-EPDLKvbdmaivwoOV
-EObkKvbdjJegjMwr
-EPDKjvbdYfwEAOri
-EOcKjvbdpxngfpcx
-DnbjjvbdEPCjkXCd
-EPDKjvbdxsOImRag
-EObjjvbdEPDKjwDE
-DnbjjvbdYlSETnLm
-DncLKvbdBiLBjhej
-DoDKjvbdrpWPJcVf
-DncKjvbdRpTfiedX
-DoDKjvbdakMGOnDA
-DnbjjvbduVmxKQsA
-DncKjvbdKfFhCBRV
-DnbkKvbdpfEFTvBI
-DncLKvbdqwQLcIyR
-EOcKjvbdlhdTpuSB
-DncKjvbdqwQLbhxq
-DnbkKvbdnHEwlmgZ
-EPDKjvbdDoCjkWbd
-EObkKvbdANIYsWyx
-EObjjvbdpfEEsvBI
-EPDKjvbdCJLCKiFj
-DoDKjvbdqcdhonVa
-EPCjjvbdzjUpQESt
-DncLKvbdZQleImEq
-EPCjjvbdEPCkLXCd
-EPDKjvbdYlRdUNlN
-EObkKvbdxwiKBozL
-DnbjjvbdFjdsChNV
-EObjjvbdwtleRYlO
-DoDLKvbdeOdsLUUS
-EPDKjvbdZLqctOLm
-DoDLKvbdjlbLyeHP
-DoCkKvbdaNLCTVMg
-DnbkKvbdEKHjWXjA
-DnbkKvbdZshhyDsO
-DnbjjvbdsPunibuf
-EPCkKvbdwWkaWBVu
-EPDLKvbdFpATWfey
-EObjjvbdzoQQdcMY
-EPDLKvbdpxngfpcx
-DnbjjvbdgPazwDwh
-EPDKjvbdKVtfEEfi
-EOcLKvbdhkeENuDZ
-EObkKvbdIwtCILqQ
-EPCjjvbdyNrhXsJD
-DnbkKvbdMSWmZuQz
-EOcLKvbdsPunicWG
-DncLKvbdULvPBWPJ
-DoCkKvbdKfFhCApu
-EOcLKvbdTAEhhCOd
-DnbkKvbdSKxetfjs
-DoCjjvbdUtNTfLuj
-EObjjvbdhzVGMROG
-DoCkKvbdxsNhmRag
-DnbjjvbddZyPwxpb
-EObjjvbdEuxooljF
-DncLKvbdVTlsfLuj
-DoCkKvbdZjShQGaf
-EPDKjvbdrSVKnKaN
-DnbkKvbdFxuVBDwb
-DoCkKvbdJXtBhLpp
-EPCjjvbdHffzZXxH
-DoCjjvbdqZOgfqDx
-DncLKvbdqwQMChyR
-EObjjvbdaSGDIUFk
-EPDLKvbdZxdKNcMS
-EObjjvbdhuZdwSUb
-EPDLKvbdfMfWgMik
-DncLKvbdZRNFJMdq
-EOcKjvbdJKEAKPfd
-EPCkKvbdcyxoxYqC
-EOcKjvbdCSaCsevr
-DoDLKvbdKQzEoGNe
-DoDLKvbdjhHLefOL
-DoCjjvbdRjxeuGjs
-DncKjvbdyOTIXsIc
-DnbkKvbdBdQBWKMf
-EOcKjvbduLxXBUBX
-EObkKvbdrSUkNkAm
-DoDKjvbdKfFhBaRV
-EPCjjvbdddoSBvcK
-DncKjvbdyOTHxTJD
-EOcLKvbdiLeENuDZ
-DoCjjvbdJbjDRKCx
-EPDKjvbddoErkUUS
-DoCkKvbdBiKakJGK
-DnbkKvbdCIjbKiFj
-DoCjjvbdIsZBSmXl
-EOcLKvbdBhjajiFj
-DnbjjvbdrzMQTBIO
-EObjjvbdrWolChyR
-EPCkKvbdEARiMzXX
-DoDLKvbdrWpMDJYq
-EOcLKvbdKRZdoGOF
-DoCjjvbdBsAcUFvr
-DoCjjvbdBraDUGXS
-DoCkKvbdIwtBhMQp
-EObjjvbdeATqMxKG
-EPDKjvbdYzbfRjWZ
-EOcLKvbdsCGNLgKy
-DoDKjvbdhficZWKV
-EObjjvbdZQldhldq
-EPDKjvbdsQVoJbvG
-EPDKjvbdsQVnicWG
-DoDLKvbdVZITyjoO
-EPCjjvbdILazmvpk
-EPCkKvbdZMSDsmlN
-DoCjjvbdZGvdAOri
-DoDKjvbdwuMeRYkn
-DnbjjvbdZyEJmblS
-EPDKjvbdhkeENuDZ
-EPDLKvbdGdKvKCKK
-EPCjjvbdjuwOECXw
-EObkKvbdZeXfzghb
-EObjjvbdJmAEZgUa
-EOcLKvbdtcCuWvOo
-EPCkKvbdiiehJlwr
-DoDLKvbdwtldpyMO
-DoCjjvbdjblLQfuH
-DncKjvbdNPwpunGs
-DnbjjvbdSLZFtgLT
-EPDKjvbdyXhjCPyk
-EObjjvbdliETpuSB
-Dnbjjvbdqlyixkgi
-DoDLKvbdmbJvxOnV
-DoCjjvbdZjSgpGaf
-DoCjjvbdqdEhpNua
-DoDLKvbdelfXGmKL
-EPDKjvbdIGgZyYYH
-DncLKvbdfMfXHMik
-DoCjjvbdZoNheEyj
-EPCkKvbdsZlPsBIO
-EOcKjvbdLAjgMbXq
-DncKjvbdVZITykOn
-DnbjjvbdpyOgfqEY
-EPDKjvbdbUagYKtI
-EObkKvbdrSUjnLBN
-DncKjvbdQwNdDLhD
-EOcLKvbdrykosBIO
-EPDKjvbdsPunicWG
-EPCjjvbdliDtQuRa
-EOcKjvbdcSbkTdKB
-EOcLKvbdKaKgNCXq
-DnbjjvbdZshhxcrn
-DnbkKvbdcbTMrAUN
-EPCkKvbdsQWPKDVf
-DncKjvbdijGHjMwr
-EOcLKvbdULvPBVni
-EPCjjvbdffLynHHA
-DoCjjvbdTqQntuHm
-DoDLKvbdjuwNdCXw
-DoCkKvbdVZITzLOn
-EPDLKvbdqrUkOLAm
-EPDLKvbdZQmEhmFR
-DoDKjvbdwjvdHzyf
-EPDKjvbdePErjtTr
-EObjjvbdmozYvLZC
-DnbjjvbdACrXizIp
-EOcLKvbdTvMQJtAq
-DncLKvbdssSTZZeD
-DnbjjvbdmozZVjxb
-EOcLKvbdtSrSxzFD
-EPDLKvbdZyDjOCkr
-DnbkKvbdbBWEeopX
-EOcLKvbdkWWmcbXw
-DoCkKvbdkVwNdBww
-DncKjvbdEzsqFMCi
-DncLKvbdACqxJyhp
-DoDKjvbdYpmFIleR
-DncKjvbdGKdsCglu
-DoCkKvbdZnnJFEzK
-DoDKjvbdBsBCtGWr
-EPDKjvbdBcpAuimG
-DnbjjvbdIGfzYxXg
-DnbkKvbdGLEsCgmV
-EPCkKvbdySnJNSBg
-DoCkKvbdPyNAGrqj
-EPDKjvbdmaivxPNu
-DnbjjvbddoFSkUUS
-DoCkKvbdySmiNRag
-DoDLKvbdEYXlUUUM
-EObkKvbdCTBCtFwS
-DoDLKvbdoznDkXoA
-EOcLKvbdBvzciEov
-DoCjjvbdSPtHJfEX
-EPDLKvbdtvOYJqTA
-EPDKjvbdZisHpHBf
-EPDKjvbdILazmvqL
-EOcKjvbdRpUHKGDw
-DncKjvbdWXJYWDdg
-EPDLKvbdIwtCHlQp
-EPDKjvbdUtNTfLvK
-DncLKvbddZxpXxqC
-EOcLKvbdkNBlZdgP
-EObkKvbdqYnhGqEY
-EPDLKvbdfpBzwDwh
-DncLKvbdTkuoBVoJ
-DnbkKvbdvvlBWAvV
-DoCjjvbdrXQMCiYq
-EPCjjvbdFeiqmiUR
-DncLKvbdzjUopDsU
-DncKjvbdhkeDmuCy
-EPCjjvbdVqnYBdlD
-EOcLKvbdSCDeLiYk
-DoCjjvbdJvUeceHJ
-EPCjjvbdjgfkfFnL
-DnbjjvbdkVwNdBww
-EObkKvbdczYowyRC
-EPCjjvbdZoNhddyj
-EPCjjvbdOSsugEuQ
-EObkKvbdZMRcsnLm
-EObjjvbdrMzJyLgi
-EPDKjvbdrSUjnKaN
-EPDKjvbdSLYfUfkT
-EPDKjvbdUVlQKUAq
-DoDLKvbdJcKCqJbx
-DnbjjvbdeFPRbWcK
-DoCkKvbdVAbQsQqy
-DncLKvbdpeceTvBI
-DoDLKvbdcIlikFwY
-DoDLKvbdbsDLTdJa
-EPCkKvbdRXOEClHc
-DnbjjvbdbKkennDA
-DncLKvbdEzsqEkcJ
-EPCjjvbdJvUedEgJ
-EOcLKvbdzitpQDsU
-DncLKvbdQvnDblHc
-EOcKjvbdbQGgDkzd
-DnbkKvbddZyPxYpb
-EPDLKvbdLrXNZuQz
-DoDKjvbdDjIJvYKA
-EPCjjvbdbVCHXjsh
-EOcLKvbdsPunicVf
-EOcLKvbdEzspdlCi
-DoDLKvbdmRxtzSdJ
-DnbjjvbdsBfNLfjy
-DoCjjvbdcTDLUDia
-EPDLKvbdidjgVPAO
-DoCkKvbduVmxKQsA
-EObjjvbdxLXDgzzG
-EPCkKvbduaEZSoFI
-EOcLKvbddneSjssr
-DoCkKvbdWXJYVdFH
-DncLKvbdHkaznWqL
-DncKjvbdbVCGxKsh
-DnbjjvbdiMEcmtcZ
-DoDKjvbdqAheAXHd
-EPCkKvbdMIalQxAS
-DnbjjvbdVviXucdg
-DnbjjvbdMpXpumgT
-EObkKvbdMJCLqYAS
-EObjjvbdczZQYYqC
-DncLKvbdUxgtZjoO
-EOcLKvbdjuwNdCYX
-DncKjvbdSwjlNzkY
-EPDLKvbdrWpLbhxq
-DoDKjvbdnBjWwoOV
-EPCjjvbdmSYtyrdJ
-DoDLKvbdzeZnzdzQ
-DncLKvbdMowqWOGs
-EPCkKvbdqTsfqrLU
-EObkKvbdraemMHKy
-EOcLKvbdJcJbpjCx
-DnbjjvbdmuUzKjRf
-DncKjvbdNeEThhkE
-DoDKjvbdHakydzAD
-EOcKjvbdXsLaNUPY
-EObjjvbdLFfHbBQu
-DncLKvbdbKlFoODA
-DoCjjvbdRpTfiecw
-DnbkKvbdRkYetgLT
-DoCjjvbdegkVrOQg
-DoDLKvbdhlFEOUby
-DoCkKvbdFyUtaEXb
-DnbjjvbdAMgxsXZx
-EOcLKvbdUQqOtuHm
-EPDKjvbdxrmiMrCH
-EOcLKvbdREDApQdS
-DoDLKvbdWRmxBdlD
-DnbjjvbdiHKCyVjV
-EPCkKvbdxwhjCPyk
-EObjjvbdLKaHvAJy
-EPDLKvbdZtJJYcsO
-DoCjjvbdbPfgDkzd
-EObkKvbdUaBqTRRy
-EPDKjvbdGYtuAcwb
-DnbjjvbdQcbaQRDr
-EPCjjvbdsBfNMHKy
-EPDKjvbdZyDimblS
-DoDKjvbdJXtBglRQ
-EObkKvbdpssfrSLU
-EOcLKvbdMRwMytpz
-DoCjjvbdEYYMUTtM
-DoCkKvbdeAUQmXif
-DncLKvbdUaBqSpqy
-EObkKvbdVAbQrqRy
-EObkKvbdwXMAuaWV
-DncLKvbdCIjakIfK
-DncLKvbdjmBkzEfo
-EOcLKvbdKVtfDeGi
-EObkKvbdnQZyVjxb
-DncLKvbdzRPMhiwA
-DncKjvbdJpydnfOF
-EPDKjvbdqTsfrRkU
-EPDLKvbdEuyQPlie
-DnbjjvbdfSBWzlCo
-DnbkKvbdqiAKFMne
-EPCjjvbdatbHYLUI
-EOcKjvbdNsTugEtp
-EPCkKvbdmgFXmNgZ
-EPDLKvbdMSXNZtpz
-DoDKjvbdUaBprqRy
-DnbjjvbdXmqAXtvU
-EOcKjvbdHlBznWpk
-EOcKjvbdVqmwbElD
-DoCkKvbdqrVLOLAm
-DnbkKvbdZshiYcrn
-DoCkKvbdZoNhddyj
-EOcLKvbdEuxooljF
-DnbkKvbduCcVXVoP
-EPCkKvbdmuVZjirG
-DncKjvbdRzKHrbvA
-EObkKvbdeKJqutzn
-EObkKvbdyOShXsIc
-EPCjjvbdRbDdlJZL
-DoDKjvbdSBdFMIxk
-DncLKvbdKaKgMawq
-EObkKvbdCDpAuilf
-DnbkKvbdRWnDcLgc
-DncLKvbdqlzJxkhJ
-EPCjjvbdNHDQMpUk
-EOcLKvbdRMwbZNtz
-EPDKjvbdOEdThiLE
-DoDLKvbdUyHszKoO
-DnbkKvbdZisIPgCG
-DncKjvbdwzHeeweS
-DncKjvbdQwODcLhD
-DoDLKvbdqdFJPmua
-EOcLKvbdvwMAvBVu
-EPDLKvbdbVBfwjsh
-DoCkKvbdRyjHrcWA
-DoDLKvbdWIYVxGxz
-DnbkKvbdbiMjLGXY
-EOcLKvbdBhjbKiFj
-EObjjvbdCDpAvJmG
-EPDKjvbdLBKfmCYR
-DoCkKvbdbiMijevx
-DnbkKvbdyOSgwriD
-EPDLKvbdlYrqsZHU
-EOcLKvbdwyhGFxFS
-EPDLKvbdRyjHsCvA
-EPCkKvbdHgGzYxYH
-DoDLKvbdGFjRmhtR
-EPDKjvbdFyUtaEYC
-DncLKvbdeFOrCWbj
-DoDLKvbdJSyArlwl
-EOcKjvbdZyEKODLr
-EOcLKvbdemGXGmJk
-DnbjjvbdSCDeLhyL
-DoDLKvbdYTLaMsnx
-DoCjjvbdxKwEHzyf
-EOcLKvbdiVZdvquC
-DnbkKvbdUaBqTQqy
-EPCjjvbdGZVVBEXb
-DoDLKvbdCEQAvKMf
-DoDLKvbdRWmdCkhD
-EPDKjvbdRotHJecw
-DoCjjvbdZxcimblS
-EOcLKvbdtbcUvvOo
-DnbjjvbdZsiJZDsO
-EOcKjvbdRyjHsCvA
-EOcKjvbdxLWdHzzG
-DoCjjvbdFjdrbhMu
-EPCkKvbdxVNFRYlO
-DoCkKvbdmIcsqUqa
-EPDLKvbdfMfWgMjL
-EPDKjvbdTqQoUthN
-EOcKjvbdtkwvaUAw
-DoDKjvbdBdPaVilf
-DoDLKvbdZMRdTmkm
-EPDLKvbdelewGlik
-DoCkKvbdwzHfFxEr
-EPCkKvbdvAcyTPFI
-EObjjvbdQdDBPqES
-DoDKjvbdZtIiYcrn
-EOcKjvbdypnlhiwA
-DoCkKvbdNrtWGduQ
-DncKjvbdxsOIlqbH
-EPCjjvbdANIYrvyx
-DnbjjvbdNwnuzdOU
-EPCkKvbdFyUuBEXb
-EOcLKvbdaaWFGQQX
-DncLKvbdraelkfkZ
-EPCjjvbdTpqPVUhN
-DncKjvbdySmiNSBg
-EPDKjvbdrpWPJbvG
-EObjjvbdwNWANEFN
-EObjjvbdZeYGzhJC
-DoCjjvbddndsKstS
-EPDLKvbdegkWSORH
-EPCjjvbdvwMAvBVu
-EPCjjvbdkySqrxgU
-EPCkKvbdHkaznWqL
-EPCjjvbdqlzKYkhJ
-DncLKvbdZxdJmcMS
-EPCjjvbdqGEFTvAh
-EObjjvbdTYKkmzkY
-EPCkKvbdZisHofbG
-EOcLKvbdzoPpdcLx
-EPDKjvbdZjTHpHCG
-EOcKjvbdKWVGEFHJ
-EPCjjvbdhyuFlROG
-EPCkKvbdFjeTDIMu
-DncLKvbdOYPVzcnU
-DoCjjvbdSZjISbvA
-DoCkKvbdZoNiEdyj
-EPCjjvbdrWpMDJZR
-EObkKvbdkVvnDaxX
-EObjjvbdcSbjtDia
-DnbjjvbdLGGICBRV
-EPDLKvbdkWWmcbXw
-EObjjvbdnHExNOHZ
-DncKjvbdUtNUFlVj
-EObkKvbdEvZPomKF
-DoCkKvbduoTzpjnt
-EOcLKvbdURQoVVHm
-DnbkKvbdTAEiIBnd
-DncKjvbdQwOECkgc
-DnbjjvbdRbDdkiZL
-DoCjjvbdEPCkLWcE
-EPDKjvbdzjUpPdSt
-EPDKjvbdZMSDsmkm
-DoDLKvbdBdPaWJmG
-EPCkKvbdwjwEHzyf
-DnbjjvbdhuZeXSUb
-DoCkKvbdlYrqsYft
-DoCjjvbdEXxMTssl
-DoDKjvbdzoPpdbkx
-DncKjvbdWRnXbFMD
-DoDLKvbddijRutzn
-DncKjvbdnCKWwnmu
-EOcLKvbdZMSDsmkm
-EOcLKvbdUaCRTRSZ
-EObkKvbdkCkjpgVH
-DnbkKvbdirziTKiz
-DoDLKvbdJpyeOenF
-EObkKvbdGKdsDHmV
-EObjjvbdoAKzshDn
-EPDLKvbdlrZVZrci
-DncLKvbdRzKHsDWA
-EObkKvbdKkAhWAKZ
-EPDLKvbdVAaqSqRy
-DoCkKvbdjAPgApHK
-EPCkKvbdBcpBWJmG
-DncKjvbduCbuXWOo
-EOcLKvbdqiAKEmOe
-EPDKjvbdYpldhleR
-DnbjjvbdEPCjjwCd
-DnbjjvbdbsDKtEJa
-EObjjvbdKfGICBRV
-DoDLKvbdRadFMIxk
-DoDKjvbdGGJqmhsq
-EPCjjvbdJbicQjDY
-DncKjvbdbiNKKfWx
-EOcLKvbduLxXAsaX
-EPCjjvbdEKIJuwjA
-EPCjjvbdWRmwadlD
-DnbjjvbdfMewGmJk
-EOcLKvbdNxOuzdOU
-DnbkKvbdfIKvSOQg
-DncLKvbdQZNAHSqj
-DnbjjvbdZLqdUNlN
-EPCjjvbdSLYetgLT
-DncKjvbdeEoSCWbj
-EPDLKvbdsCFmMGjy
-EPDLKvbdLGGHaaRV
-DncLKvbdEuxpQMjF
-EObjjvbdVYhTzLPO
-EPCkKvbdaSFbhTek
-DnbkKvbdDihJuwjA
-EObjjvbdFjeTDIMu
-EObjjvbdhkeDnUby
-DoDKjvbdxUmEpyLn
-DncLKvbdiVZdvqtb
-DoCkKvbdunszqLPU
-DnbkKvbdSBcdkiYk
-EObjjvbdbhmKKevx
-DnbjjvbdVZHtZkOn
-DoDLKvbdZirgogCG
-DoDLKvbdqBIeAWhE
-EPCjjvbdwtmEqYkn
-DncKjvbdKCjDRJbx
-EOcKjvbdTvLpJsaR
-DoDKjvbdyXhjBozL
-DnbjjvbduDDUwVoP
-DoDKjvbdzaAOfgBl
-DoCjjvbdWSOYCElD
-EOcLKvbdqwQMDJYq
-DoCkKvbdNHColpUk
-EPCkKvbdCEPaVimG
-EOcKjvbdjKFhJlxS
-EOcLKvbdxUleRYkn
-DnbkKvbdrNZjZMHi
-DoDKjvbdmuUzLKSG
-EObjjvbdfIKurOQg
-EPDKjvbdQlwbZNtz
-DncKjvbdhkeDnUby
-EObjjvbdwuMdqZMO
-DncKjvbdliDtQtrB
-EPCjjvbdNPwqWNgT
-DncKjvbdjAPgApGj
-EObkKvbdMpYRVmfs
-DnbkKvbdGKeTChNV
-DoDLKvbdHbMZdzAD
-EObjjvbdQlwayOUz
-EPDKjvbdVqnYCFLc
-DoCkKvbdmpZyVjyC
-EObkKvbdUslsfLuj
-DoDLKvbdlhdURVSB
-EOcLKvbdmSZVZrci
-DoCjjvbdYzberJuy
-EPDLKvbdhzVGLpnG
-EPCjjvbdsPvOicVf
-EObkKvbdeOeTLUUS
-DncLKvbdmfdxMnHZ
-EPDKjvbdHffzYwxH
-EPDLKvbdrylPsAgn
-EOcKjvbdwWlBWAvV
-EPDKjvbdVAbQsQqy
-DnbkKvbdsZlPsBIO
-DncLKvbdEzspdkbi
-DncLKvbdhyuGMROG
-DoCkKvbdFaOpxizm
-DoCkKvbdZsiIxcrn
-DoCkKvbdijGHjMwr
-DnbkKvbdcyxpYZQb
-DnbjjvbdEzspdkbi
-DncLKvbdNQYRVnGs
-EObkKvbdkClKpgVH
-EOcLKvbdkClKqHVH
-EOcKjvbdhanbdvqR
-EPCkKvbdmfdwmNfy
-EObkKvbdYTMAmUPY
-DoCkKvbdIGgZxxXg
-EOcKjvbdnHEwlnHZ
-DncLKvbdCDpAuilf
-EPCjjvbdmbKXXoOV
-EObkKvbdapGfdLzd
-EPCkKvbdRjyGVHLT
-DoCkKvbddoFTLTtS
-EPCjjvbdGLFTCglu
-DoCjjvbdiLeENtcZ
-DoCkKvbdKCicQjCx
-EPCkKvbduoTzqLPU
-EPCjjvbduVmwiqTA
-EPCjjvbdWIXuxGxz
-EPCjjvbdpxngfqDx
-EOcKjvbdeOdrkTsr
-DoDLKvbdNrsufduQ
-EOcKjvbdIHHZyXwg
-DoCjjvbdpfEEsvBI
-EOcKjvbdhgKDYvKV
-DnbjjvbdmbJvxOmu
-EPDKjvbdGdKujCKK
-DoDLKvbdfkGzcGAE
-EPCkKvbdZoNiEeZj
-EPDLKvbdaMjbTUlg
-EPCkKvbdSPsgJfEX
-EPDKjvbdDxYLstUM
-EPCjjvbdKVtfDeGi
-EOcLKvbdpeceTvAh
-EObjjvbdHffzYwxH
-DnbjjvbdffMZnHHA
-EOcLKvbdsQVnibvG
-EOcKjvbdZirgpGbG
-EObjjvbdJSxaTMxM
-EOcLKvbdbrcLUEKB
-EPCjjvbdGZUuAcwb
-DnbkKvbdpssgRrLU
-DnbkKvbdKVteceHJ
-EPDKjvbdmajXYOmu
-EPDKjvbdNwoVzdOU
-DnbjjvbdrpVnicWG
-DoDKjvbdjhGlFfNk
-EObjjvbdEXwlTtTl
-DoDLKvbdkCkkQftg
-DncKjvbdDxYLtUTl
-DncKjvbdNQYQunGs
-DoDLKvbdZQleImFR
-DoDKjvbduVmxKRTA
-DoDLKvbdsrqsZZdc
-DoDLKvbdZLqctNlN
-EPDLKvbdNsUVfeVQ
-DncLKvbdhuZeXRuC
-EPCkKvbdiCObdwRR
-DoDKjvbdIwsbIMQp
-EObjjvbdtcCtvvPP
-EOcLKvbdpyOhHRDx
-EObjjvbdmgEwmOHZ
-DoCkKvbdelevgNJk
-DoCjjvbduLwwBTaX
-DoCkKvbdXrlBNTnx
-EPDLKvbduCcUvuoP
-EPDKjvbdURRPVUgm
-EObkKvbdBsBCsfXS
-DoDLKvbdZjSgogCG
-EObkKvbdhgKDZViu
-EPCkKvbdEYXkstUM
-DncLKvbdrMzJyLgi
-DnbjjvbdaSFcIUFk
-EPDLKvbdnBjWxOnV
-EPDLKvbdssRryZeD
-EOcKjvbderAvzkbo
-DoCjjvbdZirhQHCG
-DnbkKvbdBraCtFvr
-EOcLKvbdxZgfFxFS
-DoDKjvbdJuuFdFGi
-EPDKjvbdUQqPUtgm
-EPDLKvbdNHCpMpUk
-EPDKjvbdnCKXYOnV
-DoCkKvbddZyQXyQb
-DnbjjvbdpxoHgREY
-EPCkKvbdfNFwHNJk
-DncLKvbdVBCQsQqy
-EPCkKvbdUxhTzLOn
-EObjjvbdSQTgJfEX
-DoCkKvbdrWpLbiZR
-DoDLKvbdtcDUwWOo
-DoCkKvbdwzHfGXeS
-EPDLKvbdrzMPraHn
-EPCkKvbdDoCjjvcE
-DoDLKvbdbhlijewY
-EObkKvbdUxgsyjoO
-DoDLKvbdbUafxKsh
-DoCjjvbdULuoBWOi
-EPCkKvbdVBBqSqRy
-DoCjjvbdhkeENtcZ
-EPCjjvbdqYnggRDx
-DncLKvbdjhHMFfOL
-EOcKjvbdZxcinDMS
-DoDLKvbdvBDySndh
-DncKjvbdirziTKiz
-DncKjvbdJXsaglRQ
-DncKjvbdhfjDYvJu
-DncLKvbdjuvnDbYX
-EOcKjvbdKaLHMaxR
-DoCjjvbdiGjDZWKV
-DnbjjvbdEObjkWbd
-DnbkKvbdJmADygVB
-EPDKjvbdJvVFdEfi
-EPDLKvbdnGeXmOGy
-DoCjjvbdpssgSSKt
-EPDKjvbdwtldqYlO
-EPDKjvbdmfeXmNgZ
-DoCjjvbdqvokbiZR
-DoDLKvbdqUUHSRjt
-EObkKvbdmbKXYOnV
-EOcKjvbdaSGChTfL
-EPCkKvbdWWiYWDdg
-DoCjjvbduoTzqKnt
-DnbjjvbdHDkVjBjK
-EOcKjvbdbVBfwjtI
-EOcKjvbdjvXOEBxX
-DncKjvbdZLrETnMN
-EObkKvbdfNGXHMjL
-EPCkKvbdkDLkRHUg
-EObjjvbdZjTIQGbG
-DoDKjvbdZsiIyDsO
-DnbkKvbdbrbjscjB
-EPCjjvbdmbJwYPOV
-DoCkKvbdKDJcQicY
-DoDLKvbdZxcinCkr
-DoDKjvbduoTzqLPU
-EOcKjvbddndsKstS
-DnbjjvbdNQXqWNfs
-EOcKjvbdIidAKQGd
-DoDLKvbdTkvOaVni
-DoCjjvbdsPvPJcVf
-DoDKjvbdVqnXbElD
-EOcKjvbdIHGyyXxH
-DnbkKvbdUxgszLOn
-EPDLKvbdwuMdpxkn
-DnbkKvbdqrVLNkBN
-DncKjvbdijFgjMwr
-EPCkKvbdSQUGjFcw
-EObjjvbdRWmdCkgc
-DnbkKvbdVTltFkvK
-EOcLKvbdJbjCqKDY
-EObkKvbdfMfXGmKL
-EObjjvbdzRPNJKXA
-EPCjjvbdBsAbtGWr
-DoDKjvbdJXsahLqQ
-DnbkKvbdlBNOmALA
-DoDLKvbdlrYtzTDi
-EPDLKvbdZtJIxdTO
-DncKjvbdmbJvxPOV
-EPDLKvbdaMkBsUmH
-EPCkKvbdNsUVgFUp
-DoCjjvbdWfYytAPT
-EObjjvbdNHCpMpVL
-EPCjjvbdMgComPtk
-EOcLKvbdeqaWzlDP
-DoCkKvbdFVxopNKF
-EOcKjvbdYkrDsmlN
-DncKjvbdWWiYWEFH
-DoDKjvbdSLYfUfkT
-DnbjjvbdhkeEOVCy
-DoDKjvbdJXsagkpp
-DoDLKvbdZoOIdeZj
-DncLKvbdLiCMRYAS
-DncKjvbdyOTHwsJD
-DncKjvbdvmWANDeN
-DoDLKvbdtTSTYydc
-DoCkKvbddneSjtTr
-EObkKvbdkDMKpftg
-DnbjjvbdbhljKewY
-EPCkKvbdIsZBSlwl
-EPCjjvbdlqxuZsDi
-DnbjjvbdNrtWGeVQ
-EOcLKvbdvBEZSndh
-EOcKjvbdrJAJdmOe
-DoCjjvbdyOTHxTIc
-DoCjjvbdmfdwlnGy
-EOcLKvbdkDMKpgVH
-DoCkKvbdRECaQQdS
-DncKjvbdaMjartlg
-EPCjjvbdVviXuceH
-DnbkKvbdNsUVgFVQ
-DoDKjvbdFkEsDIMu
-EOcKjvbddZyPwyQb
-DoDKjvbdqmZixlIJ
-DoDKjvbdrEEhomvB
-EOcLKvbdlZSqsZHU
-EPCkKvbdehKuqmqH
-DoDLKvbdFxtuBDwb
-EPCjjvbdKjaHvAJy
-DncLKvbdBcpAujMf
-DoCjjvbdNQYRWOHT
-DoCjjvbdHakzEzAD
-EPCkKvbdJTYaSlwl
-DoCjjvbdzitpQETU
-DoDKjvbdvBEZSoFI
-DncLKvbdnBjXXoOV
-DoDLKvbdiZuGMROG
-DoDKjvbdKVtecdfi
-DnbjjvbddjJqvUzn
-EPCkKvbdaMjbStlg
-EOcKjvbdSZjHsDWA
-DnbkKvbdUaCRSqSZ
-DoDLKvbdxZgefXeS
-DncKjvbdjhGkfFnL
-DncKjvbdIjEAJogE
-EPCkKvbdNGcPlpVL
-DncKjvbdUMWPAvOi
-DnbkKvbdatafxKsh
-EObkKvbdjcMLQgUg
-DoDKjvbddeOqavcK
-EOcLKvbdoznELXoA
-EPDLKvbdeOdrjtUS
-DnbkKvbdjKFhJmXr
-EPCkKvbdpxoHfpdY
-DoCjjvbdZLrDsnMN
-EPCkKvbdwyhFexFS
-EOcKjvbdkClKpftg
-DoDKjvbdxnTIYSiD
-DncKjvbdxnShYSiD
-DoCkKvbdFxtuBDwb
-EObjjvbdYkrEUNkm
-DnbjjvbdNQYQvNfs
-EPCkKvbdhlFDnUby
-EOcLKvbdiCObdwRR
-DoCjjvbdVwJXvEFH
-DnbkKvbdBvzchePv
-EObkKvbdZHWdAPSi
-DncKjvbdHgGzYxXg
-DoCkKvbdMJCMQxAS
-EPCkKvbdZLqdTmkm
-DoDLKvbdnCJwYPNu
-EPCjjvbdOSsvGdtp
-DncKjvbdlYrqsZGt
-EOcLKvbdJYUBhLqQ
-DoCjjvbdZisHpGaf
-DnbjjvbdVgxWXfxz
-EPDKjvbdkWXNdBxX
-DoCkKvbdlZTSSyHU
-DncKjvbdjggLeenL
-DnbjjvbdKNAEZfuB
-DoCjjvbdLAkHMaxR
-EOcLKvbdZRNFJNFR
-DoDLKvbdjAQGaPfj
-EObjjvbdjggMGFmk
-DoDLKvbdyfyMAMeX
-DncLKvbdjbkkRHVH
-EOcLKvbdOTTugFVQ
-EOcKjvbdWHxWXfxz
-EPCkKvbdvwMBWBVu
-EPCjjvbdnHEwlnHZ
-DoDKjvbdHEKuiaij
-DoCjjvbdVwIwvEEg
-EPDLKvbdehKvRnRH
-DncLKvbdnVUyjirG
-EObjjvbdfMevgNJk
-EPDKjvbdjbkjqHVH
-DncLKvbdrJAKEloF
-DoCkKvbdGckWJaij
-DnbjjvbdTvMQJtAq
-EPCkKvbdhkddNtcZ
-DnbkKvbdrzMQTBIO
-DncKjvbdsZlQTAgn
-EPDLKvbdOFDtJIjd
-EOcLKvbdnBivwoOV
-DncKjvbdJXtBhLpp
-EPCkKvbdJTYaSmXl
-EOcLKvbdLGFgbBQu
-DncKjvbdnHEwlmgZ
-DoCjjvbdACrYJzJQ
-EPCkKvbdiZuGLqNf
-DnbjjvbdnGdxMmfy
-DnbkKvbdRkZGUgKs
-DoDLKvbdZisHofaf
-EPDLKvbdJKEAJpGd
-DnbkKvbdBsBDUFwS
-EObjjvbdtcDVWuno
-EOcKjvbdBsAbsfWr
-EPDKjvbdrWpMChyR
-DoDLKvbdVTltFkuj
-EPDKjvbdGFjSOJUR
-EOcKjvbdBsAcUGXS
-EPCkKvbdcJNKKfWx
-EPDLKvbdnQZyWKxb
-EPCkKvbdqTtGrSKt
-EObkKvbdjJfIKNXr
-EOcLKvbdVqmxBdkc
-EOcKjvbdFWYopMjF
-DnbjjvbdqdFJPnWB
-DoCjjvbdehKvRnRH
-EPDKjvbdkyTRsZGt
-EObjjvbdozmckYPA
-DnbjjvbdbrcLUDjB
-DoDLKvbdrMyixkhJ
-DoDLKvbdrpWOjCvG
-DoDKjvbdLFehCAqV
-DncKjvbdrWpMCiYq
-EOcKjvbdVTmUFkvK
-EObkKvbdhficZVjV
-EPCkKvbdIsZAsNXl
-DoCjjvbdmfdxNOHZ
-EPDKjvbdznopdblY
-DnbjjvbdLiCMRYAS
-DncLKvbdePEsKstS
-DoDLKvbdUMVoBVni
-DncKjvbdWRnXaeLc
-EObjjvbdrDdiPmvB
-DoDKjvbdDoDKkXDE
-DncKjvbdOAIrtJrA
-EPCkKvbdwzIGGXdr
-EOcLKvbdUQqPUtgm
-EPDLKvbdhlFEOUby
-DncKjvbdZirhPfbG
-EOcLKvbdKVuGEEgJ
-DoDKjvbddePSBvbj
-EPDLKvbdfHjuqmqH
-EPDKjvbdZjSgpHBf
-DncLKvbdunszpjoU
-EPCkKvbdqTtHRrKt
-EObjjvbdfNGXGljL
-EObjjvbdUGznMWue
-DnbkKvbdsPuoJbvG
-EObjjvbdnQZxujxb
-EPDLKvbdczZPwyQb
-DoCkKvbdWXIwvDdg
-EOcKjvbdQvmdDLhD
-DncLKvbdCIkBjiFj
-EObjjvbdjJegjNXr
-DncLKvbdcIlikFvx
-EPDLKvbdRkZFtfjs
-DoCjjvbdczYoxZRC
-EOcLKvbdatagXjsh
-DncLKvbdjcLjqGuH
-DoCjjvbdMSWlyuQz
-DoCkKvbdjuvnDbYX
-DnbjjvbdiMEdOUcZ
-EPCjjvbdcTDKtEKB
-DnbjjvbdwzHeexEr
-EPDLKvbdemGWgNJk
-EObjjvbdakLfOnDA
-EPDLKvbdTfznLvvF
-DoDKjvbdaNLBsUmH
-EOcLKvbdhzVFkqNf
-DoDKjvbdZRNFIldq
-DoDKjvbdlrZVZsEJ
-EObkKvbdbUagXjtI
-DoDLKvbdUyHsykPO
-EObjjvbdkVwNdCYX
-EPDLKvbdUVkpJtBR
-EPDKjvbdrMzJxkgi
-EOcKjvbdSLYfUgLT
-DoCjjvbdMRwNZtpz
-EPDLKvbdIxTaglRQ
-EPDLKvbdJqZdnenF
-DoDLKvbdZMRdTmkm
-DnbkKvbdANHxrvyx
-EPCjjvbdFkErbhNV
-EOcLKvbdWSNxCEkc
-EPCjjvbdiCPCdwQq
-DnbkKvbdbAvEeoow
-EOcKjvbdeFOrBvcK
-DnbkKvbdaRecHtGL
-DnbkKvbdZshhxcrn
-EOcKjvbdqTtHRrKt
-EObjjvbdauBgXjtI
-EOcKjvbdQdCaQRDr
-DoCjjvbdFVxopMjF
-EPDLKvbdIGgZyXwg
-DoDLKvbdRpTfjFdX
-DnbkKvbdSQUGifEX
-DnbjjvbdpxoIHREY
-DoDLKvbdqiAJeMne
-EOcLKvbdCIkBkJFj
-DncLKvbdFfKSNhsq
-DoDKjvbdwWkaVaVu
-EPDLKvbdNeETiJKd
-DnbjjvbdhbOcEvpq
-DoCkKvbdrbGMlHLZ
-DnbjjvbdLAjgMawq
-DncLKvbdlqyUzSdJ
-DncLKvbdYkqdTnLm
-EOcKjvbdYkrDsnMN
-EOcLKvbdnCKXXnnV
-DoCjjvbdDncLLWbd
-DoDKjvbdYpmFJMdq
-EPDLKvbdFpATXHFy
-DoDKjvbdJvUfEEfi
-EPDLKvbdmJEURVSB
-DncLKvbdtbcVWuno
-EOcLKvbdbUagYKtI
-EObkKvbdcJMjKevx
-DnbjjvbdKVuGEFGi
-DoCkKvbdZMRctNkm
-EOcLKvbdYpmEiMdq
-DoDKjvbdYpmEhmEq
-DncKjvbdzjVQQDrt
-EPCjjvbdzHYlAMdw
-EPDLKvbdYkqcsnMN
-EObkKvbdiiehJmYS
-DnbjjvbdDwwktUUM
-EObkKvbdrounjCuf
-DnbjjvbdGGKRmiUR
-EOcLKvbdwzIGFxEr
-EPDKjvbdOEdUJJLE
-DoCkKvbdfNFvgMjL
-DoDLKvbdOEdThhjd
-DnbkKvbdyTOImSCH
-EOcLKvbdzitpQESt
-DoDKjvbduDCuWvPP
-DoCjjvbdTppnuUhN
-DoCkKvbdIBlZdzAD
-DoCjjvbdZQmFJMeR
-DnbkKvbdJXsaglQp
-DoCkKvbdSZigrcWA
-EObjjvbdZsiIyETO
-EPDKjvbdZLqctOLm
-DncKjvbdwyhGFxFS
-DncLKvbdqwPkcIyR
-EPDKjvbdRkYfUgLT
-DoCkKvbdxxIjBpZk
-DncLKvbdqlyjYlIJ
-EPCjjvbdRaceLiYk
-EPDKjvbdjlbLyeHP
-EPDKjvbdrbFmLfkZ
-EPCkKvbdvBEYsPFI
-DncKjvbdSBdElJYk
-EPDKjvbdpxoIHREY
-EPCkKvbdjhHMFfNk
-EPCkKvbdANIYsXZx
-EObjjvbdnGdxNOHZ
-EObjjvbdKQzFPGOF
-DoCjjvbdtunYKRTA
-DnbjjvbdLFfHbBRV
-EOcKjvbdpedEsuaI
-DnbjjvbdYkqcsmkm
-EPCkKvbdbrcLUEKB
-DnbkKvbdNQYQunGs
-DoDLKvbdJcJbqKCx
-EPDLKvbdIxTbHlRQ
-DnbkKvbdvwMAvBWV
-EOcKjvbdfHkVqnQg
-EOcLKvbdbKkfPNcA
-EPDLKvbdVAbQrpqy
-DncLKvbdWRnXaeLc
-EPCkKvbdFpATXGey
-DoDLKvbdyfxlANFX
-DoCkKvbdFVyQQMjF
-EOcLKvbdxnShXrhc
-DoCjjvbdmaivwoOV
-DnbkKvbdbsDLTdJa
-DoCkKvbdUtMtGMVj
-DnbjjvbdNVSqkNAX
-EPDLKvbdWfYytAOs
-EPCkKvbdZyEJnDLr
-EObkKvbdyXhjCQZk
-EObkKvbddoFSkUTr
-EOcKjvbdeATqMxKG
-DnbkKvbdnPyyWKyC
-DncKjvbdkySrTZHU
-DnbjjvbdmfdxNNfy
-EPCkKvbdHlBznXQk
-EPDKjvbdZisIPgCG
-DncLKvbdrEEhonVa
-DoDLKvbdrykosBHn
-EObkKvbdqvpLbiZR
-DoCjjvbdhkeDnUcZ
-DoCkKvbdVwIwudEg
-DncLKvbdyXiJaozL
-DoCkKvbdyzeOSIIh
-EPCjjvbdkVwNcbYX
-DncLKvbdTkuoAuoJ
-EPCjjvbdijFgimYS
-DncLKvbdliEURUrB
-DoDKjvbdURQoUuIN
-DoDKjvbdrMzJxkhJ
-EPCkKvbdqYngfqEY
-EPDLKvbddwzUTrFz
-DoCkKvbdyYIjBpZk
-EPCjjvbdssSSxzEc
-EObkKvbdFejSNiUR
-EPCkKvbdrEFJPmua
-DnbkKvbdiifIJmXr
-EPDLKvbdZLrEUOLm
-EObjjvbdGFiqnItR
-DoCkKvbdjuwNcaww
-DncKjvbdmpZxukYb
-DoDLKvbdqdFJQNua
-EPDKjvbdNQYRWOGs
-DoCjjvbdZeYGzhIb
-EObjjvbdZjSgpHCG
-EObjjvbdhfjDYvKV
-EPCkKvbdJpzFOeme
-DnbkKvbdlhcsptrB
-DncLKvbdFeiqnJTq
-EObjjvbdZxcinCkr
-EPDLKvbdFVyQPmKF
-EObkKvbdelfWfljL
-EOcKjvbdJpydnenF
-DnbkKvbdbVCGwkUI
-EObkKvbdemFwGmJk
-DoCkKvbdBsAbsfWr
-EPDLKvbdJYTbHkqQ
-DncKjvbdyNrgxTIc
-DoDKjvbdGQASvfey
-EOcLKvbdRNYCZOUz
-EOcKjvbdyzeORgiI
-EOcLKvbdZQmEhleR
-EPCjjvbdmttyjjRf
-DnbjjvbdLBLGmBwq
-EOcLKvbdKVuFdFGi
-EPCkKvbdxmsHwsJD
-DoDLKvbdyOTIXriD
-EPDLKvbdZsiJYcsO
-EPCjjvbdjvXOEBxX
-DoCkKvbdlZSqsZGt
-DoDKjvbdADRxKZiQ
-EOcKjvbdzoQREcMY
-EObkKvbdGGKRmhsq
-EObjjvbdJutfDdgJ
-DoDLKvbdUsltFkvK
-EObkKvbdHDkWKBjK
-DncKjvbdLqwMzVQz
-EObjjvbdaRecITfL
-DoDKjvbdakMGPNcA
-DnbjjvbdwXMBWAvV
-EOcKjvbdQwOEDLhD
-EOcKjvbdAMgxrwZx
-DnbjjvbdqqtkNkAm
-DoDLKvbdbhmKKewY
-DoCjjvbdQmYBxnUz
-DnbkKvbdvPTzqKnt
-EPCkKvbdJqZePGOF
-DoDLKvbdTfznMXVe
-DoCkKvbdFyVUaDwb
-DncLKvbdFxuUaDwb
-EObkKvbdhlEcnUby
-DnbjjvbdCJLCKhfK
-DoCkKvbdPyNAGrrK
-EOcKjvbdVgxVxGxz
-EObkKvbdSxKkmzjx
-EOcLKvbdemFwHMjL
-EObjjvbdrEEiPnVa
-DoCkKvbdDjIJvXjA
-EPCjjvbdYTMAmToY
-DoCjjvbdbLMFnmcA
-DoCkKvbdrounjCuf
-EPDKjvbdrJAJeNOe
-DncLKvbdJbicQjDY
-EPCjjvbdmpZxvLZC
-DncLKvbdVrNxCElD
-DnbkKvbdDoDLKwCd
-DoDKjvbdsZkpSaIO
-EPCjjvbdNQYRVnGs
-DoCkKvbdVrOXbFMD
-DoCjjvbdlYrqryHU
-DoDLKvbdVTltGMVj
-DncLKvbdwzHfGXeS
-EPCkKvbdmajXYOnV
-EOcLKvbdZLqdTmlN
-DoDLKvbdqdFJQOWB
-EObkKvbdVgwvXgYz
-EPDKjvbdkMakzFHP
-DoDKjvbdakLfPNcA
-EObjjvbdyYJJbQZk
-DoDLKvbdDigivXjA
-DoDLKvbdHELWJajK
-EObjjvbdZGvdAPTJ
-EOcKjvbdUGzmkvue
-DncLKvbdSZigsCvA
-DoDLKvbddBsMrATm
-EObkKvbdmSZUzSdJ
-DncKjvbdjAPfaQGj
-DoDKjvbdlBMoNALA
-DnbkKvbdJTZArlxM
-EObjjvbdHgHZyXwg
-EPDLKvbdhzUekpnG
-EPDKjvbdEOcKjvbd
-DoCkKvbdjcLkRHUg
-EObjjvbdBiLBkIej
-DnbjjvbdZMSEUNkm
-DoCkKvbdzRPNJJwA
-EPCjjvbdGdKuiajK
-EPDLKvbdrEFIpOVa
-EPCkKvbdKfGHbApu
-EPDKjvbdUtMsfMVj
-DoDLKvbdbVCHYKsh
-EPDLKvbdEztRFMCi
-EOcLKvbdJmADzGta
-DnbjjvbdtSrSxydc
-DoCjjvbdACrYKZiQ
-EPDKjvbdsrqsYzEc
-DoCjjvbduLxXAtAw
-DoCjjvbdEztQdkbi
-DoDLKvbdkClKpgVH
-DoDLKvbdSCDeMJYk
-DoDLKvbdpxoIGqDx
-DoCkKvbdDigjVxKA
-EPDKjvbdGGKSOJUR
-EOcLKvbdiLeDnVDZ
-DnbjjvbdyOSgxShc
-EPDLKvbdNsUWHEuQ
-EOcLKvbdYpmFImEq
-DoDKjvbdZLrDtOLm
-DncKjvbdJvVGEFHJ
-EOcKjvbdZirgogCG
-EPCkKvbdKCjCqJbx
-EObjjvbdgKfzcGAE
-DncKjvbdZjTIQHBf
-DoDKjvbdRDcBQQcr
-DnbkKvbdZQmEiNFR
-EObkKvbdSiZjRABM
-EObkKvbdURROttgm
-EObjjvbdlZSrSxft
-DoCjjvbdNxPVzdOU
-EPCjjvbdqAheAWhE
-EPCkKvbdwXLaWBWV
-DoCkKvbdKDKDQjCx
-EOcKjvbdehLVqnQg
-DoCkKvbdZxdJmcMS
-DncLKvbdDjHjVxKA
-EObkKvbdXrlAmToY
-EOcLKvbdwtleRYlO
-EPCjjvbdtlYWaUBX
-EPCkKvbdiUzFXSVC
-DoCjjvbdcJNJkFwY
-EObkKvbdaRebhUGL
-EOcKjvbdNHDQMotk
-DoDLKvbdyTNhlqbH
-EOcLKvbdKfGIBaRV
-EObkKvbdKaLHMawq
-DoCkKvbdnCKWwoNu
-EPDLKvbdHffzYwxH
-DncKjvbdnGdxMmgZ
-EPCjjvbdNPwpvNgT
-DoDLKvbdYkrEUOMN
-DoDKjvbdTqROuUgm
-DoDKjvbdvBDyTPEh
-DnbkKvbdJKEAKQHE
-EObjjvbdiBoCeWqR
-DnbkKvbdmRyUyrci
-DnbkKvbdJuuGEFGi
-EOcLKvbdFyVVBEXb
-EObkKvbdwyhGFwdr
-EObkKvbdCTBDTevr
-DoDKjvbdjbkkQftg
-EOcKjvbdVAbQrqRy
-EObjjvbdLAkHMawq
-EObjjvbdEztQeLcJ
-EPCjjvbdcIlikFvx
-DncKjvbdZyEJmcLr
-EObjjvbdqceJPmua
-DncKjvbdZnmiEdyj
-EOcLKvbdiGicYujV
-DoCkKvbdFeirNhtR
-DoCkKvbdDjHjVxKA
-DnbkKvbdqFdEsvBI
-EOcKjvbdcImKKevx
-EPDLKvbdQmXbZOUz
-DncKjvbdqcdhpNvB
-EObkKvbdsPvOjCvG
-DoDKjvbdFVyQPmKF
-EOcKjvbdqYnhGpcx
-EPDKjvbdKfGIBaRV
-EPCkKvbdnGeXmNgZ
-DncKjvbdKVtedEgJ
-EObjjvbdCTAbsewS
-DnbjjvbdeEoRavcK
-EPCkKvbdNsUVfeVQ
-EPDLKvbdGdLWKCKK
-DnbjjvbdKfFhCBRV
-DoCjjvbdZLrDtOLm
-EPDLKvbdhtydvrVC
-DoDLKvbdZjTIPfaf
-DoCjjvbdbrcLTdKB
-DncKjvbdzoQRFClY
-DnbjjvbdSKyFuHKs
-EOcKjvbdZQldiMeR
-DncLKvbdkySrTYft
-DnbkKvbdSLZGUgKs
-EPCkKvbduCbuWvOo
-DoDKjvbdsCFlkgLZ
-DoCjjvbdrDdiPmvB
-EPDLKvbdySnJNRbH
-EPDLKvbdDoDKkXDE
-EPCjjvbdijGHjMwr
-EOcLKvbdeJjSWUzn
-EPCkKvbdKWVFdEgJ
-DoDLKvbdVYhTykPO
-EObkKvbdeJiqutzn
-DoCjjvbdRjyFuGkT
-DoDKjvbdHDkWJajK
-EPCkKvbdbKlFnnDA
-EPDKjvbdQwOEDMHc
-DoDLKvbdZshiZESn
-EObjjvbdkyTSSyGt
-DoCkKvbdxUmEpyLn
-EObjjvbdMuSqkNAX
-DncLKvbdbiNJkGWx
-DoCjjvbdWIYVwfxz
-DncLKvbdkVwNcaww
-DoDLKvbdOFEThhjd
-DoDLKvbddndrkUTr
-DnbkKvbdyzeNrHiI
-EPCjjvbdZRNEhldq
-DncKjvbdhlEdNuDZ
-DoCjjvbdqquKmkAm
-DoDKjvbdFyVVBDxC
-EPCkKvbdJuteceHJ
-DnbkKvbdiBoDEvqR
-DoDLKvbdLqvlzUpz
-EPCjjvbdrRuKnLBN
-DnbkKvbdZjShQHCG
-DnbkKvbdcScLTcjB
-EOcKjvbdyNrgxSiD
-EOcKjvbdZirhPfbG
-DoDLKvbdkIGkefOL
-EPDLKvbdkCkkRGtg
-EPDKjvbdbUafxLTh
-EObkKvbdhfjDYvKV
-DoCjjvbdpecdsvAh
-EOcKjvbdpfDeUWAh
-DnbkKvbdPxmAGsRj
-DnbjjvbdZMSEUNlN
-EOcLKvbdqFdFTvAh
-DoCjjvbdWXJXvDeH
-DoCjjvbdqUTfqrLU
-EPCjjvbdvOszqLPU
-EObkKvbdmtuZkJqf
-EOcLKvbdjgfkefNk
-DoCjjvbdhaoCeWqR
-EObjjvbdKaLHMbXq
-DoCjjvbdSLZFtfjs
-DoCjjvbdFfKSOItR
-DnbkKvbdqUUHSSKt
-EPCkKvbdHEKujBjK
-EObkKvbdIsZBSmXl
-EOcKjvbdRDcApQcr
-DoDKjvbduDDVWvPP
-EOcKjvbdLBLGlaxR
-DoDLKvbdIxTbHlQp
-EPDLKvbdrRtkOKaN
-DoCjjvbdRjyFtfkT
-EPDKjvbdGQASwHGZ
-EPDKjvbdMgDPlouL
-EObkKvbdJXtCILqQ
-EObkKvbdrEFJQNvB
-DoCkKvbdeOeTKtUS
-EObkKvbdSQTgJfDw
-EPCjjvbdSQUGiedX
-DoCjjvbdqUUGrRjt
-EPDKjvbdTqRPVUgm
-EPCkKvbdIMBznWqL
-EObkKvbdhancEwRR
-EOcKjvbdrMzJxkgi
-EPCjjvbdhbPDEvqR
-EPDKjvbdZHXEAOsJ
-EPDLKvbdxnShXriD
-DoCkKvbdLLAgvAKZ
-DoCkKvbdhficYvJu
-EObjjvbdZRMeIleR
-DncLKvbdYfwEAOri
-DoDLKvbdDwxMTtUM
-DoCkKvbdWRmwbFLc
-DnbkKvbdNQYRVnHT
-DnbjjvbdjmCMZeHP
-EPDKjvbdaNKbTUlg
-EPCkKvbdidkHVPAO
-DoCjjvbdHfgZxwxH
-EObjjvbdxwhibPyk
-EPDKjvbdFjeTDHmV
-DoDKjvbdiCOcFWqR
-DoCkKvbdJmADyfuB
-EOcLKvbdhficYujV
-DncLKvbdYzbfSJuy
-DoCjjvbdbUagXjtI
-DoDKjvbdjKFhKNYS
-EOcLKvbdCIkCLJGK
-DoDKjvbdZshiZESn
-EPCkKvbdSQTfjFcw
-EObkKvbdiMEcnUcZ
-EPDLKvbdyOTHxSiD
-EPCjjvbdFjeTDHmV
-DnbjjvbdJuuGEFGi
-EPDKjvbdhkeDnVCy
-EPCkKvbdVAaqSprZ
-DncLKvbdVUNTelVj
-DoCkKvbdfILVrNpg
-DncKjvbdNHDQNPuL
-EOcLKvbdLZQirztf
-EObjjvbdGckWKCJj
-EObkKvbdIHGyyXwg
-DncLKvbdiUydwSVC
-DoDLKvbdpecdtWBI
-EOcLKvbdLGFgaaRV
-EOcLKvbdezuxeJUX
-EObkKvbdgGLymgHA
-DnbjjvbdEvZQQNJe
-DncKjvbdJcJbpjDY
-DoDKjvbdIxTahLqQ
-DncKjvbdBcpAvJlf
-EObjjvbdnPyyVkYb
-EObjjvbdfNGWfljL
-DnbjjvbdieLHVPAO
-EOcKjvbdRNYCYmtz
-EPDKjvbdiHJcYuiu
-EObkKvbdMowqVnHT
-DoCjjvbdiUydvrUb
-EObjjvbdZMRcsnLm
-DnbkKvbdaSFcIUFk
-DnbjjvbdZyEKNcLr
-DnbkKvbdZnnJFEzK
-DncLKvbdJSyBSlxM
-DoCkKvbdXsMAmUOx
-EPCjjvbddneSkTtS
-EOcLKvbdVwIxWEEg
-EPCjjvbdxsOJMrBg
-DncKjvbdkIHMGGOL
-DncLKvbdGFjRmhsq
-DnbkKvbdySmiNRag
-EPDKjvbdpyPHgREY
-DnbjjvbdGZUuAcxC
-DnbjjvbdiHKDYvJu
-DoCjjvbdtlXwBUBX
-EObkKvbdTkvPAvPJ
-EOcKjvbdSxLLmzkY
-DncKjvbdhgJcZVjV
-EOcLKvbdZirgogBf
-EOcKjvbdTukpKUBR
-EPDLKvbdQlwaxmtz
-DoCkKvbdNxOuzdNt
-EPDLKvbduCbuXWPP
-EPCkKvbdmbJvwoNu
-EObkKvbdKDKCqJbx
-EPCjjvbdyNsIXrhc
-EPCkKvbdSCEEkiYk
-EObkKvbdOFDshiLE
-DoDKjvbdZnmiFEzK
-EObkKvbdJbjDRKDY
-EObkKvbdYfvdAOri
-DncKjvbdkDLjpfuH
-DoCkKvbdsrqsZZdc
-DoDKjvbdLBLHNBwq
-DncLKvbdDjHjWYKA
-DoDKjvbdZQleIldq
-DoDKjvbdatbGxKtI
-EObjjvbdUWMQKUAq
-EOcLKvbdlhdUQtrB
-EPCjjvbdAMhZTWyx
-DoCjjvbdjhGlGFmk
-DoDLKvbdHgGzZXxH
-EOcKjvbdrykoraIO
-DoDKjvbdjJehJlwr
-EObkKvbdrEEhonWB
-EPCjjvbdiUyeWrUb
-DnbkKvbdNQYRVmgT
-EPCjjvbdVUNUFkuj
-DnbjjvbdEYYMTtUM
-DoDKjvbdYpldhldq
-EPCjjvbdtlYWaTaX
-DoCjjvbdozmdLXoA
-DnbjjvbdZnnJFFZj
-EObjjvbdZshiZDrn
-EPDLKvbdZjShPfaf
-DoCkKvbdrpVnibvG
-DoCkKvbdQwNcblHc
-EObkKvbdxZgefXdr
-DoDKjvbdNddUIhkE
-DncKjvbdcImJkFwY
-DoDKjvbdZirhQGaf
-DoDKjvbdqwPkcJZR
-EPDLKvbdkHgLfFnL
-DncKjvbdlqxuZrci
-DncKjvbdRadFLiYk
-EPDKjvbdIHGyxxXg
-EObkKvbdmpZyVjyC
-EPCkKvbdUaBqSpqy
-EOcKjvbdqZOgfqDx
-EObkKvbdkNBlZeGo
-EObjjvbdOAIrsjSA
-EPDLKvbdEvZPpNKF
-DnbjjvbdczYoxZRC
-DoDKjvbdvAdZTPEh
-DncKjvbdqUTfqrKt
-EPCkKvbdZGwEAPTJ
-EPDLKvbdZMSEUNkm
-EPCjjvbdYkqctNlN
-DnbkKvbdeEnqawDK
-DoCjjvbdKVuGEFHJ
-EOcKjvbdzitopDsU
-DnbjjvbdsBfNLgLZ
-DnbjjvbdcImJkFvx
-EPCkKvbdMgCpNQUk
-EOcLKvbdZQmEhleR
-EPDLKvbdtTRrxzEc
-DncLKvbdKVuFceHJ
-EPCkKvbdyfxlAMdw
-DnbkKvbdsZkosBHn
-EPDLKvbdwWlAvBVu
-DoDLKvbdlqxuZrdJ
-EPDLKvbdMRwMzUpz
-EObjjvbdFkFTCgmV
-EObkKvbdHEKvJbKK
-DncLKvbdkNCMZdfo
-DoCjjvbddoFSkTtS
-EPCkKvbdRpTfjFdX
-DoDKjvbdIGgZyYXg
-EPCkKvbdBiLCLIfK
-DoCjjvbdKQydnfNe
-EPCjjvbdHgGzZYYH
-DnbjjvbdYNqAYUvU
-DncKjvbdGckVjBjK
-DoCjjvbdjhHMFemk
-DnbkKvbdkIGkeenL
-DncLKvbdmaivwnmu
-EPDLKvbdmuVZkJqf
-EPDKjvbdNddUIhjd
-DoCkKvbdRDbaQRES
-DncLKvbdTvLojUBR
-DncLKvbdtSrSxyeD
-DncKjvbdjgflGFmk
-DoCkKvbdQwNdDLgc
-DoCkKvbdEXwksssl
-DoDKjvbdtAHRIAAr
-DoDLKvbdSPsgJecw
-EObkKvbdjggLfGOL
-DoCjjvbdSBdFLhxk
-DoCkKvbdiMEdNuDZ
-DoCjjvbdhtzFWrUb
-EPCjjvbdSKxetgKs
-DoDLKvbddndsLTtS
-DncKjvbdtcCtwVno
-DoDLKvbdACrYJzJQ
-EOcLKvbdyOShXrhc
-EObjjvbdqquKnKaN
-DoCkKvbdnCJvxOnV
-EPDLKvbdFWYpQMjF
-DnbjjvbdnCJvwoNu
-EObkKvbdhfjCyWKV
-DoDKjvbdrNZjZLhJ
-DnbkKvbdyNrgwsIc
-EPCkKvbdSZjITDWA
-DncLKvbdqiAJeNOe
-DoCkKvbdhaoDEvpq
-EOcLKvbdtkwwAtAw
-DncKjvbdsPvOicWG
-DoCjjvbdWXJYVcdg
-DoDLKvbdmIdUQuSB
-DnbkKvbdauBgYKtI
-EOcLKvbdJbicRKCx
-DoDLKvbdsPuoJcVf
-EPCkKvbdfILWRnRH
-EPCkKvbdAMhYrvzY
-DoCjjvbdKWUedEfi
-EPCkKvbdhaoDEvqR
-EObjjvbdxVMeRZMO
-DncKjvbdFaOqZJzm
-DncKjvbdIryArlwl
-EObkKvbdRWmccLgc
-EPCkKvbdsPunibvG
-EOcKjvbdQccBPpcr
-EPDKjvbdssRsYzFD
-DncLKvbdySmiMqbH
-EObkKvbdZLqdTmlN
-EPDLKvbdVAaqTQqy
-DncLKvbdFWZPomJe
-DoDKjvbdUVkojTaR
-DncKjvbdULvPBWPJ
-EObjjvbdUslsfLuj
-DoDKjvbdsBfMlHKy
-DoCjjvbdkySrTYgU
-EPDKjvbdYgXEAPTJ
-EOcLKvbdrzMPsAhO
-DoCkKvbdcyxpXyRC
-DncLKvbdkIGkeemk
-EObkKvbdVqnXbElD
-EObkKvbdMuSqkNAX
-DncLKvbdkNCLydfo
-EOcLKvbdUVlQJsaR
-EOcKjvbdczZPxYqC
-EObkKvbdWIXvXfxz
-DoCkKvbddndsLTtS
-DnbkKvbdFfJqmiUR
-DncKjvbdURROuVIN
-EObkKvbdddnrCXDK
-DncLKvbdZyEJmcLr
-EPCkKvbdVgxVxHYz
-DoDKjvbdFfKRmiTq
-EPDKjvbddCTNSAUN
-DoDLKvbdUxgsykOn
-DoDLKvbdBhjbLIfK
-DoCkKvbdFejRmiTq
-EPDLKvbdmuUykJqf
-DoCkKvbdVTmTfLuj
-DoCjjvbdkNCLydgP
-DnbjjvbdHffzYxYH
-EObkKvbdpxngfpcx
-EPCjjvbdKQzFOfOF
-DncLKvbdOEdThiKd
-EOcKjvbdJSyBTNXl
-DncLKvbdyNsIXriD
-EOcLKvbdJYTagkpp
-DoCjjvbdkMakzEfo
-DoDLKvbdZjSgpGbG
-DnbjjvbdSQUHJfDw
-DncKjvbdRpTgJedX
-DncKjvbdrykosBIO
-EObkKvbdGYttaEYC
-DoCkKvbdZxcjNcMS
-DoCjjvbdRadElIyL
-DoDKjvbdkySqryGt
-EPDKjvbdiHJbyWJu
-EPCjjvbdwzHeewdr
-EPDKjvbdQwNccLhD
-DoCjjvbdbBVeGPow
-EOcKjvbdddnrCWcK
-EPCjjvbdJXtCHkqQ
-EObkKvbdrbFllHLZ
-DncKjvbdACqxKZhp
-DoCkKvbdJXtCILpp
-DncKjvbdEYYMTssl
-EOcKjvbdwjvdHzzG
-EPDLKvbdemGWgMik
-EPCjjvbdqvokcIyR
-DnbkKvbdUaCQrprZ
-DoCjjvbdKCjCqKDY
-EPDKjvbdYSlBMtOx
-EPDLKvbdyXiKBozL
-EObkKvbdZxdKNcMS
-EObkKvbdCDpBVjNG
-DncKjvbdmgExMmgZ
-EObjjvbdHkaznWqL
-EObjjvbdkNCLzEfo
-EPDLKvbdyNrgwsIc
-DncKjvbdnHFYNNfy
-DoCkKvbdDwwktTsl
-EPDLKvbdTlWOaWPJ
-DoDKjvbdmIctRVRa
-EPCkKvbdeEnqbWbj
-EPDKjvbdTYLMNzkY
-DncKjvbdkHgLfGNk
-DncLKvbdnPyxvLZC
-EOcLKvbdjKGHjMxS
-DoCjjvbdiZtfMROG
-EPDKjvbdFeiqmhsq
-EPDKjvbdDoDKjvbd
-EOcLKvbdKRZeOfOF
-DoDKjvbdzoQQeCkx
-EObjjvbdEOcLKwDE
-DoCkKvbdrafNLgLZ
-EObjjvbdMfbomPuL
-DncKjvbdUQqPUthN
-EOcLKvbddjJrWUzn
-DoDLKvbdvBDySoEh
-DnbjjvbdVUMselVj
-DoCkKvbddndrkUUS
-EObkKvbdmpZxvKxb
-EPCkKvbdmbJvxPNu
-EPCkKvbdmfdwlnHZ
-DnbkKvbdZRMdhmFR
-DnbjjvbdYSlBNToY
-DncLKvbdzoQRFClY
-EPCkKvbdVZITzLOn
-DncKjvbdZtIiZDrn
-DncKjvbdFVxopNKF
-EOcKjvbdtTSSxydc
-EObjjvbdUVlQKTaR
-EPDLKvbdkMbLzEgP
-DoDLKvbdKDJcQicY
-DoDLKvbdJmAEZgVB
-EOcKjvbdCWzdJFPv
-DncLKvbddneTLUUS
-EObjjvbdBcoaWJlf
-EPDKjvbdGcjvJbJj
-DoCjjvbdddoRavcK
-EOcLKvbdAMhZSvyx
-DnbjjvbdajlGOmcA
-DoCkKvbdCIkCLJFj
-DnbjjvbdMSWmZtpz
-EOcKjvbdNGcQMpUk
-EOcKjvbdTqROuUhN
-DoCkKvbdFVxoolie
-DoDKjvbdUQpnuUgm
-EPDKjvbdnBiwXnmu
-DnbjjvbdJuuGDdgJ
-EPCjjvbdZLqcsnLm
-EObkKvbdZnmheEzK
-DoDKjvbdXsMAltOx
-EObkKvbdiMEdOUcZ
-DoDKjvbdZRNEhleR
-DoDLKvbdMIbLpxAS
-DoDLKvbdVwIwucdg
-DoCjjvbdRbDeLiZL
-DncLKvbdZMRctNlN
-DoCkKvbdGcjvJbJj
-DnbjjvbdSZihScWA
-EPDLKvbdkDLjqHUg
-DnbjjvbdZisIPfaf
-EObjjvbdmpZyWLZC
-EOcLKvbdrbGNLgLZ
-DnbkKvbdkVvmdBww
-EObjjvbddoFSjstS
-EObjjvbdxwiJbPyk
-EPDKjvbdTvLoitAq
-DoCkKvbdZLrDsnMN
-DoDKjvbdOAJTUJrA
-EObkKvbdURQntuHm
-EObkKvbdkIGkefOL
-DncLKvbdsCFllHKy
-EPCkKvbdatafxKtI
-DoCjjvbdiifHjMxS
-DnbkKvbdZsiIyDsO
-DncKjvbdieKgUoAO
-EPCjjvbdBhkCLIej
-DnbjjvbdDxXktTsl
-EObkKvbdKCjCqKCx
-EOcLKvbdIwsahLqQ
-EPDLKvbdhzUfLpnG
-EObjjvbdbAvEepPw
-EOcLKvbdSLZFuHKs
-DnbkKvbdIidAJogE
-DnbjjvbdJbjDQicY
-EPDLKvbdQwODblID
-EObkKvbdqZOgfqEY
-EObjjvbdkWWnDbXw
-DncLKvbdEvZPpMjF
-EPDLKvbdKQydnfNe
-EObjjvbdUWMQJtAq
-EOcLKvbdqrUjmkBN
-DoDLKvbdJmAEZfuB
-DoCkKvbdhtydvqtb
-DoCkKvbdtAHQhABS
-EPDLKvbdxZhGGXdr
-EPDKjvbdmSZVZrci
-DnbkKvbdZjTHogCG
-EObkKvbdYqMdiMeR
-DoDKjvbddwzUURez
-DoDLKvbdbKlFnnDA
-EPCkKvbdGGKSOJTq
-EObkKvbdLGFgbBRV
-DoCkKvbdKyQjSzuG
-DncKjvbdJcJcRJcY
-EOcLKvbdnBiwYPOV
-EOcLKvbdLGGHaaRV
-EObjjvbddneSkTtS
-DoDKjvbdiLddOUcZ
-EObkKvbdsPvOjCuf
-DnbkKvbdZyEKOClS
-DoCjjvbdyzeORhIh
-DnbkKvbdhkeDmuCy
-EObkKvbdvvkaWAvV
-EOcKjvbdzeZnzdzQ
-DoCjjvbdVAaprqSZ
-EObjjvbdjhGkefNk
-DncLKvbdSKxfVHLT
-EPCjjvbdZRMeImFR
-DncLKvbdFeirOJTq
-DncLKvbdFfJrOItR
-DoDLKvbdmoyyVkYb
-DncLKvbdddoRavcK
-DoDLKvbdauBfxKtI
-EObjjvbdSPtHJfDw
-EPCjjvbdCEQBWJmG
-DoCjjvbdDnbkLWcE
-EPDLKvbdVUNUGMVj
-DnbkKvbdnQZyVjyC
-DnbkKvbdgFkymfgA
-DoDKjvbdRDcBQQdS
-EOcKjvbdtcCuWvOo
-EObkKvbdlrYuZrdJ
-DoCjjvbdZirgogBf
-DoDLKvbdMfcPmPuL
-EOcKjvbdDwwlTtTl
-DncLKvbdwXLaWAuu
-EPDKjvbdUaBqSpqy
-EObkKvbdHlBznXRL
-EPCkKvbdkMakzFHP
-DnbkKvbdqZOgfpcx
-DnbkKvbdUMWOaWPJ
-DncLKvbdMfbolpVL
-EObjjvbdfekynGgA
-EPCkKvbdWWiXvEFH
-DoCjjvbdpxnhGqDx
-DoDKjvbdsQVnjDWG
-EObkKvbdYNqAXtut
-DncLKvbdDnbkLXCd
-EObkKvbdKaLGmBwq
-DoCkKvbdBvzciFPv
-DoDLKvbdjKFgilwr
-EPCkKvbdUaBqTQqy
-DoDLKvbdVgwvYHYz
-EPDKjvbdIHGyyXwg
-EPDKjvbdEXxMTstM
-DnbkKvbdQccBPpcr
-DnbkKvbdMgCpNPuL
-EPDKjvbdSPtHKFcw
-DoDKjvbdkIHMGFnL
-DncLKvbdnGeXmNgZ
-DoDLKvbdhtyeWquC
-EObjjvbdqGEFUVaI
-EOcLKvbdNPwpumgT
-DnbkKvbdZshiYdTO
-DoDKjvbdZMSETmkm
-DncLKvbdRbDdkhyL
-EPCjjvbdTvMQJtBR
-EObkKvbdjvXOEBww
-DncLKvbdrXPkbiZR
-EOcLKvbdFejSOJTq
-EOcKjvbdegjvRnRH
-EPDLKvbdJvVGDeHJ
-EObjjvbdXrlBMtOx
-DncKjvbdFejSNhsq
-EPDKjvbdBiLBjiGK
-EOcKjvbddiirVtzn
-EPDLKvbdVBBqTRRy
-DoCkKvbdeqaWzkcP
-EObjjvbdqYnggREY
-EPDKjvbdEARiNZwX
-EObjjvbdSQTfifEX
-EObjjvbdLBLHNBxR
-EPCkKvbdNHCpMpUk
-EPCkKvbdKVuGDdfi
-EPCkKvbdxrnImRbH
-EOcLKvbdZRNEiNFR
-EOcLKvbdtbcUvuno
-EPCjjvbdJTZAsNXl
-EPDLKvbdFVyQPljF
-DoCkKvbdieKftoAO
-EObkKvbdZMSETnMN
-DoCjjvbddePSBvcK
-DncLKvbdqUUHSSLU
-DoDLKvbdZQldhmEq
-DoDKjvbdOTTugFUp
-DncLKvbdZsiJZESn
-DnbjjvbdtbcUwWPP
-EPDLKvbddwzTtRez
-DnbjjvbdZoNheFZj
-EPCkKvbdKfFgbApu
-DoDLKvbdhytfMQmf
-DnbkKvbdnGeXlnGy
-EPCjjvbdSBcdlIyL
-DncKjvbdbAvFFpPw
-EObjjvbdzoPpeClY
-EOcLKvbdqwQMDIyR
-EPCjjvbdmaivxOmu
-EPCjjvbdIwsahLqQ
-DncLKvbdddoSBwCj
-EOcLKvbdrEEhpNvB
-DoCjjvbdEPCkKvcE
-DncKjvbdePEsLTsr
-DncKjvbdmRyVZsEJ
-DnbjjvbdZLqdTnMN
-EPDKjvbdRbEFMIxk
-EObjjvbdJXsbHlRQ
-DncKjvbdkDMLQftg
-EOcKjvbdOEctJIjd
-DnbkKvbdqTsfrRkU
-EPDKjvbdkIGkeenL
-DoDLKvbdUxhUZjnn
-DncLKvbdwyhFexFS
-EPDKjvbdbLLfOmcA
-DnbkKvbdtbbuXWPP
-EOcLKvbdYpmEhmFR
-DnbkKvbdxmsHxTIc
-DoDKjvbdznoqFDLx
-EObjjvbdmfdxMnHZ
-EObjjvbdYTMBNUOx
-EObjjvbdADRwizJQ
-EOcLKvbdMoxQvOGs
-EOcLKvbdrWolDJYq
-EPCjjvbdeFPRbXDK
-DoDKjvbdrDdhpNvB
-EPDKjvbdZxdKODLr
-EOcLKvbdWSNwadlD
-EOcKjvbdxrmhlqbH
-DoDLKvbdzoPqEblY
-DncKjvbdTkuoBWPJ
-DnbjjvbdrykpSaHn
-EOcKjvbdKWUfDdgJ
-DnbkKvbdZMSEUOMN
-EObkKvbdSBcdkhxk
-DnbjjvbdIGfyyYXg
-EPCkKvbdnBjWwoOV
-EOcKjvbdzaAPGgBl
-DnbjjvbdkVvmdCXw
-DoDLKvbdkDLkQfuH
-DoCkKvbdVqnXbFMD
-DncKjvbdWWiXuceH
-DoCjjvbdBvzdIePv
-DncKjvbdLFfICBQu
-DncLKvbdeFPRawDK
-DncKjvbdjmBkydgP
-EObjjvbdVUMtFkuj
-EPDLKvbdrSUjmkBN
-DoDLKvbdSPsgKFdX
-DoDKjvbduDDVXVno
-DoCjjvbdMuSqjmAX
-EPCkKvbdZyEJmcLr
-DnbkKvbdMfcQMouL
-DoDLKvbdUMWPAuni
-DnbjjvbddZxpYZRC
-EPDKjvbdbAvEeopX
-DnbkKvbddoErkUUS
-DoCjjvbdePErjstS
-EOcKjvbdGKeTDHlu
-EObjjvbdfIKvSORH
-EPCjjvbdUsmTelWK
-EObkKvbdaMkBsVMg
-DoCkKvbdRjxfVHKs
-DnbkKvbdMpYQumgT
-DncLKvbdVwIxWEFH
-DncKjvbdaMkCTUmH
-DoDLKvbdhlFENuDZ
-EPCjjvbdZisIPgCG
-EPCjjvbdZnnJEdzK
-EPDKjvbdGLEsDINV
-EObjjvbdYzcFrKVy
-EPDKjvbdZirhPgBf
-EPDLKvbdKaLGmCXq
-EObkKvbddoErkTsr
-DoCkKvbdRXNdCkgc
-DoDLKvbdEvZQQNKF
-DoCkKvbdZoNhdeZj
-EPCkKvbdhkddNtby
-EPDLKvbdZLrDtNlN
-DncKjvbdRbDdlIxk
-EPCkKvbdEOcKjwCd
-DncKjvbdlqyUyrdJ
-DoDLKvbdNddThhkE
-EOcKjvbdwyhFewdr
-EPDLKvbdiUydwSVC
-DnbkKvbdYzcFqjWZ
-DnbkKvbdiBoCdwRR
-EOcLKvbdpecdsuaI
-EPCkKvbdQlxCYnUz
-EPDLKvbdVvhxWEEg
-EOcLKvbdlZSqryGt
-EPCkKvbdUaCQsQqy
-DoCkKvbdvAdZSndh
-DnbjjvbdmttykKRf
-EPCkKvbdYgWdAPTJ
-DoCkKvbdlYrqsZGt
-DnbkKvbdZsiIxcrn
-DoCjjvbddeOqavbj
-EObkKvbdbVBfwjsh
-EObjjvbdMoxQvOHT
-EPCkKvbdRbEFLiYk
-DoCkKvbdlhdTqUqa
-EOcLKvbdMIbMRYAS
-EObkKvbdDncKkWbd
-DncLKvbdfSAvzkcP
-DnbkKvbdxsOIlqbH
-DoCkKvbdADSYKZhp
-EPCjjvbdZshiZESn
-DoCjjvbdieLGuPAO
-EPCjjvbdkHgMFenL
-EPDKjvbddBrlrAUN
-DncKjvbdddoSCXCj
-EPCjjvbdsQWOibvG
-EObkKvbdKkBHvAKZ
-EObjjvbdkWWmdBww
-EObjjvbdnGeXmNgZ
-EOcLKvbdyNrgwrhc
-DnbkKvbdNddThiLE
-DncKjvbdDjHivYKA
-EObjjvbdWXIxWDdg
-EObjjvbdrMyixlIJ
-EOcKjvbdcyyPxYpb
-DncKjvbdcyxowxpb
-EOcLKvbdhbOcFXQq
-EOcKjvbdHDjuibKK
-DoDKjvbdiVZeXRuC
-EOcKjvbdnBjXYOnV
-DnbkKvbdOTTufdtp
-DoDKjvbdVAbRTRSZ
-DnbjjvbdRXOEDLgc
-EOcLKvbdznopdcLx
-DncLKvbdRNXayOUz
-DncLKvbdSPtHKFdX
-EPDKjvbdxUldqYkn
-DoCkKvbdZRNEiNEq
-EPDKjvbdrbFllGjy
-EPCjjvbdUyHszLPO
-DncLKvbdxwhibQZk
-EOcKjvbdFWYopMie
-EOcKjvbdaNKbTVMg
-DnbjjvbdliETqUrB
-EObjjvbdRXODbkgc
-DnbkKvbdTlWPBWPJ
-EOcKjvbdOFEThiKd
-EObjjvbdMSXMzVQz
-EObjjvbdHDkVjCKK
-EPDLKvbdqFceTuaI
-EOcKjvbdFyUtaDxC
-EOcLKvbdmgExMnGy
-DncKjvbdtlYWaUBX
-DoDKjvbdCDoaWJlf
-EPDKjvbdkyTSTYgU
-DoCjjvbdqqtjnLAm
-DnbjjvbdGYtuAdXb
-DoCkKvbdBhjbLIfK
-EPDKjvbdNPwqVmfs
-DoCjjvbdsrqsYzFD
-EPDKjvbdSPsfjFdX
-EPCjjvbdZyDjNbkr
-EPDKjvbdqZOgfpcx
-EPCkKvbdqGDeUVaI
-DoDKjvbdUVkpKUAq
-DoCjjvbdRpUGjGEX
-DoDLKvbdmgFYMmfy
-EPDLKvbdRpUHKFcw
-DoDLKvbdEvZQPmKF
-DoDKjvbdZshhxdTO
-DoCjjvbdiZuGMROG
-DoDKjvbdfpBzvdYI
-EPCjjvbdmgFYNOGy
-EOcKjvbdNrtWGdtp
-DnbjjvbdWHxVwgYz
-EPCkKvbdJbjDRKDY
-EPCjjvbduWOYJpsA
-DncKjvbdehLVrORH
-DoCjjvbdGFjSOItR
-DoCkKvbdjuwODbYX
-EObjjvbdJTZBSmXl
-DnbkKvbdzQoNIiwA
-EObjjvbdjJfHilwr
-EOcKjvbdJpyeOfOF
-DnbjjvbdqFdEsuaI
-EPDLKvbdUxhTzKoO
-EPDKjvbdBraCsfXS
-DoCjjvbdLAjgNBxR
-EObkKvbdlhdTqUrB
-EPCjjvbdZoOIeFZj
-DnbjjvbdrDdhpNua
-EPCjjvbdIHHZxxYH
-EPCkKvbdiMEdOVCy
-DoDKjvbdhgJbxvKV
-DoDLKvbdUyHsyjoO
-DoDKjvbdGQATXGfZ
-DnbjjvbdvAdYroEh
-EPCkKvbdhtydvrUb
-DoCjjvbdsQWOicWG
-DncLKvbdcJMjLGWx
-DoCkKvbdIwsaglQp
-DoCkKvbdYkrEUOLm
-EObkKvbdVvhxWDeH
-EPDLKvbdZMRdTnLm
-DoCjjvbdADRwizJQ
-DoDKjvbdSwjkmzjx
-DnbkKvbdBiKbLIfK
-EPCjjvbdRyigsDWA
-EPDKjvbdRXOECkhD
-EObjjvbddxZtTqez
-EObjjvbdbBVdfPow
-DncLKvbdMfcQNQVL
-EPDKjvbdVBBqTQrZ
-DncKjvbdZMRctOLm
-DncKjvbdGGJrOIsq
-EPCjjvbdZMSETmlN
-DoDLKvbdhlEdOVDZ
-EOcLKvbdOhAXyAZB
-DoCkKvbdyOTIYSiD
-DoCjjvbdUtNUGMVj
-EObkKvbdWXJYWDdg
-EOcLKvbdBhjbKhej
-EObkKvbdVwIwvDdg
-EPDLKvbdzjUpQDsU
-EOcKjvbdqAiFAXHd
-DoDLKvbdqrUkNjaN
-EOcKjvbdYORAYUvU
-EOcLKvbdcIljLFwY
-DnbkKvbdVwJXvDdg
-DoDKjvbdVBCQsRSZ
-DoDLKvbdmuUzKiqf
-EObkKvbdJYUCILpp
-EPDKjvbdsQVoKCvG
-EPDLKvbdmoyyVkZC
-EPDLKvbdsCGNLfjy
-EOcKjvbdbiNKLGWx
-DoCjjvbdrpVnjDWG
-EObkKvbdfVzxPizs
-DnbkKvbdRXODcLgc
-EPCjjvbdjJfIJlxS
-DoCjjvbdZLqcsnLm
-DncKjvbdjuvnECXw
-DoDLKvbdEPDKkXCd
-DnbjjvbdOSsvGduQ
-DoDKjvbdIMBzmvpk
-EPCjjvbdqrUkOLAm
-EPCjjvbdTkvOaVoJ
-EObjjvbdozmdKwoA
-DncLKvbdDxXkstTl
-EOcKjvbdfMewHMik
-DoDLKvbdGKeTCgmV
-EObjjvbdxnSgwsIc
-EPCkKvbdaaVdepPw
-EObkKvbdqGEFUVaI
-DncLKvbdjblKpgUg
-DoDLKvbdRWnEDLhD
-DnbjjvbdFxuVAcxC
-DncKjvbdqZOhGpcx
-DoCkKvbdfHjvRnQg
-DnbkKvbdwMvANDeN
-EObkKvbdFfKSOIsq
-DoCjjvbdmajXYPNu
-EObkKvbdANHyTXZx
-EPCjjvbdLFfHbAqV
-DoCjjvbdVgwuxHYz
-EPCjjvbdQvmcblHc
-DoDKjvbdaSFbhUGL
-DncLKvbdzHZMANFX
-DncKjvbdySnJNRbH
-DoCjjvbdMpYRVnHT
-EObkKvbddePSBwDK
-EPCkKvbdMfcPmQUk
-EObjjvbdMgCpNQVL
-DoDKjvbdrEFIonWB
-DoDLKvbdFjdsCgmV
-EObjjvbdwtmFRYlO
-DnbjjvbdIwtBgkqQ
-EPCjjvbduaDxrndh
-EPDLKvbdShzKRABM
-DnbjjvbdfHjvRnRH
-EOcKjvbdBiLBjiGK
-EPCjjvbdCEPaWKNG
-DoDKjvbdtbbuWuoP
-DoDKjvbdegkWRmqH
-DnbjjvbdNeETiJLE
-EPCkKvbdjcLkRHUg
-DnbjjvbdjvXOEBww
-EOcLKvbdTlWPAvOi
-DoCjjvbdrMyixkhJ
-EObkKvbdqGEEtWAh
-DncKjvbdbBVeGQPw
-DoDLKvbdpssfqqjt
-DnbkKvbdFWZPomJe
-DoDKjvbdSBcdkiYk
-DoCkKvbdvBEZSoFI
-EOcKjvbdRaceLhxk
-EOcKjvbdJKEAKQHE
-DoDLKvbddZyQYYpb
-EObjjvbdeXzTsqez
-DncLKvbdCSaCtGXS
-EPCkKvbdlZSrSyHU
-EOcLKvbdTJZiqABM
-DncLKvbdvAdYsOdh
-DnbkKvbdcyxoxZQb
-DnbkKvbdhanbdwRR
-EPCjjvbdbBVeFopX
-DncKjvbdGLFTDHmV
-DoCjjvbdiZuGLpmf
-EOcLKvbdJbjCqJbx
-EObkKvbdGdLWJbKK
-DoCjjvbdRkZGVHKs
-DoCjjvbdGckWJajK
-DncKjvbdAMgxrvyx
-EPCjjvbdEPDKjvbd
-EOcLKvbdkDLjqGtg
-DoDLKvbdNPxRVnGs
-DoDKjvbdySmhmRag
-EPCjjvbdVqnXadkc
-EPDKjvbdTulPitAq
-EObjjvbdGLErcHlu
-DoDLKvbdHELWKCJj
-EObjjvbdbVCHYLUI
-DncKjvbdqvpLbiZR
-EPCjjvbdvAdZSoFI
-EOcLKvbdfjfzcGAE
-DnbjjvbdaNKartmH
-EOcLKvbdcTDKsdJa
-DncLKvbdOSsufduQ
-DnbkKvbdyYIiapZk
-DoCjjvbdunszqKoU
-DoCkKvbddndsLTsr
-DoDKjvbdxxJKBoyk
-DoDLKvbdrovOibvG
-EPCkKvbdiLddOVDZ
-EPCkKvbdiBncFWqR
-EOcLKvbdZQldiNFR
-DoCkKvbdOEctJJKd
-DoCkKvbdrMzKZMIJ
-DnbkKvbdVhYVwgYz
-EOcLKvbdQvnDblHc
-DoDLKvbdmJEURVRa
-DoDLKvbdCTBDUFwS
-EPCkKvbdNrsvHEuQ
-DnbkKvbdegkVqnRH
-DoCjjvbddBrlrATm
-DoCkKvbdCJLCLJFj
-EOcKjvbdxZgefXeS
-EPDKjvbdZtJJZDsO
-DoCkKvbdQvmdDMID
-DoDLKvbdRaceLhxk
-DnbkKvbdSBdFLhxk
-DoDKjvbdOTTufdtp
-DoDLKvbdnQZxujyC
-DnbjjvbdZshhyETO
-DoCjjvbdtvOYJqTA
-DncLKvbdRMxBxmtz
-DnbjjvbdEzsqElCi
-EObjjvbdKefHbAqV
-DnbkKvbdmpZyWKyC
-DncLKvbdNQXqWOGs
-EPDLKvbdVTlsekuj
-EPCkKvbdGcjvJajK
-EPDLKvbdIryArlxM
-DoDLKvbdwyhGFwdr
-EPCkKvbdzaAOgGal
-DncLKvbdiHKCxvJu
-EOcKjvbdLBKgMbXq
-DoCjjvbdTppoVVIN
-EPDKjvbdNPxQvOHT
-DnbjjvbdTvLpJsaR
-DncKjvbdnVUyjiqf
-EPCjjvbdVUNTfLvK
-EOcLKvbdDxYLtTtM
-DnbkKvbddePSCXCj
-EPDLKvbdgGLzOHHA
-DoCkKvbdTukpKTaR
-DncLKvbdVUMtGMWK
-EObkKvbdXnRAYVWU
-DncLKvbdyqOmJJwA
-DoDKjvbdFVyQQNKF
-DncKjvbdvOszqLOt
-EPCkKvbdZRMdhmFR
-EPDLKvbdhlFDmuCy
-EOcKjvbdkIHLeenL
-DnbjjvbdqceJQOWB
-DoCkKvbdzitpPdSt
-EPCjjvbdFeiqmhtR
-DoDLKvbdsQVoJcVf
-EPDLKvbdUQpnuVIN
-DoDLKvbdWSNxBdlD
-EPCjjvbdpyPHgQcx
-EOcKjvbdUyHsyjoO
-DoCjjvbdxrnJNSCH
-DoCjjvbdKDKCpjCx
-EPDLKvbdxsOIlrBg
-DoCkKvbdnGdxMnHZ
-EPDLKvbdfHkWSNpg
-DnbjjvbdkHgMGFnL
-EOcLKvbdxmsIYSiD
-DoDLKvbdEXxLsssl
-DoDKjvbdjFLGuPAO
-EOcLKvbdeEoRawCj
-DoDKjvbdyOTIYSiD
-DnbjjvbdIHGyyXxH
-DncKjvbdTqQoUuHm
-EOcKjvbdMfcQNPuL
-DnbkKvbdatbGxKsh
-DoDKjvbdOTUWHEtp
-EPCkKvbdGLFTCgmV
-DoDKjvbdkHfkfGNk
-EObjjvbdJXtBhMRQ
-EObkKvbdRpUHKGEX
-DnbjjvbdiUzFWrVC
-EPCkKvbdliETqUrB
-DnbkKvbdZjTIQHBf
-DoCjjvbdZMSETnLm
-EPDLKvbdFWYoomKF
-EPDLKvbdRaceLhxk
-DoDLKvbdEASJNZwX
-EPDLKvbdGZUtaEXb
-DncLKvbdyNrgxSiD
-EOcKjvbdbVBgXkTh
-EPCkKvbdvOszpkOt
-EObkKvbdKfGHbBRV
-DncLKvbdjvXOEBxX
-EPDLKvbdvAcyTPFI
-EObjjvbdNsUWGeUp
-EPCjjvbdZtIiZDrn
-DoDLKvbdrRtkOLBN
-DncKjvbdptUHSSLU
-DncLKvbdWSOXaeLc
-EPCkKvbdiLeDmuCy
-DoCjjvbdhyuFkqNf
-DnbkKvbdzoPqFDMY
-DoCkKvbdGFirOItR
-DoCjjvbdEObjkXCd
-DnbkKvbdjKFgilwr
-EPDLKvbdVwIwvEFH
-DoDKjvbdfIKvRmpg
-EPDLKvbdOFDsiIkE
-EPDLKvbdGKdrcIMu
-EPDKjvbdZnmiEeZj
-DoDKjvbdKWVFceHJ
-DncKjvbdvBDySneI
-DncKjvbddeOqawCj
-DoCkKvbdEztRFLbi
-EPDKjvbdMpXpumgT
-EPDKjvbdtunYJqTA
-EPCjjvbdegkVqmpg
-EObjjvbdlYsRsZHU
-EOcKjvbdbUagXkUI
-EPDLKvbdANHySvyx
-DnbkKvbdmJEUQtqa
-EPDKjvbdVUNUFlVj
-EPCkKvbdvvlBVaVu
-DoCjjvbdmozZWLYb
-DoDKjvbdwzIFfXeS
-DoDLKvbdNQXpvOGs
-DncLKvbdEYXlTstM
-EPCkKvbdbUbGwkUI
-EOcLKvbdLBLHNBxR
-DnbkKvbdePErkUUS
-EObjjvbdyXiJaoyk
-DncLKvbdVrNxBeLc
-DoCjjvbdaRebhUGL
-EOcKjvbdxsNhmSBg
-EOcKjvbdXrkaMsoY
-EObjjvbdhuZdwSVC
-DoCkKvbdqGEFUWAh
-DoDKjvbdegkVrNpg
-DoCkKvbdtcCtvuoP
-EOcKjvbdmJEUQtrB
-EOcKjvbdWXIwucdg
-DoDLKvbdhgKCyWJu
-EPCjjvbdcSbkUDjB
-EPDKjvbdLrWmZuQz
-EPDLKvbdXrlAlsnx
-DnbkKvbdKNADygUa
-EPDKjvbdyNrhXsJD
-EOcLKvbdIsZBSlxM
-EPCkKvbddndrkTsr
-DnbjjvbdFyUuBEYC
-EPCkKvbdJcKCpjCx
-EObkKvbdbBWFGQPw
-EOcLKvbdFjdrbhNV
-EPDLKvbdrDdiQNvB
-EObkKvbdkHgMGGOL
-EPCkKvbdkySrSyHU
-DncLKvbdaaWEfQQX
-EObkKvbdehKvRmpg
-DnbkKvbdmIdURVRa
-DoDLKvbdvBEZSneI
-DoCkKvbdNdcshhjd
-DncLKvbdZyEKOCkr
-DoCkKvbdVrNwbFMD
-DnbkKvbdnCKXXoNu
-EPDKjvbdSQTgKGDw
-EObkKvbdaRfCgtFk
-EObjjvbdkWXNcaww
-EObkKvbdDihJuxKA
-DncLKvbdnVVZkKSG
-EPCkKvbdVBBqSpqy
-DncLKvbdqGEFUWAh
-DoCkKvbdsPvOjDWG
-DncKjvbdySmiNRbH
-DoDKjvbdraemLfjy
-DoDLKvbdnPzZWKxb
-DnbjjvbdRjxfVGkT
-DoDKjvbdGLEsDHlu
-DnbjjvbdRotHKFdX
-DoCkKvbdRpUGiecw
-DnbjjvbdZjTHogBf
-EPDKjvbdcTCjtDia
-EOcKjvbdrounibuf
-EOcKjvbdVBCRSqRy
-EPDKjvbdEvZPolie
-DnbkKvbdzRPNJKXA
-DncLKvbdBhjbKiGK
-DnbkKvbdqrVKmkBN
-DnbjjvbdBraDTewS
-DnbkKvbdJcKDRJbx
-DoCjjvbdbUbHYLUI
-DoDKjvbdUyITykOn
-DoCkKvbdYlSEUOMN
-EPCkKvbdRpUHKGEX
-EObkKvbdTAFJICPE
-EPDKjvbdrpWPJcVf
-DoCkKvbdZnnJFFZj
-EPCkKvbdkVvmcaxX
-EOcKjvbdyzdnRgiI
-EObjjvbdqAiFAXIE
-DncLKvbdWWiYWDeH
-EPCjjvbdqlzKZLgi
-EObjjvbdauCGwkUI
-DoDLKvbdtTSSxydc
-EObkKvbdbVCGxLTh
-EObkKvbdkWWmdBxX
-EObjjvbdRNXaxnUz
-EOcKjvbdwXLaVaVu
-DncKjvbdqTtGqrKt
-DncKjvbdIjEAJpGd
-EPDKjvbdHffyyXwg
-EObkKvbdSCEFLiYk
-DncKjvbdiVZeXRuC
-DoDLKvbdWWhwudFH
-EPDLKvbdrRuKmkAm
-EObjjvbdxsNhlqag
-EPDKjvbdcJMikFwY
-DoDKjvbdpyPHfpdY
-DncKjvbdwyhGGXdr
-DoCkKvbdkVwODbXw
-DncLKvbdJcJbpibx
-EPCkKvbdsQWPJcVf
-EOcKjvbdZRNEiMdq
-EObkKvbdjvXOECXw
-EObjjvbdZxcjODLr
-DncKjvbdRWmdDMID
-DncKjvbdjvWmcbYX
-DoCjjvbdnBjXXoOV
-DncKjvbdiBnbdwQq
-EPDKjvbdDoDKjwCd
-EPCkKvbdFxuVBEYC
-DncKjvbdFVxopMie
-EOcLKvbdKWUfEEfi
-EPCkKvbdNrtVgEtp
-DoDLKvbdfoazwDxI
-DoDKjvbdqquKmkAm
-EPDKjvbdhbPCeXRR
-DncKjvbdZtIhyETO
-EPCkKvbdQwNdCkhD
-EPDKjvbdhzUfMROG
-DnbjjvbdrpVoKCuf
-EPDLKvbdtlYWaUAw
-EOcLKvbddoErjstS
-DnbkKvbdyzeORghh
-EPDLKvbdZnmhdeZj
-DoCjjvbdcIlikGXY
-EOcLKvbdLAkHNBxR
-DoCjjvbdtkwwBUAw
-DoCjjvbdgGMZnHHA
-DnbkKvbdUsmTfLuj
-EOcLKvbdqZPHgQcx
-EPDLKvbdLqvlytpz
-DoDLKvbdqdFIomvB
-EObjjvbdBhjbKhfK
-EOcLKvbdrMyjYlIJ
-DncKjvbdDncKkXCd
-DnbkKvbdNQXpunHT
-EPDKjvbdZjSgofbG
-DnbjjvbdBiKbLIej
-DoCjjvbdGAoQxizm
-EOcLKvbdwtldqZLn
-DoDLKvbdIrxaSmXl
-DoCjjvbdNHDQMpUk
-EOcLKvbdTkunaWOi
-DncLKvbdNHCpMpVL
-DoDKjvbdelfXHNKL
-EObjjvbdcyxpYYqC
-DoDLKvbdZGwEAOri
-DoDLKvbdIxUCHkqQ
-DoCjjvbdoznEKxPA
-EOcKjvbdbLMGPNcA
-EObjjvbdiiegilxS
-DoDKjvbdZRNFImFR
-DncLKvbdRbDeLhxk
-EPCkKvbdqlzJxlHi
-EOcLKvbdhkeDnUby
-EPCjjvbdhaoDEwQq
-EPCkKvbdFkFScHlu
-EPCjjvbdJKEAKQGd
-DoCkKvbdpxngfqDx
-EObjjvbdUGznLwWF
-EObjjvbdVZHsykPO
-DncLKvbdYlRdUNlN
-EPCkKvbdHDkWKBjK
-DncLKvbdjKFhKMxS
-DnbjjvbdnBjWxPOV
-EObkKvbdtcCtvvOo
-DnbjjvbdTpqPUthN
-DncLKvbdMoxQvOGs
-DnbjjvbdfNGXHMjL
-EPDKjvbdhgJcZVjV
-DoDLKvbdNGbolpVL
-EPDKjvbdatbHYLUI
-DncLKvbdczZPwxqC
-DnbjjvbdZxcimblS
-EPDLKvbdKaKgMbXq
-EOcLKvbdtbcUwWOo
-DnbkKvbdJutfEEfi
-DoCjjvbdmIdURUqa
-EPCjjvbddBrmSATm
-EPCkKvbdXsLaNUPY
-DnbkKvbdNPwpvOGs
-EOcKjvbdIwsaglQp
-DoCkKvbdlhdUQtrB
-DoDLKvbdGdLWJaij
-DoCjjvbdwXMAvAvV
-DnbkKvbdbrbkTdJa
-EPDKjvbdFVxpQNJe
-DoCjjvbdHDkWJbKK
-DnbkKvbdjvXODbYX
-DoCjjvbdemFwGmJk
-DoCjjvbdQdCaPpcr
-EOcKjvbdqcdiQNvB
-DncLKvbdbBWFFoow
-EOcKjvbdKaKgMawq
-EObkKvbdLBKgMawq
-DncKjvbdcbSmSAUN
-DoCjjvbdyOTHwsJD
-EOcLKvbdOStVfeUp
-EObkKvbdHffyyYXg
-EPCjjvbdmuUykJrG
-DoDLKvbdJYTbILpp
-DncKjvbdnGdwlmgZ
-EPDKjvbdZQldhldq
-EObjjvbdUaBpsRSZ
-EOcKjvbdrzLpSaIO
-DnbjjvbdLGFgbAqV
-EPDKjvbdXrlAmUOx
-EPDLKvbdtSqryZeD
-DoDKjvbdtlXwAtAw
-DoDKjvbdaRebgsfL
-EObjjvbdUWLpKUAq
-EObjjvbdQvmccLgc
-EOcLKvbdznopeDMY
-EOcLKvbdIwsbHkpp
-EPDLKvbdziuQPcsU
-EPDLKvbdelevgMik
-DoDKjvbdTAFIgbOd
-DoDLKvbdbBWFGPow
-DoDKjvbdYqNEiMeR
-EOcLKvbdhficYuiu
-EOcKjvbdyTOImRbH
-DncKjvbdiLeDmtby
-EPDLKvbdUsmTekvK
-DoCkKvbdkCkkQftg
-DoCkKvbdVTmUFlVj
-DoCkKvbdTIyjRAAl
-EOcKjvbdbUafxKtI
-EOcKjvbdZsiIxdSn
-DoDKjvbdSCEElIyL
-DnbjjvbdBsAbsfXS
-DoCkKvbdBcpAuimG
-DoCkKvbdVwIwvEEg
-DnbjjvbdajlFoNcA
-EPCkKvbdtSrTYzFD
-DnbkKvbdGFirNhsq
-EOcKjvbdapHHELzd
-DoDLKvbdiUyeXSUb
-DnbjjvbdtAGqIABS
-DnbkKvbdXsLaMsnx
-DoCkKvbdeEnqawDK
-EOcKjvbdDxXkstUM
-DnbjjvbdcyxoxZQb
-DoDLKvbdlrZVZrci
-DoCkKvbdTAEiICPE
-EOcLKvbdpyPHfpcx
-EPDLKvbdVBCRTQqy
-DnbjjvbdmJEUQtqa
-DnbjjvbdkClKqHVH
-EObkKvbdCJKajiGK
-EObkKvbdeAURMxJf
-EPDLKvbdcSbkUDjB
-DncLKvbdsCFmLfjy
-EPCkKvbdIwsahLqQ
-DoCkKvbdrJAJeMne
-DoDLKvbdIHGzYwxH
-DoCjjvbdGckVjBjK
-EObjjvbdegkVqmqH
-DoDLKvbdLKaIWAKZ
-EPDLKvbdaRfChUGL
-DoDLKvbdyYJJaozL
-DoCkKvbdrWpLbhyR
-DoCkKvbdLGGIBaRV
-DoDKjvbdKyRJrztf
-DoCkKvbdjuvnEBxX
-EObkKvbdNeEThhkE
-EPCjjvbdQwNcbkhD
-DoCkKvbdJqZePGOF
-EObjjvbdNGbomQUk
-EObkKvbdkxrqsZHU
-EOcLKvbdrounjDVf
-DoDLKvbdkClLRGtg
-EOcLKvbdbKkfOnDA
-EPCkKvbdRDbaPpcr
-EPDLKvbdkHgLefNk
-EOcLKvbdFVxpPmKF
-EObkKvbdsrrSxzEc
-DnbkKvbdFeirOIsq
-DncLKvbdzitopDrt
-DoCjjvbduWOXjQsA
-EPCkKvbdyXhjCPyk
-DoDKjvbdaaWEfPow
-DncLKvbdvAcySneI
-EObjjvbdADRwjZhp
-EObkKvbdnPyxvLYb
-DncKjvbdijGIJlwr
-EPCjjvbdJcJbqJcY
-DnbkKvbdkMbLydgP
-DoCkKvbdRDbaQQcr
-DoCjjvbdxsOIlrCH
-DnbjjvbdKQydnfOF
-EPDKjvbdcImKKfWx
-DnbjjvbdcImKKewY
-EObkKvbdqdFJPmua
-EObjjvbdajkennDA
-DnbjjvbdZyEKNcLr
-DoCjjvbdKWVFdEgJ
-EPDKjvbdWXIwuceH
-DnbjjvbdqiAJdlne
-EOcLKvbdkyTRryGt
-EPCjjvbdpaJFAWgd
-EPCjjvbdmJDsqVSB
-EPCjjvbdREDAopdS
-DoCjjvbdRpUHKFdX
-DncKjvbdptUHSSKt
-EPCjjvbdiCObdvpq
-DncLKvbdNwnuzcmt
-DncKjvbdqdFIpOWB
-DoDKjvbdjggLefNk
-EObkKvbdrNZiyLgi
-EPCkKvbdaSFcITfL
-DnbjjvbdGLFTDINV
-EPCkKvbdiLeENuDZ
-DncLKvbdZyEJmcLr
-EObjjvbduDCuWvOo
-DoDKjvbdNQXqWNgT
-DncKjvbdVBCRTRRy
-EPCjjvbdSQUGifEX
-EOcLKvbdANIZSvyx
-DoDKjvbdvBDyTPFI
-DnbkKvbdEPCkLWbd
-DoCkKvbdyYIjCPyk
-DnbkKvbdelewGmKL
-EPDLKvbdatbGxLUI
-EPDLKvbdTvLojTaR
-DoCjjvbdhtyeWrVC
-DoDKjvbdzeZnzdzQ
-DnbjjvbdyzdnRhJI
-EPCjjvbduLxWaUBX
-EOcLKvbdkyTRsYgU
-DnbjjvbdCTBCsewS
-EObjjvbdjAPgApHK
-EPDLKvbdwkWdHzyf
-EObjjvbdsPvOicWG
-DoCkKvbdTulPisaR
-DnbkKvbduCcUvuoP
-EObkKvbdZRMdiMeR
-DoCkKvbdSPtHJfDw
-DncLKvbdKaLGlaxR
-DnbkKvbdRpTgKGDw
-DoCjjvbdWXJYWEEg
-EObjjvbdWXJYWDdg
-EOcKjvbdKCjCqKCx
-DnbkKvbdakMGPNcA
-DoDKjvbdwkXDgzzG
-EObkKvbdNHDPlotk
-DncLKvbdyzdmrIJI
-EObkKvbdFkErbhMu
-EPCkKvbdNeDsiIjd
-DoDKjvbdIGfyyXxH
-DoCjjvbdZyDinDLr
-EPCjjvbdemFvfmJk
-EObjjvbdJYTbILqQ
-DnbjjvbdWXIwucdg
-DoCjjvbdiHKCxvJu
-EPDKjvbdfpBzwDxI
-DoCjjvbdaNLCStlg
-EPCkKvbdnVUykJqf
-DoCjjvbdyYIjBozL
-EPCjjvbdzjUpQDsU
-DoDLKvbdZxcjOCkr
-EPCkKvbdeFOrBvcK
-EPDKjvbdKaKflaxR
-EOcLKvbdfMevgMjL
-EPDKjvbdGckWKCKK
-DoCjjvbdKVuFdEgJ
-EObjjvbdfMfWfmJk
-DoDLKvbdMfbomQVL
-EPDLKvbdRkYeuGjs
-EOcLKvbdKfGHaaQu
-EObkKvbdoznDjwoA
-EOcKjvbdUMWPBVoJ
-DoCkKvbdFjeSbgmV
-EPCjjvbdrEFJQOWB
-EOcLKvbdvAcyTOdh
-DnbjjvbdWfYzUAOs
-EObkKvbdTkuoBWPJ
-DnbkKvbdFpASvgFy
-DoCjjvbdczZQXyRC
-DoCjjvbdRDcBQQdS
-DoDKjvbdqYngfqDx
-EObkKvbdWRmwbElD
-EPCjjvbdFyVVBDwb
-EObjjvbdBhjbKhej
-DncLKvbdzaAPGgBl
-EObkKvbdTppoVUgm
-DoCjjvbdbrcLTcjB
-EPCkKvbdGLFTCglu
-DoDLKvbdDwxMUUUM
-EPCjjvbdNQYQumgT
-DncKjvbdmfeXmOGy
-EPCjjvbdwtmFRYkn
-DoCkKvbdsBfMlGjy
-DncLKvbdRpUHKGDw
-EObjjvbdjblLQfuH
-EObjjvbdJYTbHlRQ
-DoCkKvbdmttyjiqf
-DoCkKvbdZQldiMdq
-EPDKjvbdFejSNiUR
-EOcLKvbdjgfkfFnL
-DnbjjvbdMpYQvNgT
-DnbkKvbdUyIUZjnn
-DnbkKvbdJbjDRKDY
-EPCjjvbdeEnrBvcK
-EOcKjvbdyzdnSIIh
-DoDKjvbdDoDKjwCd
-DoDLKvbdCSaDUFwS
-DoDLKvbdIrxaTMwl
-DnbkKvbdRNXayNtz
-DoCkKvbdxxJKBoyk
-DncLKvbdnGdxNOGy
-DnbjjvbdySmhlqbH
-DoCkKvbdxwhjBoyk
-EPCjjvbdZQleIleR
-EPCjjvbdaRfChTek
-EOcKjvbdYTMBNUPY
-DoCjjvbdegkWSNpg
-EObkKvbdziuQPdTU
-EOcKjvbdnCKXYOmu
-DoCkKvbdZnmhddzK
-EObjjvbdzaAPGgBl
-DoDLKvbdePFSjtTr
-EPCkKvbdNrtWGeVQ
-EPCjjvbdelfWfmKL
-DoDKjvbdKxpjSztf
-EPDKjvbdxmsIXsIc
-EPCjjvbddZyPxYqC
-DoDKjvbdvOszqLOt
-DncKjvbdatbGxLTh
-EObjjvbdzoQQdbkx
-DoCjjvbdZRMeImEq
-EOcKjvbdqTtGqqjt
-EOcKjvbdqAheAWgd
-DnbjjvbdySmhmRag
-DncKjvbdjKFhJlwr
-EPDKjvbdqFceUWBI
-DoDKjvbdsBemLgLZ
-EPDLKvbdKQzEoFnF
-EOcKjvbdFjdsCgmV
-EObjjvbdpfEEtWBI
-EPDKjvbdZxcjOClS
-EPDKjvbdnBivwoOV
-EPCjjvbdrylQTAhO
-EPDKjvbdKaLGmBxR
-EPDKjvbdHgGzYwxH
-EObjjvbdkHflGFmk
-DnbjjvbdqGDeUVaI
-EPDKjvbdMgDQNQUk
-DncLKvbdSKyGVHKs
-EOcKjvbdqFdEsvAh
-EOcKjvbdYkrETnLm
-DnbkKvbdqBIeAXHd
-DncLKvbdZQldhmFR
-DncLKvbdFjeSbhMu
-EPCkKvbddePRavcK
-EPCkKvbdssRsYzEc
-EPCkKvbdRadFLhxk
-DnbkKvbdVvhxWEEg
-EOcLKvbdIryArmYM
-EPCkKvbdKfGHbAqV
-DncKjvbdEKIJuxKA
-EPDKjvbdIwsbIMRQ
-EObkKvbdzaAOfgBl
-DncLKvbdeUAUASlv
-DnbjjvbdlqxuZsDi
-DnbjjvbdUWMQKTaR
-EOcLKvbdNGbpNPtk
-EPDKjvbdWSOYCEkc
-DoCkKvbdjggMGGOL
-DoCjjvbdSQUHJecw
-DncLKvbdZyDjODMS
-EObjjvbdfpBzvcxI
-EOcLKvbdTlVoAvPJ
-DnbjjvbdVviYWEFH
-EPCkKvbdZnmiFFZj
-EObjjvbdNGbpNQUk
-DoDLKvbdrbGMkfjy
-DoDLKvbdxnShYSiD
-EObkKvbdJYTahMRQ
-DoDLKvbdoAKzshEO
-DoCkKvbdZxcjOCkr
-EPDLKvbdRWmdCkgc
-EPCkKvbdGFiqnJUR
-DoDKjvbdRzJgsDWA
-DncLKvbdptTfqqjt
-EPDKjvbdmIctRUqa
-EObkKvbdnBiwXoOV
-DnbjjvbdfMevfljL
-EObkKvbdBraDUGWr
-DncKjvbdUxhTzKnn
-DoCjjvbdmfdxMmfy
-DnbjjvbdhuZeWrVC
-DnbkKvbdLiCLpxAS
-DnbjjvbdKfFgbApu
-DnbjjvbdziuPpETU
-DoCjjvbdwuNEqZLn
-EPCkKvbdEXwksssl
-EPCjjvbdhgKCxujV
-DoDKjvbdhlEdOVDZ
-DncKjvbdLAjgMbXq
-DncKjvbdOFEThhkE
-DoCkKvbdANHxrvzY
-EPCjjvbdZtIiZDrn
-DoCjjvbdYpldhmEq
-DncLKvbdqwPlDIyR
-DncLKvbdUtNUFlWK
-EObkKvbdkWXODbYX
-DnbjjvbdRzJhSbvA
-DoCkKvbdEJgjVxKA
-DncKjvbdxnSgxShc
-EObjjvbdbUbHYKsh
-DncLKvbdZoNiFEzK
-EPDKjvbdbiMjKevx
-DnbkKvbdIwsbHlRQ
-EObjjvbdhWyAzzAJ
-EObkKvbdqvpLcIyR
-EObjjvbdGGKSOIsq
-EObkKvbdTpqPUthN
-DncKjvbduaEZTOdh
-EObkKvbdJJdAJofd
-DoCkKvbdEKIJuwjA
-DncLKvbdDnbjkXDE
-DnbjjvbdhbObdwQq
-EObjjvbdunszpkPU
-EPCjjvbdwNWANDdm
-EPDLKvbdozmcjxPA
-EObjjvbdZnmiFFZj
-DnbjjvbduDDUwVno
-EOcKjvbdZjShPfbG
-DncLKvbdADSXiyhp
-DoCjjvbduCcVXWPP
-DnbkKvbdffLzOHHA
-DncLKvbdBdPaWJlf
-EPDLKvbdJvVGEFGi
-EPCkKvbdvwMBWBWV
-EObjjvbdijGHjMxS
-EPCkKvbdaNLCTVNH
-EPCjjvbdbAudeopX
-DoDKjvbdozmcjwoA
-EPCjjvbdYlRctOMN
-DoCjjvbdDoDLKvcE
-EObkKvbdVqmwaeMD
-DnbjjvbdqvolChyR
-EPCkKvbdRkZGVGjs
-DoDKjvbdjvXOEBxX
-DoCjjvbdIHHZyXwg
-DnbkKvbdLBKgNCYR
-EPDKjvbdyNsHxShc
-EOcKjvbdyzdmqhJI
-DnbjjvbdqFcdtVaI
-EObjjvbdrJAKElne
-DncKjvbdTvLpJtAq
-EObkKvbdDoDKjvbd
-EPCjjvbdYlRcsnLm
-DoDKjvbdegkVqmqH
-EPDLKvbdZHXEAPSi
-DoDKjvbdakLennDA
-DncLKvbdrDdiPmua
-DoCjjvbdhbPDEwRR
-EPDLKvbdtcDUvuno
-DnbjjvbdEKHjVxKA
-EOcLKvbdYqMdhmFR
-EPDLKvbdmttzKiqf
-EPDLKvbdTkvPAuoJ
-DncLKvbdVAbRTQqy
-DncLKvbdLBKflbYR
-DoCjjvbdZyDimcMS
-EOcKjvbdFpATXHFy
-EObkKvbdnCJwYOmu
-EPCkKvbdVZHszLPO
-EPCkKvbdCSaDTfXS
-DncKjvbdNVSqjmAX
-EPCkKvbdFjdrbhMu
-EPCkKvbdbsCkUDjB
-EObjjvbdMowpumfs
-DoDLKvbdRotHJecw
-DnbjjvbdTfzmkwWF
-EObjjvbdBcpAvKNG
-DoDLKvbdWHxWXfxz
-EPCjjvbdqUUGrSKt
-DncLKvbdliDsqVSB
-DnbkKvbdBdQAujMf
-DnbkKvbdWXIxVcdg
-DoCkKvbddePSCXCj
-DnbjjvbdZirhPfbG
-DnbjjvbdyXiKBozL
-DnbjjvbdznpREcMY
-DncKjvbdJcKCqKCx
-EPCkKvbdJbibpjDY
-EPDLKvbdkClLRHVH
-EPDKjvbdTvLoisaR
-EOcKjvbdZGwEAPSi
-EPCkKvbdKRZdnenF
-DncKjvbdfMfXGmJk
-EPCkKvbdhfibyWJu
-EOcKjvbdMIbLqYAS
-EPDLKvbdbUbHXjtI
-EObkKvbdCSaDUFwS
-EPDLKvbdGGJqnJUR
-EOcLKvbdDoDKjvbd
-DnbjjvbdFkFTDIMu
-DnbjjvbdgFlZnGgA
-DoCkKvbdakLfPODA
-EPDLKvbdDwwlTstM
-DoCjjvbdMJBkqYAS
-DnbjjvbdiGjCxujV
-EPDLKvbdVwIwuceH
-EPDLKvbdZyEKOCkr
-EPDKjvbddoFTLTtS
-DoCkKvbdXrlAlsnx
-EOcLKvbdZoOIeEzK
-DnbjjvbdaMjbTVMg
-EPDKjvbdeOeTKssr
-DncKjvbdSKxetfjs
-DoCjjvbdpxnhGpcx
-EPDLKvbdmtuZkJrG
-DoCjjvbdYkqdTmlN
-EOcLKvbdJuuGEEfi
-DoCjjvbdhzUfMROG
-DncLKvbdddnrBvbj
-EOcLKvbdWSNwbFMD
-DoDLKvbdtSrTYydc
-EPCjjvbdRjxetgKs
-DncKjvbdFxttaEYC
-EPDLKvbdiBncFWpq
-DnbjjvbdyTOImSCH
-DoDKjvbdcyyQXyRC
-EOcLKvbdZLrEUOLm
-DoCjjvbdXmqAYVWU
-EPCjjvbdUsltFkvK
-DncKjvbdLqvmZuQz
-DnbjjvbdZjTIQGaf
-DoDKjvbdzoPpeCkx
-EPDKjvbdGGKSNhsq
-DncKjvbdtSrSxzFD
-EPCkKvbdyOTHxShc
-DnbkKvbdehKvSORH
-DoDLKvbdWIXvYHYz
-EObkKvbdDoCkLXCd
-DoDLKvbdLBKflaxR
-EPDLKvbdKQzFOenF
-EObjjvbdjFLHVPAO
-EObkKvbdFeiqmhsq
-DoDKjvbdRotHKFdX
-DnbkKvbddZxpYZQb
-DncKjvbdqqtkNkBN
-EPDKjvbdZjShPgBf
-DoCkKvbdNHCpMouL
-EObjjvbdxZgefYFS
-DoCjjvbdNrsvHEuQ
-DoCjjvbdwzHeewdr
-EObjjvbdvPTzpkPU
-EPDKjvbdrounibvG
-DnbkKvbdpstGqqjt
-EPDLKvbdeFOrCXDK
-EOcLKvbdGBPRYizm
-DoDLKvbdNwnuzdOU
-DnbkKvbdRMwaxnUz
-EOcLKvbdDihKWXjA
-EObkKvbdFeirOJTq
-DoDLKvbdSKxeuGjs
-EOcLKvbddndsKssr
-DnbjjvbdiCPDEvpq
-EOcKjvbdMoxQumfs
-DnbkKvbdfNGWfljL
-DnbkKvbdIHGzZXwg
-EObjjvbdTlWPAvOi
-DoDLKvbdnPyyVkZC
-EOcKjvbdkWWmdBxX
-EObkKvbdEJgjWXjA
-DnbjjvbdkMalZdgP
-DnbkKvbdsCGNLfjy
-DnbjjvbdYqMeIleR
-DncLKvbdMgComPtk
-DoCkKvbdMfbolouL
-DncKjvbderAvzlDP
-DnbjjvbdqwQLcIyR
-EObjjvbdcImJkFwY
-EPCjjvbdYzberKVy
-DoCjjvbdEzsqElCi
-EObkKvbdRotGiecw
-EPCkKvbdGLErcINV
-DoCkKvbdYpmEiMdq
-DoDKjvbdJXsaglRQ
-DnbkKvbdFVxpPmJe
-DnbkKvbdxUmEpyLn
-EPCjjvbdLrXMytpz
-DnbkKvbdhtzEvqtb
-EPDKjvbdDxYLstTl
-EPCkKvbdiBoDFXQq
-EPCkKvbdZoOJEeZj
-DoCjjvbduDCuWuoP
-EObkKvbdjcLkQfuH
-DoCkKvbdcImKLGWx
-EPDLKvbdEYXlUUTl
-EOcLKvbdZLqdTnMN
-EOcKjvbdmozYujyC
-DncLKvbdJpzEnfOF
-EOcLKvbdiCPCdvpq
-DncKjvbdADRxKZhp
-DoDLKvbdmJDsqVSB
-EObkKvbdnBiwYPOV
-EObkKvbdqwQMDIxq
-DncKjvbdeFOqbWbj
-EPDKjvbdmfeYMmfy
-DnbkKvbdGLFSbhNV
-DoDLKvbdwkXDgzzG
-EObkKvbdbAvFFpQX
-EPDLKvbdyXhjBoyk
-DoCjjvbdMfbpMouL
-DoCjjvbdREDApRES
-DncLKvbdmajWwnmu
-DoDLKvbdIidAJofd
-DoCjjvbdSZihTCvA
-DoCkKvbduLwvaUBX
-EPCkKvbdiHJbyVjV
-EObkKvbdGYtuAdXb
-DoDLKvbdCTBCtFwS
-EOcLKvbdhlFENtby
-DoCkKvbdySnIlrBg
-EPDLKvbdwuNFQyMO
-DncKjvbdlqxtzTDi
-DoDKjvbdWWhxWEFH
-DoCkKvbdiHJcZVjV
-EPDKjvbdCflGHAzc
-DncLKvbdzROmJKXA
-EPDLKvbdCJLBjhej
-EOcKjvbdVrNwbEkc
-DnbkKvbdUtNUFlWK
-DoDKjvbdLBKflbYR
-EPCjjvbdauBfwkTh
-EPCkKvbdrXQMDJZR
-DnbjjvbdnVUyjjSG
-DncKjvbdiMEdOUby
-DoDKjvbdqiAKFNPF
-EOcLKvbdQdDBQQcr
-DoDKjvbdpxnggQdY
-DncKjvbdtSrTYydc
-DnbjjvbdwzHefXeS
-DoCjjvbdRosfjGEX
-EPCkKvbdnPyxujyC
-EObjjvbdZyEJnCkr
-DnbkKvbdhytelRNf
-EPDLKvbdeYZstSFz
-EObjjvbdTfzmlXVe
-EOcKjvbdbKkenmcA
-DncLKvbdvwMAuaVu
-EObkKvbdwMvAMdEm
-EOcLKvbdkHflFfNk
-EPCjjvbdzoPpeDMY
-DoCjjvbdiLeDmuCy
-EOcKjvbdRpUGjGDw
-DnbkKvbdUslsekuj
-EPCjjvbdmJEURVRa
-DncLKvbdZjSgofaf
-EOcLKvbdaMjasUlg
-DoCjjvbdREDBPpdS
-DnbjjvbdIwsaglQp
-DoCkKvbdkNCLzFHP
-DoDLKvbdaRfChUFk
-EPCjjvbdrRtjnKaN
-EPCkKvbduoTzpkOt
-EOcKjvbdnHFYMmfy
-EOcKjvbdHDkVjBjK
-EObjjvbdEXxMTssl
-DnbjjvbdNPxRWOHT
-EObjjvbdiZtfLpmf
-EObjjvbdTvLojTaR
-DoDKjvbdKkBIWAKZ
-DoDLKvbduCbtwVno
-DncLKvbdmttzKjSG
-DncLKvbdbBVdfQQX
-EObkKvbdyXiKBpZk
-DncLKvbdzGxlAMdw
-DoCkKvbdMpXpvNfs
-DoCkKvbdKQydoGOF
-EPDLKvbdTfzmlXVe
-EPDKjvbdQccBPqES
-EPCjjvbdZtJIyESn
-DoCjjvbdVrOXbElD
-DnbjjvbdbLMGOmcA
-DnbkKvbdnPzZWKyC
-EPDLKvbdmajWwoOV
-EObjjvbdQwOEDMHc
-EPCkKvbdTvMQKUBR
-DoCjjvbdOTUVgEtp
-DoCkKvbdIHHZyXxH
-EPDLKvbdDoDLKwDE
-EObjjvbdiZtfMQmf
-EObjjvbdijGHimXr
-DoDKjvbdVrNxCElD
-EPDLKvbdJutedFGi
-DnbjjvbdmSZVZsEJ
-DncKjvbdqlzKYlIJ
-EOcKjvbdfelZnGgA
-EOcKjvbdYlRctOLm
-DoDKjvbdPxmAHSrK
-EPCjjvbdWWiYWEEg
-DoCjjvbdbAvFFoow
-EOcKjvbdFjeSbglu
-EPDLKvbdlqyVZsEJ
-EOcKjvbdddoRbXDK
-EPCkKvbdaRecHtFk
-DncLKvbdSKyGUgKs
-DoDLKvbdcyyPwyQb
-DoDLKvbdnVUzKjRf
-EObjjvbdYkqdUOLm
-EObkKvbdRbEEkhyL
-DncKjvbdtAHQhAAr
-DnbkKvbdVqmwbFMD
-EOcLKvbdznoqFDLx
-EOcLKvbdEXxLtTsl
-DnbkKvbdtumwipsA
-EObjjvbdmJEUQtqa
-DncKjvbdxwhjCPyk
-DnbkKvbdyfyMANFX
-DncLKvbdiVZeXRtb
-EObkKvbddtAUATMv
-EOcKjvbdxnSgwriD
-EObjjvbdlrZVZrdJ
-EPCkKvbdsBelkfkZ
-DoDKjvbdFVyPomJe
-EPCkKvbdQmYBxnUz
-EOcKjvbdSBdFLhyL
-DncLKvbdmJETpuSB
-DoDLKvbdRECaPpcr
-DncLKvbdIxUBglRQ
-DoCjjvbdpssfrSLU
-DnbkKvbdSQUHJedX
-EObjjvbdkySrTZHU
-EObkKvbdZtIiZETO
-DoCjjvbdtumwipsA
-DoCjjvbddBrlrAUN
-EPCjjvbdKCjDQibx
-DoCjjvbdQccAopdS
-DoDLKvbdSBceLiYk
-EPDKjvbdREDAoqDr
-EOcKjvbdZQleJMeR
-DoCkKvbdEARiMywX
-EPDKjvbdkDLkQgUg
-DncLKvbdFjdsDIMu
-EPCjjvbdlrYtysDi
-EPCkKvbdezuxeIsw
-EObkKvbdyNsHxTJD
-DnbkKvbdemGWgMik
-DoDLKvbdBhkCKhej
-EOcLKvbdjvWmcaww
-EPDLKvbdqTsgRrLU
-EObkKvbdZyDimcLr
-EPCjjvbdlrYtzTEJ
-DoCkKvbdHgGyyYXg
-DoCkKvbdZoNhddyj
-EPDKjvbdhtzFWquC
-EPCkKvbdDoCkKwDE
-DoDLKvbdsrqsZZeD
-EPCkKvbdiHJbxuiu
-DoCjjvbdhlFEOUcZ
-EPDKjvbdDigiuwjA
-EPDKjvbdQdDBPqES
-DoCjjvbdcTCjsdKB
-DncLKvbdUsmUFkuj
-EPDLKvbdnHEwlnGy
-EOcLKvbdxVNEqYkn
-DoDKjvbdEuxopNJe
-EObkKvbdkClLQfuH
-EPCjjvbdcTDLUEKB
-EOcKjvbdEPDKkXDE
-EPCjjvbdXsLaNUOx
-DoDKjvbdFWZQQNKF
-EPDLKvbdUtMtFlVj
-EOcKjvbdzaAPGfal
-DnbkKvbdHlBznXRL
-DoDLKvbdTlVoBWPJ
-EPCkKvbdDoCjkXDE
-EOcKjvbdrzMQTAhO
-EOcLKvbdozmdLXoA
-DoDLKvbdzQnmIjXA
-DoCkKvbdmgExMmgZ
-EPCkKvbdzjUoocrt
-EOcLKvbdwyhGFweS
-EOcLKvbdWWhxVceH
-DncLKvbdqqtkOKaN
-DoCkKvbdOTTvHEuQ
-DoDLKvbdjJehKMwr
-DoCjjvbduDCtvuoP
-DnbjjvbdqdEiPmvB
-DnbjjvbdhtzEwRuC
-DnbkKvbdRkYetfkT
-DoDKjvbdCDpBVjNG
-DoCkKvbdcSbjscjB
-EPDLKvbdYpldiMdq
-DoCjjvbdaaWEfPow
-EOcKjvbdqZPHgQdY
-DoCkKvbdeOdrjtUS
-DoDLKvbdFaPRZJzm
-DnbjjvbdRECaPqES
-DncKjvbdaMjaruMg
-EObjjvbduVnYJpsA
-DnbkKvbdqTsfrSLU
-DncKjvbdYqMeJMdq
-EOcKjvbdvvlBWAuu
-DnbjjvbdUxgtZkOn
-EOcKjvbdOSsufduQ
-EOcLKvbdtumxJqTA
-DncKjvbdIryAsNXl
-DoDKjvbdMuTRkNAX
-DoDLKvbdxnSgwrhc
-EOcKjvbdiHKCxujV
-EObkKvbdeKJrVtzn
-EPDLKvbdjhHMGGNk
-EOcLKvbdkVwNdBww
-EOcLKvbdygZMANEw
-EPDLKvbdRXODcLhD
-EPCjjvbdSPsfjFcw
-DoDKjvbdYpleIldq
-DoDLKvbdOEcsiIjd
-DnbjjvbdddoRavbj
-DncLKvbdHDkWKBjK
-DoCjjvbdxxJKBoyk
-EPDKjvbdYkqdUNkm
-DoDLKvbdDnbjjvcE
-DoCkKvbdVvhxVceH
-EPDLKvbdWRnXbFMD
-EObkKvbdliEUQtqa
-EPCkKvbdNQXqVmfs
-EOcLKvbdIGfyyYYH
-DncKjvbdxUldpxlO
-DoDKjvbdznopdcLx
-DncKjvbdHDkVibKK
-EPDLKvbdjlbLydgP
-DoDKjvbdYTMAltOx
-DoDKjvbdcSbkUEKB
-EPCjjvbdzoQREblY
-EOcKjvbdZxcinDMS
-DoDKjvbdZyDjODMS
-DoCjjvbdxZgfFwdr
-EPDLKvbdaMkBsVMg
-EPCkKvbduDDUvuno
-DncKjvbdsCFmLgKy
-DoDLKvbddeOrCWcK
-DncLKvbdNddThhjd
-EOcKjvbdBvzcheQW
-EPDLKvbdeEnqbXCj
-DoCjjvbdNrtVfduQ
-EOcKjvbdZQmEiNFR
-EPCkKvbdGFjSNiTq
-EPDKjvbdZxcinCkr
-DoCjjvbdkNBlZdgP
-DoCkKvbdEYXkstTl
-DncLKvbdYpmEhmEq
-EOcLKvbdePFSkTsr
-DoCjjvbdemFvfmKL
-DnbkKvbdemFwGljL
-EPDLKvbdmbJvxOnV
-EPCjjvbdtbcVXVoP
-EOcKjvbdFkErcHmV
-DoDKjvbdVUMtFlWK
-EOcLKvbdkMakydfo
-DnbjjvbdIMBznWqL
-EObkKvbdptUHRrLU
-DnbkKvbdjJfHilwr
-EPCjjvbdGYuUaDxC
-EObjjvbdmtuZjjRf
-DncLKvbdkCkkQfuH
-DoDLKvbdtlXwBUBX
-DncLKvbdCWzchePv
-EObkKvbdrEEiPmua
-EOcLKvbdYqNFIldq
-DoDLKvbdfILWRnQg
-DoDLKvbdqUUGrRkU
-DoCjjvbdfMfWflik
-EOcLKvbdOTTugEuQ
-DncLKvbdjvWnDaww
-EOcLKvbdsPuoKDVf
-EPDLKvbdZirhPfaf
-DoCjjvbdDwxLsstM
-DnbjjvbdfHkWRmpg
-DncLKvbdrpWOibuf
-EPDLKvbdZtIhyESn
-DncLKvbdwygfGYEr
-EPCjjvbdeEoSCWcK
-EPCjjvbdjuvmdBww
-EObjjvbdqUTfqqjt
-EOcLKvbdZjSgogBf
-DoDKjvbdYqMdiMeR
-DoCjjvbdKefICApu
-DoDLKvbdMfcQNQVL
-EPCkKvbdjggMGGNk
-EObkKvbdCDoaVjMf
-EObkKvbdWWiXuceH
-EOcLKvbdURROuVHm
-DnbjjvbdpssfrSLU
-DncKjvbdgFkzNgHA
-DnbjjvbdaSFbgtFk
-DncLKvbdIxTahMQp
-EPDLKvbdKWVFceGi
-DncKjvbdFVyPomKF
-DoDKjvbdZirgpHBf
-EObjjvbdVqmwadkc
-EPCkKvbdieLHVPAO
-DncKjvbdZLqdUOMN
-DoDKjvbdWWiYWDeH
-EObkKvbdQwNdClID
-DnbjjvbdMoxRVnGs
-DncLKvbdrDdiPmvB
-DnbjjvbdZQleJNFR
-EOcLKvbdrDdhpOVa
-EPDLKvbdYqNFImFR
-DoDKjvbdEYXlTtUM
-DoCjjvbdhuZeWqtb
-EPDKjvbdMfcPlpVL
-EOcKjvbdNQYQvNfs
-DoDKjvbdiUzFXSVC
-DoCkKvbdmRxtzSci
-DnbjjvbdbiMikGXY
-DoCjjvbdQdDBQQdS
-EObjjvbdqZPIGqDx
-DoCkKvbdkWWmdBxX
-DoDKjvbdKxpirzuG
-DoCjjvbdlBNPNALA
-DoCjjvbdhzVGMROG
-DoCjjvbdzoQREcMY
-EPDKjvbdlAlnmALA
-EPDLKvbdwuMeRZLn
-EOcLKvbdYqMdiNFR
-EObkKvbdOTTugEuQ
-EOcKjvbdYTMAmUOx
-DnbjjvbdRDcBQRES
-DoDLKvbdidkHVPAO
-EPCkKvbdSKyFtfjs
-DoCjjvbdhytelQmf
-DncLKvbdEztRElCi
-EPDLKvbdRWnEDLgc
-DoDKjvbdwuNFQyLn
-EObkKvbdGLFTDHmV
-DnbkKvbdShyiqABM
-EObkKvbdUaCQsRSZ
-EOcKjvbdjuwNcbXw
-DnbkKvbdmfeXlnHZ
-DncKjvbdsPuoKDVf
-EOcKjvbdNGbomPtk
-DoDKjvbdvPTzpkOt
-EPDKjvbdJqZdneme
-DncKjvbdqTtGqqkU
-DnbkKvbdjggLeemk
-DoCjjvbdVZIUZkOn
-EPCkKvbdzjVPodTU
-DncKjvbdnBjXYOnV
-DoDKjvbdHgGzYxYH
-EPCkKvbdSZigsCvA
-EPCjjvbdtbbtvuno
-DoDKjvbdPIAXyAZB
-EObjjvbdRNXaxmtz
-DoCkKvbdUyITykPO
-EPCkKvbdssRryZeD
-EObkKvbdJuuGEFGi
-DoDLKvbdxZgfGXeS
-EObjjvbduoTzqLOt
-DoDKjvbdbrbkTcjB
-DncLKvbdxxIiaoyk
-DoCjjvbdFxtuBDxC
-EPDLKvbdzaAPGgBl
-EPDLKvbdpxnhGqDx
-EOcKjvbdtSqsZZeD
-EOcLKvbdMowpvOGs
-EObkKvbdVBCRSpqy
-DoCkKvbdZRNEiMeR
-EPCjjvbdczYowyQb
-DncKjvbdjgfkfGNk
-DnbkKvbdssSTYzFD
-EOcLKvbdVhYWYGxz
-DncKjvbdKDJcQibx
-DncKjvbdZHWdAPTJ
-EPCkKvbdFjdsChNV
-DoDLKvbdJcJcRJcY
-EPCjjvbdRjyGVHLT
-DnbkKvbdBcpBWKMf
-DoCjjvbdxUmEpyMO
-EPDKjvbdZoNiFEzK
-DoCjjvbdPIAYZAZB
-EOcLKvbdFejSOIsq
-DoDKjvbdjggMGFmk
-EObkKvbdWRnXadlD
-EObkKvbdnGdxMmfy
-DoDLKvbdLBKgNBxR
-DoCjjvbdaSGChTek
-EPCkKvbdSCEElIxk
-EObjjvbdIxTbHlQp
-EPCkKvbdOEcshhkE
-EOcLKvbdbsCjsdKB
-DncLKvbdCSaDUGXS
-EPCjjvbdRzJgsDWA
-EPDLKvbduCbuXVno
-EOcLKvbdGdLViajK
-DncKjvbdCWzdJEpW
-DncKjvbdjuwODbXw
-DncLKvbdqUTfqqjt
-EOcKjvbdxUmFRYkn
-DoCjjvbdVAaqSqRy
-EPDLKvbdaMkBsUlg
-EOcKjvbdGLFTCgmV
-EPCkKvbdZeYGzgiC
-DoCjjvbdwXLaWBVu
-DoCjjvbdelevgMik
-EPDKjvbdkHgMGGOL
-DoCjjvbdcJMjKewY
-EOcLKvbdwzHfGYEr
-DncLKvbdlZTRryGt
-EOcLKvbdfVzwoizs
-EPDKjvbdhzUelRNf
-EPCkKvbdiHKCxvKV
-EOcKjvbdGFjRmhtR
-EPDLKvbdGLEsChNV
-DoDKjvbdYORAXuWU
-DnbjjvbdpstHSSKt
-EObkKvbdegkVqmpg
-EPDLKvbdhyuGMQmf
-EObkKvbdliDtQtqa
-DoCkKvbdfNGXGlik
-DoCkKvbdHfgZyXwg
-DoCjjvbddndsKssr
-EPCjjvbdZMSDsnLm
-EObkKvbdEXxMTstM
-EPDKjvbdJvUecdfi
-DnbkKvbdVUMsekuj
-EPCjjvbdPyNAGsSK
-DoCjjvbdMSWmZuQz
-EObkKvbdBcpBVjNG
-DnbjjvbdezuxdiUX
-EPCjjvbdBdQAvJlf
-DncKjvbdOTUWHFVQ
-DoDKjvbdaSGDIUFk
-EOcKjvbdUGzmlWvF
-EOcLKvbdjlakydfo
-DoCkKvbdWSOXaeLc
-DoDKjvbdznpRFDLx
-DoCkKvbdwtldpxlO
-DoDLKvbdGdLVjBjK
-EObjjvbdmttykKSG
-DoDKjvbdZjShQGaf
-DoDKjvbdrDdhomvB
-EPDLKvbdiUyeXSVC
-DncKjvbdIsYaSmXl
-DnbjjvbdVhXvYHYz
-EPDKjvbdwzHfGXdr
-EOcKjvbdxsOJMqbH
-DoCjjvbdehKuqmqH
-EPCjjvbdZdxGzhJC
-EOcKjvbdsCGMlHLZ
-DoCjjvbdOEcshhkE
-DoCjjvbdEzsqElDJ
-DncLKvbdURRPVVIN
-EPCkKvbdZoOJFEzK
-DnbjjvbdBiKajhfK
-EOcLKvbdbUafwkTh
-EOcLKvbdVZHszKoO
-DnbkKvbdGKdsDIMu
-DnbkKvbddoFSkUUS
-DnbjjvbdPxmAGrqj
-EPCjjvbdKNADzHVB
-EPCjjvbdcyxpXxqC
-DnbkKvbdLBLGmBxR
-EPDKjvbdFWYopNJe
-EPCkKvbdcJNKKewY
-DoCjjvbdGLErcHmV
-EPCjjvbdWXIxWDdg
-DnbkKvbdQvmcbkhD
-EOcLKvbdbVCGwjtI
-DoCjjvbdmgFYMmfy
-EPDLKvbdQdDApRES
-DnbkKvbdWWhwvEFH
-DnbjjvbdxZhFexFS
-EPCkKvbdCIjakJGK
-EPCkKvbdKQyeOfOF
-DncKjvbdEObjkXDE
-DnbjjvbdNGcPlotk
-DoCjjvbdVUMtGMVj
-EPDLKvbdelfWgNKL
-DnbkKvbdqwPlDJZR
-DncLKvbdbiMikFwY
-EObkKvbdkNBkzEgP
-DoCkKvbdmuUyjiqf
-DncKjvbddneSjtTr
-EPCkKvbdRkZFtgLT
-EObkKvbdRjyGUgLT
-EPCkKvbdKaKgMaxR
-DnbkKvbdZMRdTnMN
-EPCkKvbdqZOhGpcx
-EPCkKvbdxwhjBozL
-DncKjvbdGckViajK
-EPCkKvbdiifHilxS
-EOcLKvbdqUUGrRjt
-EPCjjvbdbhljLGWx
-DnbkKvbdhgKCxujV
-DoDLKvbdJSyAsNXl
-DoDLKvbdjgflFenL
-EPCkKvbdMJBlQxAS
-DncLKvbdUMVoAvPJ
-DoCkKvbdkCkjpgVH
-EPDKjvbdqGEEsvAh
-EObkKvbdmRxuZrci
-EObjjvbdNdctIhjd
-EPCkKvbdCSaDTevr
-EPCjjvbdRDcAopcr
-EObkKvbdwtmEpyMO
-EOcKjvbdqZPHfqDx
-EOcLKvbdaNKbStmH
-EOcLKvbdaSFcHsfL
-DnbkKvbdRosgJecw
-EObkKvbdkySrSyGt
-EOcLKvbdwuMdqYkn
-EPCjjvbdrDdhonWB
-EPCkKvbdiBoDEwRR
-EPCkKvbdEztQdlCi
-EObkKvbdFyUuBEXb
-EPDKjvbdOAIsUJrA
-EPDKjvbdKCicRKCx
-EObjjvbdSZihSbvA
-DncLKvbdvAdYsPEh
-DncKjvbdySnImSCH
-EObkKvbdiVZeXRtb
-EOcKjvbdsCFllHLZ
-EPDKjvbdZeXfzgiC
-DnbjjvbdMpXpvNgT
-DoDLKvbdsCFllHKy
-DoCkKvbdqYoHfpdY
-DnbjjvbdRzKHrbvA
-EOcKjvbdNHComPtk
-EOcLKvbdCJLBjiGK
-EPDLKvbdsZlPsAhO
-DnbkKvbdemFvgMik
-DoCjjvbdFyUuBDwb
-DnbjjvbdrafMlGkZ
-DncKjvbddZyPxYpb
-EObjjvbdxZhGFwdr
-EPCkKvbdEXwlTssl
-DnbkKvbdANIYrvyx
-EObjjvbddePRawCj
-EPDKjvbdyNsIXrhc
-EPCkKvbdhkeEOVDZ
-DoDLKvbdAMgxrwZx
-EPDLKvbdsQWPJbvG
-DoCkKvbdkVvmcbXw
-EPDKjvbdJYTbIMQp
-DncLKvbdBsAcTewS
-DncLKvbdxrnJNRag
-EOcLKvbdmSYtzSdJ
-EObkKvbdqdFJQNua
-DoCjjvbdZyEKOCkr
-DoCkKvbdZLrEUOLm
-EPCkKvbdRNXaxnUz
-EPDLKvbdnUuZjjRf
-EObkKvbdmbKXYOmu
-DnbkKvbdlZTSTYgU
-EPDKjvbdGYuUaDxC
-DncLKvbdFyVVAcxC
-DoDKjvbdEvZPpMjF
-EPDLKvbdSwjlNzjx
-EPCjjvbdbKkeoNcA
-DoCkKvbdMfcQMotk
-DnbkKvbdyTNiNRbH
-DncLKvbdFWYpQMjF
-EPCkKvbdEvYopMjF
-DncKjvbdeKJrWUzn
-EOcKjvbdpssfrSLU
-EObjjvbdKCjDRJbx
-DnbkKvbdeUAUATMv
-EPDLKvbdjKGIJlxS
-DnbkKvbdpssfqrLU
-EPDKjvbdqZPHgQdY
-EPDLKvbdeAURNXif
-DoCjjvbdypoMhiwA
-EPDLKvbdGYtuAdXb
-EObkKvbdRaceLiYk
-DoCjjvbdXsMBNTnx
-EOcLKvbdKCjCqKCx
-DoCjjvbdYSlAmUPY
-EPDLKvbdpstGrSKt
-EPDKjvbdhtyeXRuC
-EObjjvbdtlYXBUBX
-EObjjvbdRMxByNtz
-EObjjvbdhanbeWqR
-EOcKjvbdpyPIHQcx
-EPDLKvbdrRtjnLBN
-DoDKjvbdNQYQvNgT
-DnbjjvbdbsDKsdJa
-DnbjjvbdDxYMTssl
-EPDLKvbdnCKWxOmu
-DncKjvbdILazmwQk
-DoDKjvbdhgJcYuiu
-DoCjjvbdlYrrSyHU
-EOcKjvbdVUNUFkvK
-EObjjvbdRyjHrbvA
-DoDLKvbdDnbkKvbd
-EOcKjvbdaNKbStmH
-DnbkKvbdjblLRGtg
-DncKjvbdxUleQyLn
-EPDKjvbdLGFhBaQu
-EObkKvbdqmZiyLgi
-DoCjjvbdJuuGEFGi
-EPDKjvbdqmZixlIJ
-DoCjjvbdXnRAYVVt
-EOcLKvbdWIYVxGxz
-EPCkKvbdxZgfGYEr
-EPDKjvbdfNGWfmKL
-EPDKjvbdbrbjscjB
-DoDKjvbdsPunjCvG
-DoDKjvbdziuQQDsU
-DoDLKvbdbhlijfWx
-EPCkKvbdhgKCyWKV
-EPDLKvbdGLEsCgmV
-EOcKjvbdmIcspuSB
-EPDKjvbdIwsbILqQ
-DoDLKvbdpedEsvBI
-DncLKvbdsPunjDVf
-DncLKvbdIxTbHkqQ
-DncLKvbdcSbkTdJa
-DncKjvbdUWLpJsaR
-DnbkKvbdsQVnjCvG
-EPDKjvbdyXiJapZk
-EPCkKvbdrzLosAgn
-DncLKvbdNsTugEuQ
-DoDLKvbdrykoraHn
-EObjjvbduaDySoFI
-DncKjvbdZHWdAOri
-EPCjjvbdlqxtysEJ
-DnbkKvbdOSsvHEtp
-DoDKjvbdRotGjGDw
-DoDKjvbdYfvdAOsJ
-DoCkKvbdBhjajiGK
-EObjjvbdCgLegAzc
-DoDLKvbdhtyeWrVC
-EOcKjvbdzitoocrt
-EOcKjvbdNVTSKmAX
-EPCjjvbdVYgsyjnn
-EObkKvbdliEUQuRa
-DoCkKvbdqFceUWAh
-EPDKjvbdIsZAsMxM
-DnbkKvbdUVlPjUBR
-DoDKjvbdbUafwjsh
-EObjjvbdQlxCZOUz
-DoCkKvbdQvnEDLhD
-EOcKjvbdUVlQKUBR
-EPDKjvbdehKvRnQg
-DoDLKvbdxmsIYTIc
-EObjjvbdsCGNLfkZ
-EObjjvbdmSYtzSdJ
-DoCjjvbdiMEcnVDZ
-EPCjjvbdypnlhiwA
-DoCjjvbdRyihTDWA
-DoCjjvbdZoOJEdzK
-DoCjjvbdJpzEoGOF
-DoCkKvbdYpmEiMeR
-EPCkKvbdbhljKfWx
-EPDLKvbdqYnggQcx
-EOcLKvbdwjwEHzyf
-EPCjjvbdLFegbAqV
-DoCjjvbdMoxQvNgT
-EPCjjvbdZsiIyETO
-DoDLKvbdZQmFImEq
-DnbjjvbdYkrDtOMN
-EPCjjvbdjggMGGOL
-DncLKvbdDwwlTstM
-EOcKjvbdCWzciFQW
-DoCkKvbdyYIiaozL
-DnbkKvbdNsTufeVQ
-DoDKjvbdjlakydfo
-EObjjvbdUGznLvue
-DoCjjvbdeFOqawDK
-DoCjjvbdZnmiFEyj
-EOcKjvbdVBCQrprZ
-EOcLKvbdrovOjCvG
-DncKjvbdrovPKCuf
-EOcLKvbdlYrqryHU
-EObkKvbdcyyPxZQb
-EObjjvbdnBivwnnV
-EObjjvbdjJehJlwr
-DnbkKvbdOFDtJIjd
-DnbjjvbdVAaqSqSZ
-EObkKvbdrXPkbiZR
-DoCjjvbdzaAPGfal
-DncKjvbdZQldhmEq
-EObjjvbdmoyxvLZC
-DnbkKvbdmpZxujyC
-DoCjjvbdvwLaWBWV
-DncLKvbdiVZdvquC
-DnbjjvbderBWzlDP
-EPCjjvbdjbkjpfuH
-DncLKvbdrafNLfkZ
-DncKjvbdrWokbhxq
-EPCkKvbdsZkosBHn
-EOcKjvbdidjfuPAO
-DnbjjvbdNGcPmQUk
-EPCjjvbdrJAKFNOe
-DnbjjvbdTukoitBR
-DnbkKvbdySmhlrCH
-EObkKvbdrXPkcIxq
-EOcLKvbdFejSOItR
-EObkKvbdmgExMnGy
-EPDKjvbdqrVLOLBN
-DoDKjvbdLAkHNCYR
-EObkKvbdVrOXbEkc
-DnbjjvbdEXwlUTsl
-EPCkKvbdyXhjBpZk
-EObkKvbdiifHjMxS
-EOcKjvbdEKHiuxKA
-EObkKvbdZLqdTmlN
-EObkKvbdWRnXaeLc
-DnbjjvbdWSNwaeMD
-DnbjjvbdfNGWgNKL
-DoDKjvbdoAKztIDn
-DncLKvbdmaivxOmu
-DnbjjvbdZLqcsnMN
-EObjjvbdcTDKscia
-EPCjjvbdOTTufeUp
-DoDKjvbdGdLVjBjK
-DncKjvbdcJNKLFvx
-EOcLKvbdTYKkmzjx
-EOcKjvbdZRMeImEq
-DoDLKvbdKQyePFnF
-DnbkKvbdNrtWGduQ
-EPCjjvbdatbHXjtI
-EPCjjvbdvwMAuaVu
-EPDLKvbdnQZxvLZC
-EObjjvbdtlYXAsaX
-DnbkKvbduDDVWvPP
-EPDLKvbdqTtGrSKt
-EObjjvbdxnSgwsJD
-EObjjvbdbKkenmcA
-EPCkKvbdFaOqYizm
-EOcKjvbdLGGHbBRV
-DoDLKvbdRzJhTCvA
-EPCjjvbdiMFDmtcZ
-DnbjjvbdWWhwvEEg
-EPCjjvbdJmAEZgVB
-DoCjjvbdmuVZjirG
-DoCjjvbdliEURUqa
-DoDLKvbdnCKWwnnV
-EPDLKvbdhgJbyViu
-DnbkKvbdjggMFfNk
-EObkKvbdEuxopMie
-EPDKjvbdssRsYydc
-DncLKvbdliDsqVRa
-EOcLKvbdLBKflbYR
-DncKjvbdzoPpeClY
-DncKjvbdqFdEsvBI
-DoCjjvbdZMRctOMN
-DncKjvbdDnbkLWcE
-EObkKvbdMfcQNPuL
-DoDKjvbdUWMPjTaR
-DnbjjvbdxmsHwsIc
-EObkKvbdrDdhonWB
-EPCkKvbdhgJcYvJu
-DoCkKvbdlYsSSyHU
-EPCjjvbdNdcsiJLE
-DoDKjvbdhlEcmuCy
-EObjjvbdJTZAsNXl
-EPCjjvbdznpQeClY
-DncLKvbdDxYMTssl
-DoCjjvbdkVwNcbXw
-EOcLKvbdMgDPlpUk
-EObkKvbdXsMAlsnx
-DnbkKvbdiBncEvqR
-EPCjjvbdeFPSCWcK
-DoDKjvbdmuUzKjSG
-EPDKjvbdqrUkNjaN
-DoDKjvbdhyuFlQnG
-EOcKjvbdDigivYKA
-DoDLKvbdJYUCHkqQ
-DncKjvbdACqwiyiQ
-EPDKjvbdEYXkstUM
-DoDLKvbdKDKCpicY
-DncLKvbdCDoaVjNG
-EObkKvbdxZhFexFS
-EPCkKvbdKDJcQjCx
-DoDLKvbdEPCkKwCd
-EPCkKvbdTfzmkwVe
-DnbjjvbduWOYJqTA
-DoCjjvbdcJMijfXY
-EPCkKvbdmaiwYPOV
-EOcKjvbddjJrVtzn
-EObkKvbdpstHSRjt
-EOcKjvbdyXiKCQZk
-DnbkKvbdIsYaSmYM
-DnbjjvbdwtmFQxlO
-DnbkKvbdYpleJMdq
-DoCjjvbdkNBkzFGo
-EOcKjvbdbsCkUEKB
-DoDKjvbdYlRctOMN
-DnbkKvbdjuwOECXw
-EPDKjvbdWRnXaeMD
-DncLKvbdkDLkQgVH
-DoDLKvbdFeiqnJTq
-EOcKjvbdzHYlAMeX
-EPCjjvbdJbjCpjDY
-EPDLKvbdzitopDsU
-DnbkKvbdziuPpDrt
-DncLKvbdySnImSCH
-DnbjjvbdySnImRbH
-DoCjjvbdKjaIWAJy
-DnbjjvbdTqRPUthN
-DoCjjvbdURQntuIN
-EObjjvbdQlxCYmtz
-EPDKjvbdMtsSLNAX
-EObjjvbdJbjDQicY
-DoDKjvbdEPCkKwDE
-EObkKvbdKQydoGNe
-DoDLKvbdVwJXuceH
-EObjjvbdnUtykJrG
-DncLKvbdwMvANEEm
-EPDKjvbdpyPHgQdY
-DnbjjvbdUVkpKUBR
-EOcLKvbdhfjCyVjV
-EPDKjvbddoFTKstS
-EPCkKvbdANHyTXZx
-EPCkKvbdUxhTyjoO
-EObjjvbdkVwNdBxX
-EPDKjvbdDoCjjvbd
-DnbkKvbdWWhwudEg
-DnbkKvbdyTNiMrCH
-DoDLKvbdelewGljL
-DncLKvbdUGznMWue
-DncKjvbdwygfFwdr
-EPCkKvbdJqZePFnF
-DnbjjvbdNsTugEuQ
-DoDKjvbdQcbaPqDr
-DncLKvbdfMevgNJk
-DncLKvbdlrZVZrdJ
-DoCjjvbdFjeTCglu
-DnbjjvbdYqNFImEq
-DoCjjvbdsCGMkfkZ
-DncLKvbdhuZdwSUb
-DoCkKvbdrXPkbiZR
-DoCjjvbdZRMdiMdq
-DoDKjvbdemFvgMjL
-DoCjjvbdygZMANEw
-EOcKjvbdZRMeIldq
-EObkKvbdiHJcZWKV
-DncKjvbdCJKbKiFj
-EObjjvbdzROlhjXA
-DnbjjvbdDoDLKvbd
-EPDLKvbdVYgtZjnn
-EObkKvbdDoCjjwDE
-DnbkKvbdrouoJbuf
-DoCkKvbdyTOImRag
-EPDKjvbdBcpBVilf
-DoCjjvbdCWzdJFQW
-EPCkKvbdbrbjscjB
-EOcLKvbdwkWdHzzG
-EPDKjvbdnGeXlnGy
-EPCkKvbdznpREcLx
-EPCkKvbdZMRcsnLm
-EOcKjvbdJSyArmXl
-DnbkKvbdZMSDtNkm
-EPDKjvbdAMgySvzY
-DoDLKvbdyYJJbPzL
-DoCkKvbdLAjgMaxR
-DoDLKvbdWIXuxGxz
-DoCjjvbdqwQLbiYq
-DnbkKvbdpyPIHQcx
-EOcKjvbdfNGXHNJk
-DncKjvbdqYnhHQdY
-DncKjvbdeEnrBvcK
-EPDKjvbdZjTHpGaf
-DoDLKvbduoTzqLPU
-DnbkKvbdIjEAJofd
-DnbkKvbdxnSgxTJD
-DoDLKvbdXsLaMsnx
-DnbjjvbdaRfDHsek
-DoCkKvbduLwwAtBX
-DnbkKvbdrpWPJcVf
-DoDKjvbdrbFlkgLZ
-DoCkKvbdlqxtyrdJ
-EObkKvbdRyihSbvA
-EObkKvbdWRnYCFLc
-DoCkKvbdOEcshhjd
-DnbkKvbdZjTHpHBf
-DnbjjvbdcyyPwxpb
-DncLKvbdkVvmdCXw
-DncLKvbdcScKtEJa
-DnbjjvbdrSVLOLBN
-EObkKvbdiGjDYvKV
-EPCkKvbdEJgjVwjA
-DnbkKvbdRosgKFdX
-EPDLKvbdcScKtDia
-DoCjjvbdtbcVXVno
-DncKjvbdhgJbyViu
-EPCjjvbdjJehKNYS
-EObkKvbdyOTIYTJD
-DnbkKvbdRaceMJYk
-DoCkKvbdqiAKEmOe
-DoDLKvbdEKHiuwjA
-EObkKvbdxUldpxkn
-EObkKvbdFejRmhtR
-DncLKvbdSBcdlIyL
-EPCkKvbdxZhFexFS
-EObjjvbdwjwEHzzG
-EPCjjvbdmRxtzSdJ
-EPDLKvbdEvYooljF
-DoCkKvbdmgFXlmfy
-DoCjjvbdtkxXBTaX
-EObkKvbdmgExMnHZ
-DncLKvbdjvXODaww
-DoCkKvbdSCEFMIyL
-EPDKjvbdVYhTykOn
-DoDLKvbdNsUVgFUp
-DncKjvbdRXOEClID
-DoDKjvbdnVVZkKSG
-DoDKjvbdWWhxVcdg
-EPCkKvbdwuNFQxlO
-DncLKvbdKeegbBRV
-DncLKvbdUWLpJsaR
-EOcLKvbdNxOuzcmt
-EObjjvbddwzUUSFz
-DoCjjvbdJXtBhMQp
-DoCkKvbdLGFgbBRV
-EOcLKvbdcJMjKewY
-DnbjjvbdxUmEqYkn
-DnbkKvbdjbkjqGtg
-EPCkKvbdIHGzYwwg
-DnbjjvbdrpWOjCvG
-DoDKjvbdZMRctNkm
-DnbkKvbddZyPwxqC
-DoCjjvbdtcDVWuno
-DoCkKvbdJcKDRJcY
-EOcLKvbdmbKWwnnV
-EPDKjvbdcasNSAUN
-EPCkKvbdUaBpsQqy
-EObkKvbdJutedFHJ
-DoDLKvbdBhjakJFj
-DnbkKvbdnUuZjiqf
-EPDKjvbdpxoHgQcx
-DnbjjvbdZjTHofbG
-EObkKvbdkxsSSxgU
-DnbjjvbdWRmwbElD
-DoCkKvbdRkZFuGjs
-EPCkKvbdwNWANDdm
-EObjjvbdTkvPBVni
-DoDKjvbddndrkTtS
-DncLKvbdZtJIxdSn
-EOcLKvbduaDyTOeI
-EOcKjvbdxZgfGXdr
-EOcLKvbdkySrTZGt
-EPDKjvbdVwJXucdg
-EPDLKvbdatagYLUI
-DoCjjvbddZxpYZQb
-EPDKjvbdtunXjRTA
-DoDLKvbdWSOYBeMD
-DoCjjvbdHlBznXRL
-EPDLKvbdcyxpXxpb
-DnbjjvbdAMhYsWzY
-EObjjvbdraemLgKy
-EPDKjvbdJpzFOenF
-DoCjjvbdZnnIeEyj
-DoCjjvbdrWpLbiZR
-EOcKjvbdLqwMytpz
-DncKjvbdKQzEoFme
-EPDKjvbdZRMeJMeR
-DncKjvbdEuxpPlie
-EOcLKvbdFWYpPlie
-EOcLKvbdjblKpgUg
-EOcLKvbdiBnbdwQq
-DoDLKvbdOTTufeVQ
-EPDKjvbdpyOggQdY
-DnbkKvbdGBOqYizm
-EObjjvbdRjxfUfkT
-EPCjjvbdUMVoAuoJ
-DoDLKvbdVwJXvEEg
-EObkKvbdnCKXXoOV
-DoDKjvbdNPxRVmgT
-DncLKvbdZsiIxdSn
-EPDKjvbdjlalZeHP
-DoDLKvbdeFPSBvbj
-DoDKjvbdVqnXbFMD
-DncKjvbdHffyyYYH
-EOcLKvbdBhjbLJFj
-EPDKjvbdJvVGEFHJ
-EOcKjvbdgQBzvdYI
-EPDLKvbdpyOggRDx
-EObjjvbdKQyeOfNe
-EPCjjvbdtcCtwVno
-EPCjjvbdQvmdClHc
-DnbkKvbdyXiKBoyk
-DncKjvbdqTsgSSLU
-EObjjvbdyNrgxShc
-DnbjjvbdRkZFuGjs
-EObjjvbdYfvdAOri
-DoDKjvbdkMbMZeGo
-EPDLKvbdCIjbLIej
-DoDKjvbdHffyxwwg
-EPCkKvbdGdLVibJj
-DoCkKvbdaaVdepQX
-DnbkKvbdSQUGifDw
-EPCkKvbdqYngfpdY
-DnbkKvbdxUleQyLn
-DoCjjvbdqlyixkgi
-EPCkKvbdjgfkfGNk
-EObjjvbdeFOqavbj
-DoDLKvbdYkrDtNlN
-DoCkKvbdjhGlFenL
-EPCjjvbdijFhJmXr
-EObjjvbdnGeYMmfy
-EOcLKvbdbhmJjfXY
-EOcLKvbdLBKfmCYR
-DncLKvbdJSxaSmXl
-EPCjjvbdsQVnicWG
-DoDKjvbdjhHLfFnL
-EObkKvbdjuwOEBww
-DoCjjvbdiBncEvpq
-EOcLKvbduLxWaUAw
-DncLKvbdhuZdwRtb
-EOcKjvbdjvWnECXw
-EObkKvbdZeYGzghb
-DoDLKvbdNQYQumgT
-DoDKjvbdJpydoFnF
-EPCkKvbdRjyFuGkT
-DnbjjvbdraelkgKy
-EObjjvbdfNGXHMjL
-DoDLKvbduWNwiqTA
-DncKjvbdnVUzLJrG
-DoDLKvbdehKvSOQg
-EPDLKvbdwtmFRYkn
-DoDKjvbdKfFgaaQu
-DncKjvbdCTBDTfXS
-EObjjvbdDoCjjwCd
-EPCjjvbdYTMAmUOx
-EOcKjvbdiMFDnVCy
-EObkKvbdjlalZeHP
-DnbjjvbdCJLCLIfK
-DoDLKvbdZMRdUNkm
-DnbjjvbdURRPVUgm
-EObjjvbdJcJbpibx
-EObkKvbdrWpMDJZR
-EObjjvbdjuwNdBxX
-EPCjjvbdbBVdfQQX
-EPCjjvbdKRZeOfOF
-DoCkKvbdKDKCqKCx
-DoCjjvbdkVvmdBxX
-EPDKjvbdvAdYroEh
-EOcLKvbdtcCuXWPP
-EPCjjvbdczZQXxpb
-DncKjvbdUxhUZkPO
-EObjjvbdlrYtysEJ
-DncLKvbdcScLUDia
-EPDKjvbdBsAbsevr
-DoDLKvbdqTtGqrLU
-DoDKjvbdSCEFLiYk
-EPCjjvbdRWmccLgc
-DncLKvbdNQYQunGs
-EObkKvbdmbKXYPNu
-EPCjjvbdfMewGmKL
-EObjjvbdzROmIiwA
-DnbkKvbdliETptqa
-EPDKjvbdHlBznWpk
-DoCkKvbdUaBpsQqy
-DoCkKvbdWSOYCFMD
-DoDLKvbdxmrhYTIc
-DncLKvbdLAkGlbYR
-DncKjvbdlhctRUqa
-DoCjjvbduDCtwVno
-DnbkKvbdIjEAKQHE
-DnbjjvbdiLddNuCy
-EPDKjvbdEXwktUTl
-EPCjjvbdyNrgwsJD
-EObkKvbdnPzYujxb
-EPDKjvbdznoqEcMY
-EPDKjvbdZRNEhleR
-DoCjjvbdGQATXHFy
-EPCjjvbdyqPNIiwA
-EOcKjvbdkxrrTYgU
-EOcKjvbdcImKLFvx
-DoCkKvbduoTzpkPU
-EPCjjvbdJXtCIMQp
-EOcKjvbdrpVoJbvG
-DncLKvbdqZPIHRDx
-DnbjjvbdTAFJHand
-EOcKjvbdtcCuWuno
-DncLKvbdfIKurNqH
-DncKjvbdLrWmZtpz
-DoDLKvbdMtsRjmAX
-EObjjvbdLGGHbBRV
-EObkKvbdCWzchePv
-EOcKjvbdZxcjODMS
-EObkKvbdzaAPGgBl
-DoDLKvbdKVtecdgJ
-DnbjjvbdHDjvJbJj
-EPCjjvbdLiCLqYAS
-EPDLKvbdFVxpPmKF
-DoDLKvbdZisIPgBf
-DncLKvbdTppoUtgm
-DnbjjvbdpyPIGpdY
-DoDLKvbdEztRElCi
-DncLKvbdHgGzZYYH
-DnbjjvbdZLqctOMN
-DnbkKvbdqTtGqqkU
-DnbjjvbdiMEcnVCy
-EPDKjvbdvBDxrneI
-DoDKjvbdemGXHNJk
-DoDKjvbdhficYvKV
-EObjjvbdegkWSOQg
-DoDLKvbdOFDtIiKd
-EPCjjvbdBdQAuimG
-DoCjjvbdpyPHgREY
-DncKjvbdJXsbHkpp
-DoDKjvbdRbEElIxk
-DoDKjvbdsQWPJcWG
-EObkKvbdsCGNLfkZ
-EOcLKvbdzaAPGgCM
-EObkKvbdzjUoodSt
-DnbkKvbdemFvgMjL
-DnbkKvbdWWhxVcdg
-DncLKvbdxrmiMqag
-EPCkKvbdMSWlytpz
-EObjjvbdwNWAMdFN
-EPDLKvbdlrYtzTEJ
-DnbjjvbdVqnYBeLc
-DncKjvbdnHEwmOGy
-DnbjjvbdtbbuWvPP
-DncKjvbdmIcspuSB
-EObkKvbdEOcKkXCd
-EOcKjvbdDncKkXCd
-EPDLKvbduaDxrndh
-DoCjjvbdOFDshhkE
-DnbkKvbdRaceLhyL
-EPCkKvbdZshhyDrn
-DoCjjvbdCSaDTfWr
-EOcKjvbdqUTfrSLU
-EPDLKvbdtTRryZdc
-DoDLKvbdkyTRsZGt
-EPDKjvbdyqPNIjXA
-DoCkKvbdNUrrKmAX
-DoCjjvbdSCDeMIxk
-EObkKvbdkMbLzEgP
-DncKjvbdEvZPpMie
-DoCkKvbdyYIibQZk
-EObkKvbdNPxQumfs
-EOcLKvbdDncKjvbd
-EPCkKvbdozmcjxPA
-EPDKjvbdCIkCLIfK
-DncKjvbdcyxoxZRC
-DoCkKvbdeOdrkUUS
-DoCjjvbdhzVFlQnG
-EObjjvbdOFETiJLE
-DncKjvbdhyuGLqNf
-EObkKvbdRWmdClID
-DoCjjvbdFpATWgFy
-DnbkKvbdlqxtysDi
-EObjjvbdqmZjYkhJ
-DoDKjvbdZyDjODMS
-DoCjjvbdEJhJvYKA
-EOcKjvbdqTsgRrLU
-EOcKjvbdZsiIxcrn
-EObkKvbdIHGzZYYH
-EPDKjvbdHgGyxxXg
-EObkKvbdxmrgwriD
-EPCkKvbdxrnJNSBg
-DnbkKvbdjhGkefOL
-EPCjjvbdKQydoGNe
-EOcKjvbdqvpMDJZR
-EObjjvbdQdDBQQdS
-DoDKjvbdSKxfVHKs
-DoDKjvbdbLLeoODA
-DoDLKvbdBsAcUGWr
-DoCjjvbdRzKHrbvA
-EObjjvbdfMfXGljL
-EObkKvbddeOrCWbj
-DoDKjvbddjJrVtzn
-DoDLKvbdhtydvqtb
-DnbjjvbdRNXayOUz
-EPDLKvbdRjyFtgKs
-EObkKvbdsPuoKCvG
-EPCkKvbdYqNEiNFR
-DncKjvbdUxgsyjnn
-EPCjjvbdZRMdhldq
-DoDLKvbdEJhKWXjA
-DoCkKvbdQwODblID
-EPCkKvbdssRrxzFD
-DnbjjvbdZxdKOCkr
-EObjjvbduCcUwVno
-EOcKjvbdmuUzLKRf
-EPCjjvbdfpBzvcwh
-DnbjjvbdMowpvNfs
-EPDKjvbdGLErcHmV
-EPDLKvbdZoOIeEyj
-DncLKvbdSLZGUgKs
-DncLKvbdlqyUzTEJ
-EPCjjvbddePRawDK
-DncKjvbdHEKvKCJj
-DoDKjvbdeEnqavcK
-DoDLKvbdtSrTYzFD
-EPDLKvbdxUmFQxlO
-DnbjjvbdLLBIWAJy
-EOcLKvbdMowqWNfs
-EPDKjvbdptUGrSKt
-DoDLKvbdHEKvKCKK
-EPCjjvbdJcJbpjDY
-DnbjjvbdMuTRkNAX
-DnbkKvbdEzspdlDJ
-DncLKvbdVUMsekvK
-EPDKjvbdOTUVgEtp
-DncKjvbdAMgySwZx
-DoCkKvbdwtmFRYkn
-EObjjvbdIjEAKPgE
-EPDKjvbdRpTfjGEX
-DncKjvbdFjeSbglu
-EObkKvbdjFLGtoAO
-DoCkKvbduWOYJqTA
-EPCkKvbdVAapsQrZ
-DnbjjvbdVwJXudEg
-DoDLKvbdUtMsfLvK
-EPCjjvbdHELVjBij
-DncKjvbdRWnECkhD
-EPDLKvbdZsiJZDsO
-DncLKvbdnPzZWLYb
-EPCjjvbdznoqEcMY
-EOcKjvbdzoQQeDMY
-DnbjjvbdznpQdbkx
-EPDKjvbdeYZtTrFz
-DoCkKvbdkySrTZHU
-DncKjvbdCSaDUGXS
-DoCkKvbdcJNJjfXY
-EOcLKvbdCEQAvJlf
-EPDKjvbdyzdmqhJI
-DncLKvbdNPwpvNgT
-DoDKjvbdqmZixkgi
-EOcKjvbdVYhUZkPO
-EObkKvbdhgJbxvJu
-DoDKjvbdUQqPUuHm
-DncLKvbdqvolChyR
-EPCkKvbdEXxMTssl
-DnbkKvbdHgGzYwxH
-DoDLKvbdIidAJpGd
-DnbkKvbdZLqdUOMN
-DnbkKvbdGckViaij
-DoCkKvbdFVxopNJe
-EOcLKvbdRbEFMIyL
-EObkKvbdLAjflawq
-EObjjvbdziuPodTU
-EPDLKvbdQwNdCkhD
-EPCjjvbdZxdJmcLr
-EPDLKvbdxrmhlqag
-DoCkKvbdSPsgJfDw
-EPCjjvbdkDLjpgUg
-DnbjjvbdtbcUwWOo
-DnbkKvbdWIXuxHYz
-EObjjvbdEvYpQMie
-DoDLKvbdIHGzZXxH
-EPDLKvbdVYgszKoO
-DncKjvbdhancEvpq
-EPCjjvbdcJNKKewY
-EPDKjvbdWWhwvEEg
-EOcLKvbdvAdYsOdh
-EObkKvbdcyyPwxqC
-EObjjvbdSPtGifDw
-EOcLKvbdkMalZeHP
-EPDKjvbdYlRctNlN
-DoDLKvbdKWVGEFGi
-DncLKvbdMgColouL
-DncLKvbdhbPCeXRR
-DncLKvbdDwxMTstM
-DoDKjvbdvAcySndh
-EObkKvbdXGYytAPT
-DoCjjvbdmuVZjjRf
-EOcLKvbdDGlFgAzc
-DoDKjvbdiBncFXRR
-DoDKjvbdkaMnmALA
-DncKjvbdVBCQrqSZ
-DoCkKvbdVviYWEFH
-EObkKvbdAMhZSwZx
-DoDLKvbdeAUQlwjG
-DoDLKvbdZxcjODMS
-EOcLKvbdrpWPKDVf
-EPCkKvbdWRnYCFLc
-DnbkKvbdKeehBaRV
-DoDKjvbdMSXMzUpz
-EOcKjvbdRkZGVGjs
-DoDLKvbdFkFScIMu
-DoCjjvbdZjTHogBf
-DnbkKvbdnBivwnmu
-EOcKjvbdCTAcTevr
-EOcKjvbdVviXvDeH
-DoDLKvbdliDsptqa
-EPDLKvbdZirgpGaf
-EPCjjvbdaRfChUFk
-EPCjjvbdkClKqGtg
-DoCjjvbdKQyeOfOF
-EPCkKvbdqvpLbiYq
-DnbjjvbdCTBDTfXS
-DoCjjvbdOEctIhkE
-EObjjvbdbVCHXkUI
-DncKjvbdxnTIXrhc
-DnbjjvbdezvYdhsw
-EPCjjvbdDwwkstUM
-EPCkKvbdaaVdepQX
-DoDLKvbdjlbMZeHP
-DoDLKvbdqAiFAXHd
-EPDLKvbdGLEsCglu
-EPCjjvbdZyDinClS
-EPCkKvbdSLYeuGkT
-EPDKjvbdwyhGFweS
-EOcLKvbdjJfIKNYS
-DoCjjvbddeOrCXCj
-DoDKjvbdkxrqsZHU
-EOcKjvbdGYuVBEYC
-DncKjvbdHkazmvqL
-DnbkKvbdZsiIxdSn
-EObkKvbdhanbeXQq
-EOcLKvbdMpXqWNfs
-DnbkKvbdEztQdkcJ
-EPCjjvbdDjHjWXjA
-EOcKjvbdNQYQvNgT
-EPCkKvbdNHCpNPtk
-DoCjjvbdbsCkUDjB
-EObkKvbdOStWGeUp
-EOcKjvbdVqnYBdlD
-DoCkKvbdvlvANDeN
-DoDKjvbdnQZyWKyC
-EOcLKvbdkyTRsYft
-EOcKjvbdnVUyjiqf
-EPCjjvbdXnRAXtut
-EPDKjvbddZxpXxpb
-EPDLKvbdfHjvSOQg
-DncKjvbdXsMBNTnx
-DncKjvbdEARiMzXX
-EPCjjvbdOStVgEuQ
-DnbjjvbdHELWKCKK
-EOcLKvbdehLWSOQg
-DncLKvbdYkqctOLm
-DoDLKvbdxsOJMqbH
-DoCjjvbdzGyMANFX
-DoCjjvbdSCEElJZL
-DoDKjvbdRkYeuHLT
-EOcKjvbdXsLaMsnx
-DnbjjvbdePFSkUUS
-DncKjvbdGZUuAdXb
-EOcLKvbdlZSqsZGt
-DncKjvbdiCPCdwRR
-EObjjvbdjvXOEBxX
-EPDLKvbdRXOEDMHc
-EPCkKvbdZisIQHCG
-EPDKjvbdjKGIKNYS
-DncLKvbdWWiYVdEg
-DnbjjvbdaMkBruNH
-EOcLKvbdOFEThiKd
-DoCkKvbdVZHszLPO
-DoDKjvbdiHJcYvJu
-EPCkKvbdwuNFRZLn
-EObkKvbdJqZdoGNe
-EOcKjvbddndsLUUS
-EOcLKvbdBraCtGWr
-DncLKvbdxrnJNRbH
-DoDLKvbdCWzciFPv
-EPCkKvbdtlXvaUAw
-DoCjjvbdMfbomQUk
-DoCjjvbdfoazwDxI
-DoCkKvbdauCHXkUI
-DnbjjvbdaogHELzd
-EPCjjvbdTulPisaR
-EPCkKvbdOSsvHEtp
-DoDLKvbdTkuoBVni
-EPDKjvbdVBBqTRSZ
-DnbjjvbdEJgivYKA
-DncKjvbdJXtBgkqQ
-DnbkKvbdbsCjsdJa
-EPCjjvbdhlEcnUby
-EObjjvbdssSSyZdc
-EObkKvbdhgKCyWJu
-EObkKvbddeOqbWcK
-DoCkKvbdqvpLcJYq
-EPDKjvbdxZgefXeS
-EOcLKvbdkVwOEBww
-EPDKjvbdemFvfljL
-EPCjjvbdFkErcIMu
-EOcKjvbdZyEKNcMS
-EPDKjvbdqlzJxlHi
-EPCjjvbdmbJwXnmu
-EOcLKvbdcTDLTcia
-DoCkKvbdyzdmqhJI
-DnbjjvbdGdLWKBij
-DoDKjvbduaDxsPEh
-DoDKjvbdZshhxdTO
-DncKjvbdptUGqrKt
-EPCjjvbdJvVFceGi
-EOcKjvbdddoRawDK
-DoCkKvbdfMfXHMik
-EObjjvbdVAbRSpqy
-EObkKvbddZyPxYpb
-DnbkKvbdVYgszKnn
-DoCkKvbdZMRdUNkm
-EObjjvbdTvMPitBR
-EObkKvbdIxTaglQp
-EObkKvbdGGKSNiUR
-DoCkKvbdGBOpyJzm
-EPCjjvbdqrUjmjaN
-DncKjvbdIMBzmvpk
-EPCjjvbdcyxoxYpb
-EOcKjvbdmIcsqUrB
-DoCkKvbdqvolChyR
-EPCjjvbdkHgMGGOL
-EPDLKvbdpaIeAWgd
-DncLKvbdqvokcIxq
-EOcKjvbdZsiJYcrn
-EObkKvbdyYJKBpZk
-DoCkKvbdKDKDQicY
-EObkKvbdlhdTptqa
-EObkKvbdyXhjBpZk
-EObkKvbdKNAEZfta
-EOcLKvbdRyihTCvA
-DncLKvbdtcCtwVno
-DnbjjvbdVZITykOn
-DoCjjvbdJSyArlwl
-EPDKjvbdDxYLtUUM
-EPDKjvbdvlvANEFN
-DoDKjvbdrykpTAgn
-DnbjjvbdeYZtUSFz
-DoDKjvbdzjVQQETU
-EObjjvbdiHJbyVjV
-DoCjjvbdcScLTcjB
-DncLKvbdhaoDEwQq
-DnbkKvbdQlwbZNtz
-EPCjjvbdEARiMzXX
-EPCjjvbdGFjSOIsq
-DoDKjvbdrXPlChxq
-DoDLKvbdYqMeImEq
-DoDKjvbdOFETiJKd
-EPCjjvbdCTBDUFvr
-DoCkKvbdZoOIdeZj
-DncLKvbdHgHZyYXg
-EOcLKvbdCSaCsevr
-DoCjjvbdsQWOjCuf
-DoDKjvbdKWUfDeGi
-EOcKjvbdzitpPcrt
-EPDKjvbdZyDimcMS
-EPCjjvbdBcpAuilf
-EOcKjvbdqwQMCiYq
-EOcLKvbdsrrTZZdc
-EObjjvbdSQUHKGEX
-DoDLKvbdcyxoxZRC
-EObkKvbdWXJYWEFH
-DnbkKvbdhgKDYuiu
-DoDKjvbdrSVLOKaN
-EPCjjvbdMoxQumgT
-EPDKjvbdcbTMrATm
-EPDKjvbdznopdcMY
-DnbjjvbdzdzOzdyp
-EObjjvbdGYuVBEXb
-EPDKjvbdiZtekpnG
-DoDLKvbdvvlAuaVu
-DoDKjvbdEYXkstTl
-EPCjjvbdauCHYKsh
-DoCjjvbdDjIJuwjA
-EObjjvbdkNCLzFGo
-EPDLKvbdiGicZWKV
-EPCkKvbdtlXvaTaX
-DoCkKvbdpyOggQcx
-EObjjvbdtTSSyZdc
-DoDLKvbdiZtelROG
-EOcLKvbdWRnYCFMD
-EPDLKvbdNddUIhjd
-DncLKvbdEObjjvbd
-EPDLKvbdVUNTelVj
-EPCjjvbdVhXvYGxz
-DoCkKvbdfRaWzkbo
-DoCjjvbdRjyGVHKs
-DoCjjvbdSKxfUfkT
-EOcKjvbdaRecITek
-DoCkKvbdEJhKVwjA
-DoDLKvbdwXLaWBVu
-EPDLKvbdLYqJrztf
-DncKjvbdUMVoAuoJ
-DnbjjvbdvmWAMcdm
-EObjjvbdpssfqrKt
-DnbjjvbdhlEcnVDZ
-EOcKjvbdNsUWGeVQ
-EObjjvbdVUNTekuj
-DnbkKvbdVYgsykOn
-EObkKvbdpssgSRjt
-DncKjvbdVZITzLOn
-DoDKjvbdGGJrNiTq
-DoDLKvbdACqwizJQ
-DoDKjvbdIryArmXl
-DoCkKvbdZMRdTmlN
-DnbkKvbdrovPKDVf
-EObkKvbdrounjDWG
-DnbjjvbdCSaDTevr
-DnbjjvbdUyITyjnn
-DnbkKvbdKRZeOfOF
-DoCkKvbdDigiuxKA
-EOcKjvbdxsNhlrCH
-EOcLKvbdDjHiuxKA
-DncKjvbdXmqAXtvU
-DnbjjvbdqFdFTvAh
-EObkKvbdxrmhmSBg
-DoCjjvbdIidAKPfd
-EOcKjvbdKQydoGOF
-DnbjjvbdlqyUzSdJ
-EPDKjvbdtvOYKQsA
-EPCkKvbdcIljLFvx
-DoCjjvbdYqNEhldq
-EPDKjvbdczYpYZRC
-DoDLKvbdiBoCeXQq
-EOcLKvbdiCPDFXRR
-EPDLKvbdZisHofaf
-EPDKjvbdmIdURVSB
-EPDKjvbdZRNFIldq
-DoDKjvbdJpydoFme
-DoDLKvbdWWhwudEg
-DncLKvbdDnbjjwDE
-DncKjvbdqTsfqqkU
-DncKjvbdKDKDRKDY
-DoDKjvbdTulQJsaR
-DoCjjvbdSBdFMIyL
-DncLKvbdqTtHSSKt
-EOcKjvbdBcoaVjMf
-EObjjvbdiiehKNXr
-EObjjvbdCWzciFQW
-EPDLKvbdWSNwadlD
-EPDKjvbdKVuGEFHJ
-DoCkKvbdZMRdUNlN
-EPDKjvbdZRMdiMdq
-EPCkKvbdxUmEpyMO
-DoDLKvbdRkYfVHKs
-EObjjvbdIwtCIMQp
-EPDKjvbdmJDsqUqa
-EPDKjvbdrDeJPmvB
-EOcKjvbdTvMPisaR
-DncKjvbdMtsRjmAX
-DnbjjvbdlqyUysDi
-EPDKjvbdQwNdClID
-DncLKvbdRjxfVGjs
-EObkKvbdauBfxKtI
-DoDLKvbdiZtfLpnG
-DoDKjvbdhancFXRR
-DoDKjvbdREDBQQdS
-EObjjvbdrzMQTBIO
-EOcKjvbdcImKKfXY
-DoDLKvbdijGIKNXr
-DncLKvbdgGMZmfgA
-EPCjjvbdZnmheFZj
-EPDKjvbdmuVZjiqf
-EObjjvbdeFPRawDK
-EPDLKvbdrNZiyLhJ
-EOcKjvbdlhdURUrB
-EPDLKvbdGGJrNhtR
-EOcKjvbdiGibyWKV
-EOcKjvbdQlwbZNtz
-DncLKvbdnVUzKiqf
-EOcKjvbdbsDKscjB
-EPDLKvbdDnbjjvcE
-DoCkKvbdySmhmRag
-DncKjvbdkyTSTYft
-DoDLKvbdEYXkstUM
-EOcKjvbdiHJbyVjV
-EOcKjvbdsQVnicWG
-DoCkKvbdoznDkYPA
-EObkKvbdURQoVVHm
-EPDLKvbdFfKSNiTq
-DnbjjvbdVgxVwgYz
-DnbkKvbdmfeYNOHZ
-DoDKjvbdyqPNIiwA
-EObjjvbdFVyQPlie
-EOcLKvbdGdKvKBij
-EPCjjvbdDwxMUTtM
-DoCkKvbdKVtfEEfi
-DoCkKvbddjKRvUzn
-EObkKvbdliEURVSB
-EPDLKvbdWSNwaeMD
-EOcLKvbdJqZdoFnF
-DnbjjvbdKxqJrzuG
-DnbjjvbdmuUyjjSG
-EPDLKvbdADRxKZhp
-EPCkKvbdiCPDEwRR
-EObjjvbdTXkMNzkY
-DnbjjvbdMgDPlouL
-EPCjjvbdyzeNqghh
-EOcKjvbdmuUyjjSG
-EPDKjvbdDoDLKvcE
-EPDLKvbdNxPVzdNt
-DoDKjvbdBhjbKhfK
-DnbjjvbdZLrETmlN
-DoCkKvbdHffyxwwg
-EOcKjvbdYSlAmUPY
-EPCjjvbdtTSTYzFD
-DoCjjvbdFjeTCgmV
-EObjjvbdNwnuzcnU
-DoDLKvbdSPsfiecw
-DoDKjvbdKVtedFGi
-EObjjvbdUaCQsRRy
-EObkKvbdbsDLUDjB
-EObkKvbdEOcKjvcE
-EPCjjvbdyNsIYShc
-EOcLKvbdbVCGxKsh
-DoDKjvbdlZSqsYft
-DoCjjvbdUslselWK
-DncLKvbdbUbHXkUI
-DnbkKvbdYkqcsmkm
-DncKjvbdXsMAmUOx
-DoDKjvbdJuuFcdgJ
-EOcLKvbdGLFTChNV
-DoCkKvbdaaWEfQQX
-DncKjvbdVqnXbFMD
-EOcKjvbdZyEJnClS
-DoCkKvbdNdctJIjd
-DoDLKvbdmaiwYOmu
-EPCkKvbdmbJvxPOV
-DncLKvbdTqRPUuIN
-EPDLKvbdGGKSNiUR
-EPCjjvbdIwtCIMQp
-EOcKjvbdHDjvJajK
-EOcLKvbdZyEJnDMS
-DnbkKvbdrWpMDJZR
-EOcLKvbdbUagXjtI
-EOcLKvbdLGFgbBRV
-EOcKjvbdqvpMDIxq
-EPDKjvbdOAJSsjSA
-DncKjvbdsrqsYyeD
-DnbjjvbdtkwvaUBX
-DnbjjvbdGQASwGfZ
-EObkKvbdURROtuIN
-EObkKvbdiUydwRtb
-EOcLKvbdqlyixkhJ
-EPCkKvbduaEYroFI
-DoCkKvbdnUtyjiqf
-DoCkKvbdssSTYzFD
-DncLKvbdeATqMwjG
-DnbkKvbdqlyjYlHi
-DncLKvbdTAEhhCOd
-EOcLKvbdpxoIHQdY
-EPDKjvbdEXxLsstM
-DncLKvbdbLLfPNcA
-DoDLKvbdCWzdIeQW
-DnbjjvbdWSNwbElD
-DoDKjvbdGFjSOJUR
-DoCjjvbdmttzKjRf
-EPCjjvbdqmZjZMHi
-DncLKvbddwzUTqez
-EObkKvbdrEFIpOVa
-DnbjjvbduMYWaTaX
-EPDKjvbdTAEiIBoE
-EOcKjvbdVrNwaeMD
-DoCjjvbdSwkMNzjx
-DoDKjvbdZoNheEyj
-EObjjvbdFpASvgGZ
-DnbkKvbdvBDxsPEh
-DoDKjvbdIHGzYxYH
-EOcLKvbdhanbeXQq
-EObkKvbdACqxJyhp
-DoDLKvbdgQBzwDxI
-EObjjvbdOYOuzdNt
-DnbjjvbdRWmdDMHc
-EPCkKvbdePFTLUUS
-DnbkKvbdHlBznWpk
-EPCkKvbdqlyixlIJ
-DnbjjvbdIHHZyYXg
-EObjjvbdBcoaVimG
-EOcLKvbdZnnIddzK
-DnbjjvbdBiLBjhfK
-EPDLKvbdeOeTKtTr
-EObkKvbdYlRcsnLm
-DoDKjvbdnHExNOGy
-DoCkKvbdnCJwXoNu
-EOcKjvbdwWlBWBWV
-DnbjjvbdGYuVAdXb
-EObkKvbdLGGHbBQu
-EPCkKvbdEJgjVxKA
-EObkKvbdlqyVZrdJ
-EObkKvbdaNLBsUmH
-EPCkKvbdGQASwHGZ
-DncLKvbdnBjWwnnV
-DnbjjvbdUslsekuj
-DncLKvbdeATqNYJf
-EOcLKvbdIwtCHlQp
-EOcLKvbdGLErcIMu
-DnbkKvbdjvXOECXw
-EPCkKvbdfSAvzkbo
-DnbjjvbdsCGNMHKy
-DoDLKvbdURQnuVHm
-EObjjvbdQvmdCkgc
-EPCjjvbdSPsgKFcw
-EPDLKvbdYpmEhleR
-EPCjjvbdFjdsDHlu
-EPDLKvbdqdFIpOWB
-EObjjvbdnQZyVkZC
-EPCjjvbdQdCaQRES
-DnbjjvbdADRwiyiQ
-DnbjjvbdiiehKNYS
-DoCkKvbdHkaznWqL
-EObjjvbdmoyxujxb
-EOcLKvbdxxIibQZk
-EObjjvbdsPuoKCvG
-EObjjvbdjcMKpftg
-EOcKjvbdZisHofbG
-DncLKvbdUGznLwWF
-DoDLKvbdFfJqnJUR
-DnbjjvbdsBelkgLZ
-DoCkKvbdrbGNLfkZ
-DncKjvbdeYZssqez
-EPCkKvbdyNsHwsIc
-DnbkKvbdrafMkfjy
-EPCjjvbdZyEJnDMS
-DnbjjvbdFpASwGey
-DnbkKvbdLGGIBaQu
-DncLKvbddiiqutzn
-DncKjvbdWIXuwfxz
-DoCjjvbdNPxRVnHT
-DncKjvbdwygefXeS
-EPDLKvbdmJEUQtrB
-EPCjjvbdQwOECkhD
-DoDLKvbdNGbpMotk
-DncLKvbdRyjIScWA
-DncLKvbdVrOXaeMD
-DncLKvbdQmYBxnUz
-DnbjjvbdVBCRSqSZ
-EPCkKvbdRosfifEX
-EPDLKvbdlYrqrxgU
-EPDLKvbdKVuGDeHJ
-DncLKvbdDncLLWcE
-EOcLKvbdfNGXGmKL
-EOcLKvbdQvmdDMHc
-EOcLKvbdEARiMyvw
-DoCjjvbdnHFXlnGy
-EOcKjvbdhtyeXRtb
-DncKjvbdMgDQNQVL
-EObjjvbdpedFUWBI
-EPDKjvbdkHfkfFnL
-DoDKjvbdrXQMChyR
-EObkKvbdREDAoqES
-DoDKjvbdBdQAvKMf
-DoCkKvbdjvWnDaxX
-DnbkKvbdePEsKstS
-EPDKjvbdyOTHwsJD
-DnbkKvbdrSVKnKaN
-EPCkKvbdZirgpHBf
-DoCkKvbdsQVnjDVf
-DnbjjvbdGLEsCgmV
-EPDLKvbdelewHMjL
-EObjjvbdjlbMZeGo
-DoDLKvbdxrmhlrCH
-DoCkKvbdczZQXyQb
-EObjjvbdRDcBQRDr
-DoCjjvbdxLXEHzyf
-DoCkKvbdkySrTZGt
-DoCjjvbdDoDKjwCd
-EObkKvbdKWVGEEfi
-DoDKjvbdTqQoUuIN
-EObjjvbdZRNEiMeR
-DoDKjvbdxUmEpyMO
-EPDLKvbdxxJJaozL
-EObkKvbdraemLfkZ
-EPCjjvbdbiNKLFvx
-DnbjjvbdZjSgpHCG
-EObjjvbdqBIeAXHd
-EObjjvbdVUNUGMWK
-EPDKjvbdliDsqUqa
-EOcLKvbdxZgfGYFS
-DnbjjvbdYpmFJMdq
-EPCkKvbdcTCjtEKB
-DncLKvbdVUMtFlVj
-EPDKjvbdcIlijevx
-DoCjjvbdpstHSSKt
-EOcKjvbdLAjgMaxR
-DoDKjvbdHkaznXQk
-EPDLKvbdrovPJcVf
-EObjjvbdjblLRHVH
-EPCkKvbdfSAvzlCo
-EPDLKvbdkHfkefOL
-DoCjjvbdbiNKKfXY
-EPDLKvbdjJfHilwr
-EOcKjvbdxVMeQxkn
-DncKjvbdqlzJyMIJ
-DoDLKvbdffMZnGgA
-EPDLKvbdrpWPJcVf
-DnbkKvbdNsTvGeVQ
-DncKjvbdZshiZETO
-DoCjjvbdWRnXaeLc
-EPDLKvbdUaCRTQqy
-EOcKjvbdKDKDQjCx
-EPCkKvbdLKaIWAJy
-DoDKjvbdjblKpftg
-EPDKjvbdfHkWSNqH
-EObjjvbdSCEEkiZL
-EPDKjvbdcyxpYZQb
-EPDLKvbdVUMtFkuj
-DnbjjvbdVBCQrprZ
-EObjjvbddoEsLUUS
-DnbkKvbdiHKDZVjV
-EOcKjvbdpyPHgRDx
-EObjjvbdYpleJNFR
-DncLKvbdrDdhpOWB
-DncLKvbdcbSmSAUN
-DncLKvbdQwODcLgc
-EPCjjvbdKVuFcdgJ
-EPDLKvbdJvUecdfi
-EObkKvbddjJqvUzn
-EPCkKvbdLrXNZuQz
-DnbkKvbdDihJuxKA
-DoCjjvbdegkWSORH
-DncKjvbdFyVUaEYC
-DoDLKvbdNHDPlpVL
-DoDLKvbddneTKtUS
-DoCjjvbdEARhlywX
-DncKjvbdmbJwYPOV
-DnbjjvbddeOrBvbj
-EPDKjvbdAMhZTXZx
-DnbjjvbdULuoBVoJ
-DoCkKvbdMfbomQVL
-EObjjvbdyTNhlqbH
-EPDLKvbdcyxowxpb
-DoCkKvbdEPDLLXCd
-DncLKvbdSCEFLiZL
-DnbjjvbdBiLCKiFj
-EPCjjvbdmgExNNgZ
-EOcLKvbdsPvPKDVf
-DoCkKvbdbKkfOmcA
-DncLKvbdIxTaglRQ
-DnbkKvbdFVyQQNJe
-EPDLKvbdbsCjtEKB
-EPDKjvbdakMFnnDA
-EObjjvbdWWiYVcdg
-DnbkKvbdfSAvzkcP
-EOcLKvbdbKkennDA
-EPCjjvbdTppoVUhN
-EPDLKvbdemGWgMjL
-DnbjjvbdJvUedFHJ
-DoDLKvbdqvokbiZR
-EPCjjvbdZMRctOMN
-DoCjjvbdNPwpunGs
-DoCkKvbdZtJIyDrn
-EPCjjvbdFejRnIsq
-EPDLKvbdZshhxdTO
-DncLKvbdxZhGGXeS
-DoDLKvbdKyRKSztf
-EPDKjvbdCflFgAzc
-EPDKjvbdOEdThiKd
-DoDLKvbdTAFIgaoE
-EObjjvbdEARiNZvw
-EOcLKvbdjhHLefOL
-DncKjvbdbVCHXjtI
-EPDKjvbdeFPRawCj
-DoDLKvbdtcCuWuoP
-DoDLKvbdUVkpJtAq
-EPCjjvbdaSFcHsfL
-EPDKjvbdPxmAGrrK
-EPCkKvbdDjHjWXjA
-DnbkKvbdpssfqrKt
-DoDKjvbdePEsKtTr
-EObkKvbdDwxMUTtM
-DnbkKvbdZRMdiNEq
-EPCjjvbdhuZdvquC
-DoCjjvbdGLEsChMu
-EPDKjvbdRDbaQQdS
-EOcKjvbdEJhJvYKA
-DncKjvbdkxsSSxft
-EObjjvbdKRZdnfOF
-EOcLKvbdZQmFIleR
-DnbkKvbdjcLjpfuH
-DnbkKvbdYzbfSKWZ
-EPDLKvbdbUafxLTh
-EPCjjvbdJuuFcdgJ
-DoCkKvbdJcKCqJcY
-DoCjjvbdSKyGVGkT
-DoCjjvbdemFvflik
-DoCjjvbdvBEYsPEh
-EOcKjvbdCWzdJEov
-DncLKvbdqTsgSSKt
-DnbkKvbdUMVoBWOi
-EPCkKvbdOEcsiIjd
-DncLKvbdaSFbhUFk
-DoCkKvbdhtzEwRuC
-DoCkKvbdiCOcEvqR
-DoCkKvbdfILVqnRH
-DnbkKvbdCJLCKhej
-EPCkKvbdakLeoODA
-DnbkKvbdUaCRTQrZ
-DoDKjvbdRacdkhyL
-EPCjjvbdYNqAXtut
-DncKjvbdwzHfFwdr
-DncLKvbdNrsvGeUp
-EPDKjvbdDoCkKvbd
-EPCjjvbdrafNLfkZ
-EObjjvbdmajXXoOV
-DncLKvbdVAbRTQrZ
-EObkKvbdkySrTZHU
-DoDKjvbdZeXfzghb
-EPDLKvbdiCOcFWpq
-EOcKjvbdUQpnuUhN
-DncLKvbdijGIKMwr
-DncKjvbdHgHZxwwg
-DncLKvbdVTmUFlWK
-DoDKjvbdeYZtUSFz
-EPDKjvbdHffyyYXg
-DncKjvbdXsLaMtOx
-DncKjvbdzitoocrt
-DoDKjvbdhtyeWquC
-EPDKjvbdEuyPpNKF
-DnbkKvbdtvOYKRTA
-DncKjvbdZnnJFEzK
-EPCkKvbdqZPIGpcx
-DnbkKvbdVgxWYGxz
-EPCjjvbdOStWHEuQ
-EObkKvbdNddTiIjd
-DoDKjvbdwXMBWAuu
-EPDLKvbdsPvPKDVf
-DncLKvbdQvnDbkhD
-DncKjvbdEKHjWYKA
-EPCkKvbdCgMFgAzc
-EOcLKvbdQvnDbkgc
-EPCjjvbdDoCkLWbd
-DnbkKvbdKCibpicY
-EOcLKvbdhfibyViu
-EOcLKvbdzQnliJwA
-DncKjvbdEASImZwX
-EPDLKvbdFkFTChNV
-DnbjjvbdEuxoomKF
-EOcKjvbdYqMeJMeR
-DnbjjvbdgQBzvdYI
-DoCjjvbdkxrrSxft
-DnbjjvbdjuwNdCYX
-EOcLKvbdfpBzwEXh
-DoCkKvbdnHFYMmgZ
-EOcKjvbdjlbMZeHP
-DoCkKvbdmttzKjSG
-EPDLKvbdzjUopDsU
-EPDLKvbdsZlPraIO
-EOcLKvbdLBLHMbYR
-EPDLKvbdtbcVXVno
-DoDLKvbdaaVeGQQX
-EPCjjvbdWSOYCEkc
-EObjjvbdxUmFQyMO
-DoDLKvbdRbDdkiZL
-DoCjjvbdhlFDnVCy
-EPDKjvbdcTDKscia
-EPCkKvbdjlbMZeGo
-DncLKvbdCIkCKiGK
-DoCjjvbdrbFmMGkZ
-EObkKvbdQccAoqDr
-DnbjjvbdTqRPVUgm
-EPCkKvbdNrsufeUp
-EOcLKvbdrMyjZLhJ
-EPDLKvbdiifHimXr
-DnbkKvbdpstHSRjt
-EOcKjvbdZtIhxdSn
-DnbkKvbdbhmKLGXY
-DnbkKvbdkxsSSxft
-DoCjjvbdTAFIhBnd
-EObkKvbdUtMtGLvK
-EPCjjvbdpstGrSLU
-DncKjvbdxLXDgzyf
-EOcKjvbdSCDdlIxk
-EObkKvbdOFEUIiLE
-DnbkKvbdjggLefNk
-DncKjvbdliEUQtqa
-EOcLKvbdFjdsDHlu
-DncLKvbdeEnqavcK
-EOcLKvbdnPyyVjyC
-DoDKjvbdliDsptrB
-DoCkKvbdrXQLbiZR
-DncLKvbdFkErbhNV
-DoDKjvbdTqROtthN
-DoCkKvbdYSlAmUOx
-DnbkKvbdKVuGDdgJ
-EOcKjvbdvwLaWAvV
-DoDLKvbdEObjjvbd
-DnbkKvbdwXLaWBVu
-DnbkKvbdmtuZjiqf
-DoDKjvbdegkWRnRH
-DoCkKvbdeXzUUSFz
-DncLKvbdfNGXGmJk
-DoCjjvbdEztQdlCi
-EPCkKvbdEuyQPljF
-EPCjjvbdrEEiQNvB
-DnbkKvbdLqwNZtpz
-EObkKvbdKeegbBQu
-EObkKvbdvBEZSoFI
-DoDLKvbdrXQLbhyR
-DnbkKvbdbKlGPODA
-DncLKvbdnCKXYOnV
-EOcKjvbdjcMKpfuH
-DoCkKvbdQdCaQRES
-EPCkKvbdDncKjwCd
-DoDLKvbdYlSDtNkm
-EObkKvbdmbKXXnmu
-EPCkKvbdjgfkfGOL
-DnbkKvbdZyDjNcMS
-EOcLKvbdkNCLyeHP
-DncLKvbdVUMtGLuj
-EOcKjvbdKVtedFGi
-EPCjjvbdKRZeOenF
-DoCjjvbdUQqPUthN
-EPDKjvbdkMbLydgP
-EObjjvbdVqmxBdlD
-EPDKjvbdjAQGaPgK
-DoCkKvbdTlVnaWPJ
-EPCjjvbdwjvdHzzG
-EObjjvbdBsBCtGWr
-EPCjjvbdwuNEqZMO
-DncLKvbdbrcKtEKB
-EPCkKvbdFyVVAcxC
-EPCkKvbdaSGCgsfL
-EPDKjvbdrylQTBIO
-DncKjvbdfSBWzlCo
-EObjjvbdfRaWzlCo
-DnbkKvbdsPvOjDWG
-EPCjjvbdcbSlrAUN
-EObkKvbdrWpLbhxq
-EPCjjvbdhgKDZVjV
-EOcKjvbdhlFDnUby
-DoCkKvbdddoSBvcK
-DoCkKvbdpssfrRkU
-DoDLKvbdJutfEFGi
-EObkKvbdEPDKkWcE
-EOcKjvbdcJNJjevx
-EPCjjvbdcTDKscia
-DncKjvbdYlRcsmlN
-EPDLKvbdkHgMFfNk
-DoCkKvbdjbkjqGuH
-EPDKjvbdTvMPjUAq
-DnbkKvbdQYmAGsRj
-EPCkKvbdKeegbApu
-EPDKjvbdiLdcmtcZ
-DoCkKvbdNeDshhjd
-EOcLKvbdxnShXsIc
-EPDLKvbdyOShXrhc
-EObkKvbdbPgHELzd
-DoCjjvbdDoCkKwDE
-EOcLKvbdmbJvxPOV
-DnbjjvbdkNBlZeHP
-DnbkKvbdRXNdDMID
-DncLKvbdXnRAYUvU
-EObkKvbdBcpAuilf
-EPDKjvbdSLYeuGkT
-DoCjjvbdRaceLiYk
-DncLKvbdZoNiFEzK
-EOcLKvbdGLEsDIMu
-DnbjjvbdnUuZkJqf
-DoCkKvbdlqyUyrci
-DoCkKvbdLGGHaaRV
-DnbkKvbdmoyyWLYb
-DncKjvbdMpYRWOGs
-DnbjjvbdkyTRsYft
-EObkKvbdjKFhJmXr
-DnbjjvbdxLWcgzzG
-DoCkKvbdxnShXrhc
-DnbjjvbdRbEEkiZL
-EOcLKvbdWWiXudEg
-DoDLKvbdDjIKVxKA
-DoDKjvbdgFkzNgHA
-EPDLKvbdvvlAuaVu
-EPDLKvbdauBfwkTh
-DncLKvbdmIctQtrB
-EPDKjvbdCDpBWJmG
-DoDKjvbdvAcxsPEh
-EOcKjvbdrJAKFNOe
-EOcLKvbdbsDKscia
-DncLKvbdAMhYsWzY
-DncKjvbdddnrCXDK
-EOcLKvbdkHflGGOL
-DoDKjvbdbUafxKsh
-DnbkKvbdNdctIiLE
-EOcLKvbdvBDyTPEh
-DoCjjvbdFejSOJUR
-DnbkKvbdUQpntuHm
-EObjjvbdTpqOttgm
-DoDLKvbdddoSCXCj
-DncLKvbdbVCHXkUI
-EPCjjvbdKNAEZgVB
-EPDKjvbdFjdsDIMu
-DnbjjvbdpaIeAXHd
-EOcLKvbdrDdhpOWB
-EPDKjvbdIxUBhLpp
-EPDKjvbdhkddOVCy
-EPCkKvbdTkuoAuni
-EPDLKvbdnPyxujxb
-EObjjvbdfSBWzlCo
-EPDKjvbdMuSrKmAX
-EPDLKvbdmozYvKyC
-DnbkKvbdZirhPfaf
-EPCjjvbdNQXqWOHT
-DncKjvbdZsiIyESn
-DnbkKvbdURQnuUgm
-DoCjjvbdkIHMFfOL
-EPDKjvbdKfGHaaRV
-DncLKvbdtcDUwVoP
-EOcLKvbdxrnImRbH
-EPDLKvbdozmdLYPA
-DoDKjvbdUVkojUBR
-DnbjjvbdqUUHRrLU
-DoDLKvbdEARhmZvw
-EOcLKvbdZHWdAOri
-DoCjjvbdVUMtGLuj
-EOcLKvbdmfeYNNfy
-EPDKjvbdZirgogCG
-DnbjjvbdEJhKVwjA
-DnbkKvbdkVvmdBxX
-DnbjjvbdvBEYsOeI
-EPCkKvbdDoCjjwDE
-DoCjjvbdRXNdClID
-EPDKjvbdkxrrTZGt
-EOcLKvbdZdxGzhJC
-DoDLKvbdxnSgxSiD
-DoDKjvbdIryAsMxM
-DnbkKvbdTYKlNzjx
-DncLKvbdIGfzZYXg
-DncLKvbdQvnEClHc
-DnbkKvbdqUTfrRkU
-DoDKjvbdRDcAopdS
-DoDKjvbdTfznMXWF
-EOcLKvbdauCHYKtI
-EObkKvbdNrsvHEtp
-DoDLKvbdDihJvXjA
-DnbjjvbdliDtRVRa
-DncKjvbdgFlZmfgA
-DncLKvbdmJDsptqa
-DncKjvbdfoazvdXh
-EOcKjvbdJXtBgkpp
-EPCkKvbdqUUGrSKt
-EPDKjvbdrMzJyLgi
-EPCjjvbdiGjDYuiu
-EOcLKvbdkWXNcaww
-EOcLKvbdxxIjBoyk
-DnbkKvbdePErjssr
-DnbjjvbdIryArmYM
-EOcLKvbdRMwayNtz
-EOcLKvbdRkZGUgKs
-DoDKjvbdZLrEUOMN
-DnbkKvbdDHMFgAzc
-DnbkKvbdwXMBVaVu
-DnbjjvbddeOrCXDK
-EPDLKvbdwuMeQyLn
-EPCjjvbdBhjbLIej
-EPDKjvbdaNLCSuMg
-EPCjjvbdBhkCKhej
-EPCkKvbdptUGrSKt
-EObkKvbdVTmTfLvK
-DoCkKvbdDoDKkXDE
-DnbjjvbdfoazvdYI
-DnbkKvbdatbHYKtI
-DnbkKvbdVUMtGLuj
-EPDKjvbdeEoRavbj
-DoCkKvbdJpzFPGNe
-DnbjjvbdNHDQNQUk
-DncKjvbdYNqAXuWU
-EPCkKvbdZnnIddzK
-EObkKvbdYlRdTnMN
-EPDKjvbdEzspdkcJ
-DoDLKvbdCIkBjhfK
-EObjjvbdTkuoAvOi
-DoCkKvbdhkdcnUby
-EPCjjvbdHfgZyYXg
-DncLKvbdbsCkTdKB
-DoCjjvbdLqwMzVQz
-DoDLKvbdRkYfUgLT
-EOcLKvbdbQHHELzd
-EPCkKvbdbVCGxLTh
-EObjjvbdmSYuZsEJ
-DoDKjvbdssRsYyeD
-EPDKjvbdLrWlytpz
-DncKjvbdJTZBSlxM
-DnbkKvbdxrnJMrBg
-EPCjjvbdxZgfFxFS
-EObkKvbdUQpnuVIN
-EObkKvbdzjUpQESt
-EObjjvbduaDxsPFI
-DoDLKvbdkyTRsYft
-DoDKjvbdyTOImRbH
-EObkKvbdegkWRnQg
-DoCjjvbdaSFbgsek
-DoDKjvbdrylPsAhO
-DoCjjvbdgGMZnGgA
-EPCkKvbdlqyUzSdJ
-DncKjvbdwNWAMdFN
-EPDKjvbdTlWPAuoJ
-EOcLKvbdUMWPAuoJ
-DnbjjvbddZxowxqC
-EPCkKvbdEuyQPlie
-DoDKjvbdVAaqSqSZ
-EPDLKvbdwtldpxlO
-EOcLKvbdrRtkNkBN
-DncKjvbdJqZeOenF
-DncKjvbdfHkWSNqH
-DoCkKvbdnUuZjirG
-EOcKjvbdsCFmMGkZ
-DoDLKvbdwzIFfYEr
-EOcLKvbdqqtjmjaN
-DoCjjvbdrbGNLgKy
-EPDKjvbdNHComQUk
-DnbkKvbdIMBznWqL
-EPCjjvbdEKHivXjA
-EPDLKvbdVhYWYGxz
-EPDLKvbdZxcjNblS
-DnbjjvbdJpzEoFme
-EPDKjvbderBWzkcP
-DoDLKvbdpssgRrKt
-EObkKvbdtbbtvuoP
-EOcLKvbdqGDeUWAh
-DoDKjvbdlZSrTYft
-EOcKjvbdFfKRmhtR
-DnbkKvbdNPxRVnGs
-EPDLKvbdZshhxcsO
-EPCjjvbdMoxQvNgT
-EPCjjvbdKaKfmBxR
-EPDLKvbdSwjkmzjx
-DoCkKvbdjbkkRGtg
-DoDKjvbdfoazwDxI
-DoDKjvbdqwQLbhxq
-EPCkKvbdZtIhyETO
-DncLKvbdmpZxukYb
-EOcKjvbdMoxQumgT
-DoCjjvbdLYqJrzuG
-EObjjvbdnGeXlmfy
-EPDLKvbdyzeOSHhh
-EOcLKvbdiZuGMQmf
-EPCkKvbdWSNwadkc
-DncKjvbdhfibyVjV
-EOcKjvbdQmXbZOUz
-DoCjjvbdSKxeuGkT
-DnbjjvbdbrbkUDjB
-EPDLKvbdJcKCqJbx
-DnbjjvbdjSziTLJz
-EOcKjvbdZxdKNcMS
-DoCkKvbdelfWfmJk
-DoCjjvbdFjeScHlu
-EPDLKvbdnCJvwnnV
-EPDKjvbdNrsufduQ
-DnbkKvbdjcLjqGuH
-EObjjvbdmbKXYOnV
-DoCjjvbdRacdkiYk
-EObkKvbdaaVdfQQX
-DoCkKvbdJpydnfOF
-DoCkKvbduCbtwVoP
-DoDKjvbdpxnhHRDx
-EOcKjvbdmJEUQtqa
-EPDLKvbdRkZGVGjs
-EPDKjvbdEObjkXCd
-EObjjvbdCTAbtGWr
-DoCkKvbdqTsfrSKt
-DncLKvbdaMkBsUmH
-DncLKvbdqlyixlIJ
-EPCkKvbdvwMAuaVu
-DncKjvbdiUzEwRuC
-DoDKjvbdiUzFWrVC
-DnbkKvbdkDMKpfuH
-EObkKvbdZnnJFEzK
-EObkKvbdWWhwudEg
-DoCjjvbdypoNIiwA
-DoCjjvbdShyiqABM
-DnbjjvbdOFEThhkE
-DnbjjvbdRXNcbkgc
-DoCkKvbdqUTfrSKt
-EPDLKvbdfNGWgMjL
-EPDLKvbdGFirOJUR
-EOcKjvbdSCEFMJYk
-EOcKjvbdmpZxukYb
-EPDLKvbdrafNLgKy
-DnbkKvbdmJDsqUrB
-DnbjjvbdjKFgimXr
-EOcLKvbdVYgtZjoO
-EObkKvbdTvMPjUBR
-EOcLKvbdSxKkmzjx
-DoDKjvbdnPzYvKxb
-EPCjjvbdaRfDITek
-EObkKvbdjKGIJmXr
-DoCjjvbdliEURVSB
-EObkKvbdFaOqYizm
-EOcLKvbdqGEEsuaI
-DoCjjvbdZQleJNEq
-DoCjjvbdbKlFnnDA
-DnbjjvbdWIXuwfxz
-EPDLKvbdNGcPmPuL
-DoCjjvbdBsBDTevr
-DnbkKvbdczYoxYpb
-EObjjvbdJutedEfi
-DncLKvbdGFirNhsq
-EPDKjvbdUaCQrqRy
-EPCjjvbdQwNdDMID
-EPDLKvbdtSrSyZeD
-DnbkKvbdNHDQMpUk
-DoDKjvbdZirgofaf
-EObkKvbdrpWOibuf
-DoCkKvbdwygfFxEr
-EPCjjvbdSwjlNzjx
-DnbkKvbdjKGHjMxS
-DncLKvbdijFhKNXr
-EOcKjvbdddoRavbj
-EPDLKvbdmIdTpuSB
-DncLKvbdiiehJmYS
-EObkKvbdjcLkQgUg
-DoDKjvbdsQVoJbuf
-EObjjvbdhzUfMQmf
-DnbkKvbdcImKKfWx
-EObkKvbdbQHHELzd
-DnbjjvbdWWiXuceH
-EPDKjvbdjJegjNXr
-EPCjjvbdZyEKNblS
-DoDKjvbdLqvlzVQz
-EPDLKvbdZRNEhmFR
-DnbkKvbdGcjuibJj
-EOcLKvbdGAnpxizm
-EPCjjvbdkVvnDaww
-EOcKjvbdHffzZXwg
-DoCkKvbdKeehCAqV
-EPCjjvbdHEKuiajK
-EOcKjvbdUtMselWK
-EPDKjvbdEXwlTstM
-EPDKjvbdsrrSxzFD
-EOcKjvbdEztQeMDJ
-EPCkKvbddoFSjstS
-DoCkKvbdSCEElIyL
-DncKjvbdFVxpQNJe
-DnbjjvbdXmqAYUut
-DoCjjvbdiZtfLpmf
-DoDKjvbdwygeexEr
-EOcLKvbdiUyeXSUb
-DncKjvbdsZkoraIO
-EOcLKvbdACrYJyhp
-EOcLKvbdTlVoBVoJ
-EPCkKvbdqZPHfqDx
-DnbkKvbdmJDsptqa
-DncKjvbdhkeDnUcZ
-EPDKjvbdURQoUtgm
-EPDKjvbdjAQHAogK
-EObjjvbdCIkCKhfK
-EOcKjvbdYzbfRjWZ
-DnbkKvbdWRnYCEkc
-DncKjvbdyzeORgiI
-EObjjvbdEPCkLWbd
-DoDLKvbdNHComPuL
-DnbkKvbdaRebhUFk
-DnbkKvbdhlEcmtby
-EOcLKvbdliETqUrB
-EPDKjvbdIxTbHkqQ
-DncLKvbdCEPaVjNG
-EOcLKvbdIjEAJogE
-DoCkKvbdsZkpSaHn
-EPDLKvbdEXxLtTtM
-DncKjvbdwXMAvAuu
-EPDKjvbdakMGPODA
-EPCkKvbdauBfxKsh
-EOcKjvbdCJKakJFj
-EPCkKvbdyXhjBozL
-DoDLKvbdkWWnDbYX
-DncKjvbdEPCjkXDE
-DoDKjvbdlqxtzTDi
-EPCjjvbdyTOJNSBg
-DoCkKvbdnGeYMmgZ
-EPCkKvbdaSFbhUFk
-EObjjvbdnCKWxPNu
-DoCjjvbdrWpLbhyR
-EPDLKvbdmRxtyrci
-DnbjjvbdSBdElJZL
-DnbkKvbdrXQLbiYq
-DoDLKvbdWHwuwfxz
-DoCjjvbdZRNFJNEq
-DncKjvbdUVkpJsaR
-DoCjjvbdbiMijfXY
-EPDKjvbdVTmTekvK
-DoCjjvbdeXytTrFz
-DoDLKvbdyYJKCQZk
-DoDLKvbdczZQYZQb
-EObjjvbdRadFMJZL
-DncLKvbdkVvnECYX
-DncKjvbduaDySneI
-DnbjjvbdwuNFQyMO
-DncLKvbdsrqrxzEc
-DoDLKvbdcSbjtEKB
-EPCjjvbdZtJIyETO
-DoDLKvbdJvUfDdgJ
-DnbjjvbdhbPDFWqR
-DncKjvbdcyyQYYpb
-DoDKjvbdWSNwbFMD
-DoCjjvbdmajXXoNu
-EPCkKvbdxZgeexEr
-EOcKjvbdxsOIlrBg
-DoDKjvbdZyEJmbkr
-DncLKvbdTkunaVni
-EOcLKvbdUQpoUthN
-DoDLKvbdyNsHxTJD
-DncKjvbdEztRElCi
-DnbkKvbdXnRAYVVt
-DnbjjvbdqAheAWgd
-DnbkKvbdCJLBkIfK
-EPDKjvbdUGzmkwWF
-EPCkKvbdSiZiqABM
-EPDLKvbdidkGtoAO
-EOcLKvbdYlSDsnLm
-EPDKjvbdMSWmZtpz
-DoDKjvbdlhdURVRa
-EOcLKvbdOYOuzdOU
-DncLKvbdrafMlGkZ
-EObjjvbdrylPraHn
-DnbjjvbdDncLKwCd
-DoCkKvbdoznELXoA
-DoCkKvbdmttykJrG
-DoDLKvbdBvzciEov
-EPCjjvbdeXzUUSFz
-DoDKjvbdtunYKQsA
-EObjjvbdqceJQNvB
-EOcLKvbdqTtGqqkU
-DoCkKvbdiGjDYujV
-EPCkKvbdRWnEDLhD
-EOcLKvbdcSbjtDia
-DncLKvbdTqROuVHm
-EOcKjvbdiifIKMxS
-EObkKvbdlYrqsZGt
-DoDKjvbdSBdFLhxk
-DnbkKvbdVUNUFkuj
-DoCjjvbdrzLpSaIO
-DoDKjvbdzGxlANFX
-DoDLKvbdfHjuqmpg
-EPDKjvbdZRMeIldq
-DncKjvbdMfcPlpVL
-DncKjvbdxKwDgzzG
-EOcLKvbdYzbfRjVy
-EObkKvbdWSNwbElD
-DoCkKvbdeFOrCXCj
-EObjjvbdbKlGOmcA
-EOcKjvbdDxXktUTl
-EPCjjvbdvBDySneI
-EPDKjvbdLFehCBRV
-DoDLKvbdiZuFlROG
-EPDKjvbdDoDLKvbd
-DoCjjvbdQwNdCkhD
-DoCjjvbdCJLBkIfK
-DnbjjvbdlqyUzSci
-DncLKvbdNHCpMpUk
-EOcKjvbdiMFEOVCy
-DoCkKvbdnGeYNOGy
-DnbkKvbdZoOIddzK
-EOcKjvbdFpATWffZ
-DoDKjvbdeOeTKtTr
-DnbjjvbdGGKSNhsq
-EOcKjvbdyXiKCPyk
-DoCjjvbdeAURNYKG
-DoDKjvbdpssfrRjt
-EPDKjvbdnVVZjjRf
-EOcKjvbdiZuGMQmf
-EOcLKvbdNHDPlotk
-DnbjjvbduCbtwVoP
-EOcKjvbdxUleQxlO
-DoDKjvbdnHFYMnGy
-DnbjjvbdUVlPitAq
-EPCkKvbdjAPgAofj
-DoCkKvbdTlVoAuoJ
-EPCkKvbdmSYtyrdJ
-EPDKjvbdBsAcTevr
-EPCkKvbdUyITzKnn
-DnbjjvbdbQHGdLzd
-EOcLKvbdezuyFIsw
-DoDLKvbdEXwlTtUM
-EOcKjvbdKyRJrztf
-DnbjjvbdtTSSxzEc
-DnbjjvbdHDjujBij
-DoCjjvbdsQVnicWG
-EObkKvbdZsiJYcrn
-EPDLKvbdUtNUFkuj
-DoDKjvbdNPwpumfs
-EOcKjvbdSBcdlJZL
-EPDLKvbdmfeXlmfy
-DncKjvbdIsZAsNXl
-DncLKvbdmJDsptrB
-DncKjvbdGYuUaEXb
-DncLKvbdyYJJbPzL
-DnbkKvbdrpVnicWG
-EPCjjvbdTqQoVUgm
-DoDLKvbdFVyPpMjF
-EObkKvbdZnnIeEyj
-EObkKvbdbUagYKtI
-DoCkKvbdqGDdtWBI
-EPDLKvbdFVxpQNKF
-DncLKvbdkWXNdCYX
-EPDKjvbddwystRez
-EOcKjvbdaNKasUlg
-DnbkKvbdNdctIhjd
-EPCkKvbdatagYKsh
-DoCkKvbdfNFvgMik
-EObjjvbdJYTbIMQp
-DoCjjvbdEYYMTtTl
-DncKjvbdWRmxCElD
-EPCkKvbdbsCjsdKB
-EOcLKvbdFVxpQMie
-EObkKvbdpaJFAWgd
-EPDLKvbdijGHimXr
-EPCjjvbdlhctQtqa
-EObjjvbdFVxoolie
-DncKjvbdrJAKEmOe
-DnbkKvbdzQnmIiwA
-EPCkKvbdkHfkeemk
-DnbjjvbdLGGHaaQu
-DnbkKvbdOSsugEtp
-DnbkKvbdZtIiYcrn
-DoCjjvbdQZNAGsSK
-EObjjvbdNPxRWOGs
-DoCkKvbdVUMsfLuj
-DnbjjvbdmJETqUqa
-EPDLKvbdBsAcUFvr
-EOcLKvbdIsZArlwl
-EPCjjvbdNddTiJKd
-DoDKjvbdyXhiaozL
-DncLKvbdjmCLzEfo
-EOcLKvbdRadElJYk
-DncLKvbdjbkkQfuH
-EObkKvbdXFxzUAOs
-DncLKvbdxZhGFwdr
-DoCjjvbdNsTugEuQ
-EObjjvbdRbDdlIyL
-DoCkKvbdePEsLUUS
-DoCjjvbdOStVgFVQ
-EPDLKvbdUtMtGLuj
-EObjjvbdFjdrbhMu
-EOcKjvbddeOrBwCj
-DnbjjvbdxUmFRYkn
-DnbjjvbdCEQBVimG
-EOcLKvbdvAdZTPEh
-EPCkKvbdGcjvJaij
-EPCjjvbdOFETiIjd
-EOcLKvbdemGWgNKL
-DoCkKvbdqTsfrRkU
-DncLKvbdbrcKsdKB
-EPDLKvbdTAFIhBoE
-DoCjjvbdKCjCqJbx
-DnbjjvbdNsUWHFUp
-EPDKjvbdkWWmcaxX
-EPDLKvbdbKlFoNcA
-DoCjjvbdkIGkefNk
-EPCkKvbdXFyZtAPT
-EPDKjvbdpxnhGpcx
-DoDLKvbdhanbeWqR
-EOcKjvbdliEUQtqa
-EObjjvbdbBVeFpPw
-EObkKvbdQdDApQdS
-EPDLKvbdnQZyVkZC
-EObjjvbdhbOcEwQq
-DnbjjvbdBdPaWKMf
-DoCjjvbdCTAbtGWr
-EPCjjvbdEvYpQMie
-EObjjvbdDxYLtUTl
-EObkKvbdCTBDTfXS
-EPCjjvbdmpZxvKyC
-EPCkKvbdRzKITDWA
-EObkKvbdemGXGmJk
-EOcLKvbdIryAsNXl
-DoDKjvbdkWXNcaww
-EObkKvbddCTNSAUN
-DncKjvbdvBDxroEh
-DncLKvbdiCPDEwRR
-EObjjvbdRkZGVHLT
-DoCjjvbdFkFSbhNV
-EPDLKvbdwjvdHzzG
-DoDLKvbdqquKmkBN
-EOcKjvbdsQVoJcVf
-EPCjjvbdYlSEUOMN
-EObkKvbdjKGIKMxS
-DncLKvbdRpUGifDw
-EObkKvbdEuxooljF
-EPDLKvbdzitpQETU
-EOcKjvbdTvLpKUAq
-DoCjjvbdrSVKmkAm
-EOcLKvbdEvZQPmJe
-EPCkKvbdfelZnHHA
-EOcLKvbdjhGlGGNk
-DncKjvbdCEPaWJmG
-DncLKvbdrpVnjDWG
-DoDLKvbdeOeTKtUS
-DoCkKvbdtbbuXVno
-EObkKvbdYpleJMeR
-DnbjjvbdiCPDEvqR
-DoDLKvbdUslsekuj
-DnbkKvbdGBPQyJzm
-EPCkKvbdtbcUwVoP
-DoDKjvbddxZssrFz
-DncLKvbdkIGlGFmk
-EPCkKvbdhuZdwRtb
-EObkKvbdehLWSOQg
-DoCkKvbdatafwjsh
-DoDKjvbdhfjCyViu
-DoCjjvbdFyUuAcxC
-EObkKvbdUMWPAvPJ
-EPDLKvbdxxIjBoyk
-DnbjjvbdMRvlytpz
-EPCkKvbdDxYLtUTl
-DnbjjvbdiVZeXSUb
-DoCjjvbdffMZmgHA
-EPDLKvbdnPyyVkYb
-EPCkKvbdZtIhyETO
-DncKjvbdRECaPqDr
-EPDKjvbdVrNxBeMD
-DnbkKvbdKVuFdFGi
-EOcLKvbdrzLosAgn
-EPDKjvbdLLAgvAKZ
-EOcLKvbdLYpirztf
-DncKjvbdnGeXlnHZ
-EOcLKvbdQdDAopdS
-DnbkKvbdptTfrRkU
-DoCjjvbdqGEFUVaI
-DncLKvbdrDeIomvB
-DoDLKvbdyOTHxSiD
-EOcLKvbdRpTfjGDw
-DoDLKvbdzitpPdTU
-DnbjjvbdUxhTykOn
-EOcKjvbdGFjSNhtR
-EObkKvbdidkGuPAO
-EObjjvbdVAapsQrZ
-EPDLKvbdQccAopdS
-EObjjvbdmozYukZC
-EOcKjvbdGFjSOIsq
-EPCkKvbdyzeNrHiI
-DncLKvbdEOcKjvcE
-DncLKvbdLFfIBaQu
-DoDKjvbdtlXwBUBX
-DoCjjvbdeOeTLTsr
-DncKjvbdiZuGLpnG
-DoCkKvbdWRnYBdkc
-DncLKvbduCbtvvOo
-DnbkKvbdGGKRnIsq
-EOcLKvbdVTmUFkuj
-EOcKjvbdFkEsDHlu
-DoDKjvbdQwNcbkgc
-DncLKvbdWRmwbFLc
-DnbjjvbdHlBzmwRL
-EPDKjvbdDncKjwCd
-EObkKvbdGBPRYizm
-EOcKjvbdqrVLNjaN
-EObjjvbdqFceUVaI
-DoCkKvbdZQmFImFR
-EPDLKvbdmIctRVSB
-EObkKvbdjAQHBPfj
-EObjjvbdrEFIonWB
-DnbjjvbdsPuoKCuf
-DoDKjvbdtbbuXWPP
-EPDLKvbdOStWGduQ
-DoCkKvbdUQqPUuIN
-EPDLKvbdwyhFewdr
-EObkKvbdShyiqAAl
-EPDLKvbdGZUuBEXb
-EPCkKvbdHffyyXwg
-EObjjvbdGBOpyJzm
-EObkKvbdZirgpGaf
-EObkKvbdRjxfUfkT
-EPDKjvbdZHWdAPSi
-DnbjjvbdVrOYBdkc
-DoCjjvbdGGKSNhsq
-EOcKjvbdJqZeOenF
-EOcLKvbddBsNSAUN
-DncKjvbdZtJJYcsO
-EPDKjvbdBraDTevr
-DoCkKvbdRDcApQdS
-EObjjvbdGGJrNiTq
-DoCjjvbdGLFTCgmV
-DoCjjvbdtlXwBUAw
-DncLKvbdQwNdClHc
-DoDLKvbdygYlAMeX
-EPDLKvbdTvMQKTaR
-EPCjjvbdiMFDnVDZ
-DoCjjvbdiBoDFXRR
-EObkKvbdUQqOuUgm
-EOcKjvbdaMkBsVNH
-EObkKvbdwuNEqZMO
-EObjjvbdLAkGlbXq
-EObkKvbdkCkkQgUg
-DncLKvbdVqnYCFLc
-EPCkKvbdxVMeRZLn
-DncLKvbdRXOEClHc
-EObjjvbdvwMAvBWV
-EObjjvbdIwsahLpp
-EObjjvbdKDKCpicY
-DoDKjvbdlrZUzTEJ
-EOcLKvbdyYIjBpZk
-DncLKvbdxsNhlqag
-EPDKjvbdgPazvdXh
-EPDLKvbdbKlGPNcA
-DoCjjvbdqUUHSRjt
-DnbkKvbdNeDsiJKd
-DnbjjvbdqGEFTvAh
-DoDKjvbdnUtykKRf
-EPDKjvbdZtJJZDrn
-DoCjjvbdmRxtysEJ
-EOcKjvbdQmXbYnUz
-EPDKjvbdjmCLzFGo
-DncKjvbdsBfMkfkZ
-EPCkKvbdFVxpPlie
-DnbkKvbdZLrEUOMN
-DoCkKvbdEOcKkXDE
-EObkKvbdvBEYsPEh
-EPDKjvbdcJMjLGXY
-EOcLKvbdOYPVzcnU
-DnbkKvbdsQWOjDWG
-EOcLKvbdfHjvRnRH
-DoDLKvbdmbKXYPOV
-DncKjvbdrpWPJcVf
-EOcKjvbdURROuUgm
-DnbkKvbdrovOicWG
-EObjjvbdLYpirzuG
-DnbjjvbdGQASvgGZ
-DnbkKvbdYzcFqjVy
-DncKjvbdBsBCtFvr
-DoDLKvbdYgXEAOri
-EOcLKvbdqTsfqqjt
-DncKjvbdPIAYZAYa
-EOcLKvbdypnliJwA
-DnbkKvbdhyuGLqNf
-EOcLKvbdjhGkfGOL
-DncKjvbdjblLRGuH
-EPCjjvbdxwhibPyk
-EOcKjvbdBhkCLIfK
-DnbjjvbdJTZArlxM
-DoCkKvbdRjxetgKs
-EObkKvbdiUyeWrVC
-EOcKjvbdwXLaWAuu
-EPDLKvbdssSTZZdc
-EObkKvbdcSbjtDia
-DncKjvbdgGMZnHHA
-DoCkKvbdatafwkUI
-DncLKvbdnCKWxPNu
-EObjjvbdyOShXrhc
-EPCjjvbdpyPHfqEY
-DoDKjvbdbUbGxKsh
-EOcKjvbdypoNJKXA
-EObkKvbdyTOJMrBg
-DoDLKvbdiZtfLpmf
-EPCkKvbdLGFgbBQu
-EOcLKvbdCJLBkJFj
-DnbkKvbdUxgszLPO
-DoDKjvbdUQqPVVHm
-EPCjjvbdijGIKNYS
-EPDKjvbdCJKajhej
-EPDLKvbduoTzqLPU
-DnbjjvbdJTZBTMwl
-EOcLKvbdLAjfmBwq
-DoDLKvbdQwOECkhD
-DoCjjvbdQYmAHTSK
-DoDKjvbdEuyQQMjF
-DoDKjvbdZdwfzhIb
-EOcKjvbdyTOJNRag
-DoDLKvbdbBVdfQPw
-DoCkKvbdbVBfxLUI
-DncKjvbdcIljKevx
-EOcLKvbdhgKDZViu
-EObjjvbdOTUWHEtp
-DncKjvbdZRMeIldq
-DnbjjvbdkHgMGGNk
-EOcLKvbdZMSETmlN
-EPCkKvbdjcMKpfuH
-EPDLKvbdiBncFXQq
-EObjjvbdJcKCqKDY
-DoDKjvbdQwOEClID
-EPCkKvbdRpUHJecw
-DoDKjvbdZjSgogBf
-DoCkKvbdEObkKvbd
-DoDLKvbdDwwktUTl
-DoCkKvbdSKyGVHKs
-DnbkKvbdZMSETnMN
-DncLKvbdiZuGLpmf
-EObjjvbdjcLjpgVH
-EOcLKvbdYzcFqjVy
-EPCjjvbdQvnDcLhD
-DoCkKvbdDihJvYKA
-EPDLKvbdJqZeOenF
-EOcKjvbdWXJXvDdg
-DoCjjvbdznpQeCkx
-EPCjjvbdjJehJmXr
-DoDKjvbdmSYuZsDi
-DoDKjvbdFVyPolie
-DnbjjvbdULvPAvOi
-DncKjvbdwzIGFwdr
-DnbkKvbdOEcsiJKd
-EPCkKvbdEJhJuwjA
-EObkKvbdYSkaNUOx
-EObkKvbddoFSkTtS
-DoDLKvbdFkFTDHlu
-DoCjjvbddwzTtRez
-EOcLKvbdDwwlUTtM
-DoDKjvbdHDjvJaij
-EObkKvbdyTOIlrBg
-EOcLKvbdtSqsYzFD
-EObkKvbduVmwjQsA
-EPDKjvbdbiMjKfXY
-DncLKvbdsQWPKDWG
-DncLKvbdRbEElIyL
-DnbjjvbdGKeTDHlu
-EPCkKvbdrpWOjDWG
-EObjjvbdVwJYWEFH
-EPCjjvbdvBDySoFI
-EPCkKvbdZMSDsmkm
-EObkKvbdqYnhHREY
-EObjjvbdyqPMiJwA
-DncLKvbdCTBCtGXS
-EPCkKvbdfekynGgA
-EPCkKvbdvvkaWBVu
-DoCjjvbdGZUuAdYC
-DoDKjvbdpyOgfqDx
-EPCjjvbdePFTKstS
-EOcLKvbdVviXudFH
-EPCkKvbddZyQYZQb
-DnbkKvbdUaCQrqRy
-EPDLKvbdQwNdDMID
-DncKjvbdUaCRTQrZ
-DnbjjvbdHDkWJbKK
-EOcKjvbdOTTvGduQ
-DnbjjvbdssRrxzEc
-EObjjvbdezuxdiTw
-EOcLKvbdGLFTCgmV
-EPDLKvbdUxgtZkOn
-EOcLKvbdbrbjscia
-DnbjjvbdjJfHimXr
-EOcKjvbdjcMLQgUg
-DoDKjvbdlYrqrxft
-EPDKjvbdGYttaEXb
-EOcLKvbdhbPDEwQq
-EOcKjvbdvAcxroEh
-DoDKjvbdVgxVxHYz
-DoCkKvbdTqQnuVIN
-DoCjjvbdrXQMCiZR
-EOcKjvbdMSWlytpz
-DoCjjvbdBiLCLJFj
-EObkKvbdUyHtZkPO
-DoDLKvbdGcjujCJj
-EPCjjvbdfkGzbfAE
-DoCjjvbdDoCjjwDE
-DnbkKvbdqGDdsvAh
-DoDLKvbdjvXNdBww
-EOcKjvbdANHySvyx
-DoCjjvbdeJjRvUzn
-DncKjvbdqUTgRqkU
-DncLKvbdEvZQPljF
-DnbjjvbdSPsgKFdX
-EOcKjvbdGLFScHmV
-EPCjjvbdqUTgRqkU
-EPCkKvbdNxOuzdOU
-DoCkKvbdpfEEtWBI
-EOcLKvbdDwwlTtTl
-EPCjjvbdSZjITDWA
-DncKjvbdQwNcblID
-DnbjjvbdijGIKMwr
-DnbjjvbdYpldiMdq
-DncLKvbdemGXHNKL
-EPCkKvbdEKHjWYKA
-DoDLKvbdwXMBWAvV
-DnbjjvbdQwOEClHc
-DnbkKvbdbUbHYKtI
-DncLKvbdCSaCtFvr
-DncLKvbdEuyPpNJe
-EPDKjvbdFVyPolie
-DncKjvbddneSkTtS
-EOcKjvbdZtJIxcsO
-EOcKjvbdiGicZWJu
-DncLKvbdOFDtIiLE
-DoDLKvbdOSsufduQ
-DnbkKvbdMfcPmQVL
-EObjjvbdiUzEwSVC
-DoCkKvbdCIkBkJFj
-DncLKvbdYkrETmlN
-EObjjvbdqZOggREY
-EPCkKvbdHDkViajK
-DnbkKvbdbsDLTdKB
-EPDLKvbdlqxtzTDi
-DncKjvbdLGFgbAqV
-EObjjvbdoAKztHcn
-EPDLKvbdRXODblID
-DoCjjvbdIHGzYwxH
-EObkKvbdNPwqVnHT
-EOcKjvbdxrnImRag
-EOcLKvbdiLddNuCy
-DoCkKvbdkMakzEfo
-EObkKvbdnPyxukYb
-EPCjjvbdZdwfzgiC
-EPCkKvbdnHEwmNfy
-EObjjvbdySmiNRag
-EOcKjvbdzeZnzdyp
-EPCjjvbdJvVFdEgJ
-EOcKjvbdZQldiMeR
-EOcKjvbdFyVVAdYC
-DncKjvbdJXsahMRQ
-DnbjjvbdfNGXGljL
-EOcLKvbdwWlAvAvV
-DncLKvbdkIHLefNk
-DncLKvbdliDtQtrB
-DoCkKvbdxZgefXdr
-DncKjvbdCWzchdpW
-EPCkKvbdpyPHfpdY
-EOcKjvbdhbOcFWqR
-DnbjjvbdzjUpPdSt
-DoDLKvbdZMRdUOLm
-DncLKvbdVwJXucdg
-EPCjjvbdWXIxVcdg
-DnbkKvbdMpXpvOHT
-DncLKvbdRkZGVHKs
-DoDKjvbdmpZyWKxb
-DoCjjvbdegkWRmpg
-DncLKvbdyzeOSHhh
-EPDLKvbdRECaPpdS
-EPDKjvbdqvpLcJZR
-DoCjjvbdRDbaPqDr
-EObjjvbdRECaPqDr
-EOcLKvbdsBfNLgLZ
-DncKjvbdZyEKOCkr
-DnbkKvbdSPsgJfEX
-EPDKjvbdZRMdiMeR
-EPDLKvbdDwwktTsl
-EPDLKvbdLhbLpxAS
-EPDKjvbdZirgpHBf
-DoCkKvbdmtuZkJqf
-DnbjjvbdwWkaWAuu
-DnbjjvbdRDcBPqES
-DnbkKvbdyzeNqgiI
-EObjjvbdYkrEUOLm
-DoCkKvbdmtuZkKRf
-DoCkKvbdNdctIhkE
-DnbjjvbdhytfLqOG
-EOcLKvbddZyPwxpb
-EPCjjvbdYzbeqivZ
-EOcKjvbdwygfGXeS
-EOcLKvbdRosfifEX
-EPCkKvbdznopdbkx
-EObkKvbdVBBqSqSZ
-EObjjvbdQlxCZNtz
-EPCkKvbdhlFDmtby
-DoDLKvbdCDpAvJmG
-EPDKjvbddeOrCXDK
-EOcLKvbdrovOjDWG
-DnbkKvbdIGfyyYYH
-EObkKvbdmbKWwnmu
-EOcLKvbdkDLjqGuH
-EPDLKvbdqrUkNjaN
-EPDKjvbduDDVXWPP
-EObjjvbdZnnJFEzK
-DnbjjvbdaRfCgtGL
-DoCkKvbdGKdsDHlu
-DncKjvbdqlyiyMHi
-DoDLKvbdSLYetgLT
-DnbkKvbdZQleJNEq
-EOcLKvbdZLrETnMN
-DnbjjvbdiUydwRuC
-EObjjvbdnPzYvLYb
-EPCjjvbdGYuUaEYC
-EObjjvbdACqwiyiQ
-DncKjvbdIHGzZYXg
-DncKjvbdxrnIlqag
-DnbjjvbdySmhlqag
-DoCjjvbdSCEFMJZL
-EObjjvbdSKxfUfjs
-DnbjjvbdnUtyjjRf
-DncLKvbdkyTRsZGt
-DoDLKvbdWRnXbElD
-EOcKjvbdjvXNcbYX
-EOcKjvbddjKSWUzn
-DoDKjvbdvBDxrneI
-EOcLKvbddndsKtTr
-DoDLKvbdZjTHpGbG
-DnbkKvbdpfDdsuaI
-EPCkKvbdfMfWgNJk
-DoCkKvbdjJegjNXr
-DoDKjvbdcTDLTdKB
-EPDLKvbdwzHfFxEr
-DncKjvbdfMfWgMik
-DnbkKvbdrbFllGkZ
-EPCkKvbdCIkCLJGK
-EObjjvbduDDUvvOo
-EOcKjvbdDxYMUTsl
-EOcLKvbdsPvOibuf
-DncKjvbdUsltGLvK
-EPCjjvbdyOShYTIc
-DoDKjvbduaEZSoEh
-DncKjvbdLrXMzUpz
-DoCkKvbdNsTufeUp
-EObkKvbdLGGIBaQu
-EPCjjvbdmSZVZsEJ
-DncLKvbdQdDAoqDr
-DoCkKvbdKCicRJbx
-EPCkKvbdxwhibQZk
-DoDKjvbdTvMQJsaR
-DoCkKvbdYzcGSJuy
-DnbkKvbdwyhGFwdr
-DoCjjvbdEOcLKwDE
-DoCkKvbdGGKRmhtR
-EOcLKvbdrzMQTAgn
-DoDLKvbdJvVFceHJ
-DnbkKvbdfMfWfmJk
-EPCkKvbdmajWwnmu
-EPCjjvbdxrmiMqag
-EOcKjvbdqUTfqqkU
-EObkKvbdoAKztHcn
-EObkKvbdkyTSTZHU
-EPCjjvbdiCOcEwRR
-DnbkKvbdGZUtaDwb
-EPCjjvbdYORAXuWU
-DoCkKvbdULvPAuoJ
-DnbjjvbdcSbjscjB
-DoDKjvbdLrXMytpz
-DncKjvbdIryBTNYM
-DoCjjvbdZyDinCkr
-EPDLKvbdZoOJFEyj
-DncLKvbdajkfOmcA
-EPDLKvbdRNYCYmtz
-DoCkKvbddePRawDK
-EOcKjvbdbUbHYKtI
-EPCjjvbdbrbjscjB
-EPDKjvbdKDJcRKCx
-EObjjvbdqcdiQOVa
-EPDKjvbdZjTIPgBf
-DnbjjvbdrSUjmjaN
-DnbjjvbdEXxLsstM
-EPCkKvbdFjeSbglu
-DnbkKvbdLqwMytpz
-DoDKjvbdUGznMXVe
-EObkKvbdpstHRrLU
-DoDKjvbdYTLaNUPY
-DnbkKvbdGKdrbhNV
-EObjjvbdRMxCZNtz
-DncLKvbdDihJuwjA
-EPCjjvbdOFDtJIkE
-DnbkKvbdliEUQuSB
-DoDKjvbdkCkkQftg
-EPCkKvbdGZVVAcwb
-EObjjvbdkyTSSxgU
-EPDKjvbdIryBSlxM
-EOcKjvbdWIXvXfxz
-DoDLKvbdhfjCyWKV
-DoDKjvbdNQXpumfs
-DncKjvbdiMEcnVCy
-EPDLKvbdxVMeRZLn
-EPCkKvbdDoDKjwDE
-DnbkKvbdSCEFLiZL
-DoCjjvbdqYoHgQcx
-EObjjvbdxZhFexFS
-EOcLKvbdkDMLRGuH
-EPCkKvbdVwJXvDdg
-DoCjjvbdjhHLefOL
-EOcLKvbdiCOcFWpq
-DnbjjvbdrovOjCvG
-DncLKvbdRzKHsCvA
-EPCkKvbdDoDLKwDE
-EOcKjvbdrNZjZLhJ
-EObjjvbdTAFIhBoE
-DncKjvbdlqyVZsDi
-DncLKvbdjggMFenL
-EPDLKvbdUsltGMWK
-DoCjjvbdkyTRsZGt
-EOcLKvbdrzMPsBHn
-EPCkKvbddZxpYYpb
-DncLKvbdGKdsCgmV
-DnbkKvbdvAdYsPEh
-DoDLKvbdqUUGrSKt
-EPCjjvbdxnTHxTIc
-EOcKjvbdZisIQGaf
-DncLKvbdBhjbLJFj
-DoCkKvbdJSyBTNYM
-DnbjjvbdmfdwlmgZ
-EOcLKvbdJcJcRJbx
-DncLKvbdmoyyWLYb
-EObjjvbdSKxfUfkT
-EObjjvbdlAlnmALA
-DoDLKvbdTlVnaVoJ
-EOcKjvbdnCKWwnnV
-EPCjjvbdjbkkRGtg
-EPCjjvbdULuoBVoJ
-EPDKjvbdwMvAMceN
-DnbkKvbdznopdcLx
-EPCkKvbdeuzwoizs
-EPCjjvbdpssfrRjt
-EOcKjvbdiGibyWJu
-DnbkKvbdYSlBNToY
-EPDKjvbdkVwNcbYX
-DoCjjvbdsPuoJcVf
-DnbkKvbdrbGNLgLZ
-DnbkKvbdRbEFMJYk
-EObjjvbdqceIonVa
-DnbkKvbdTpqPUuHm
-EOcLKvbdVviXvEEg
-EOcLKvbdvAcxrndh
-DnbjjvbdTYKkmzkY
-EOcLKvbduDCuXVno
-EPCkKvbdEvYpPlie
-DncLKvbdaSGCgtFk
-DoCjjvbdpfDdtWBI
-DncLKvbdHDkWJbJj
-DncLKvbdqZOgfpdY
-EPCkKvbdFxuVBEXb
-DoDKjvbdnBivwnnV
-EPCkKvbdRWmcbkhD
-EObjjvbdfIKvSOQg
-DnbkKvbdcIlikGWx
-EOcKjvbdQdDBQQdS
-EPCjjvbdnPzZWKyC
-DnbkKvbdZxcimbkr
-DncLKvbdLFfHaaRV
-DoCjjvbdYSlBNToY
-DnbjjvbdKCicRKDY
-EPCkKvbddneSjtUS
-EObjjvbdmIctRUqa
-DncKjvbdYqMdiNFR
-DnbjjvbduaDyTPFI
-EPCkKvbdePEsLTtS
-EPCkKvbdbUagYKsh
-DoDLKvbdssSSxzFD
-EObkKvbdMuSrLNAX
-EPDLKvbdddnqbWbj
-DnbkKvbdvAcySneI
-EPDKjvbdatbGxLUI
-EOcLKvbddePRbWbj
-DoDLKvbdijGIKNYS
-EPCjjvbdNrsugEtp
-EOcLKvbdxZhGGYEr
-DnbkKvbdTkvPAvPJ
-DoCjjvbdFyUuAcwb
-DnbjjvbdJTZBTMxM
-EPDLKvbdaMkCStmH
-EPDLKvbdjKGHimYS
-DnbkKvbdelewGlik
-EObjjvbdkHgMGGOL
-EObkKvbdURRPUuHm
-EOcLKvbdjKFhKNYS
-EPDLKvbdhyuFkpnG
-EOcLKvbdRosgJecw
-DoCjjvbdczYoxYqC
-DncLKvbdzaAPGgCM
-EPDKjvbdiUzEwSUb
-DoCjjvbdKQzEneme
-EObjjvbdatagXkTh
-DoCjjvbdwtldqYkn
-EOcKjvbdUxgszLOn
-EPCkKvbdUaBprprZ
-EOcLKvbdYNqAYVVt
-EObjjvbdbUafwkTh
-EPDLKvbdcIljLGWx
-DnbjjvbdNHDPlotk
-EOcLKvbdkIHMFfOL
-EPDKjvbddePSCXDK
-EOcLKvbdbUafxLTh
-DoDKjvbdQlwaxmtz
-DoCkKvbdbQHHELzd
-EPDLKvbdhficZWKV
-DoDKjvbdqrVLOLAm
-DoCjjvbduDDUvvPP
-EPCjjvbdCEQAuilf
-EOcLKvbdEASIlywX
-DncLKvbdRNXayNtz
-EOcKjvbdVrOXaeMD
-EPCjjvbdFWYopNKF
-DnbkKvbdSQTfjFcw
-DoDLKvbdJTZAsMwl
-DoCjjvbdiCPDEvpq
-DncKjvbdVwIwuceH
-EPDLKvbdJvVFcdfi
-EPCjjvbdcbSlrATm
-DnbjjvbdqBJFAXIE
-EPCkKvbdTAFJHbOd
-EPCjjvbdcTCkUEKB
-EPCkKvbdxwhibPzL
-EPCkKvbdRpTfifEX
-EPDLKvbdvAdYsOeI
-DncKjvbdpxngfpdY
-EPCjjvbdEXwksstM
-DnbkKvbdNrsufeUp
-DnbkKvbdJKEAJogE
-DoCkKvbdNsUWGduQ
-DoCkKvbdbrcLTcjB
-EOcKjvbdiHJcZViu
-EObkKvbdEztQdkcJ
-DoCjjvbdliETptqa
-EOcLKvbdOEdUIhjd
-DoCkKvbdSKxfVGkT
-EPCjjvbdIsZAsMxM
-EOcKjvbdZsiIyDsO
-DncLKvbduDCtwWOo
-DnbkKvbdEztQdlCi
-DnbjjvbdLZQjSztf
-DoDLKvbdXmqAXuVt
-EPCjjvbdxsOJNSCH
-DoDLKvbdRadElJZL
-EOcLKvbdWRnXbEkc
-DncKjvbdSCEFLiYk
-EPDLKvbdidkHVPAO
-DoCjjvbdkClKqGtg
-EPDKjvbduLxXBUAw
-DncLKvbdqUTfqqkU
-EObjjvbdcImKKevx
-DoDLKvbdMgCpMpVL
-DnbjjvbdtTRsYydc
-DnbkKvbdKefHbBQu
-EOcKjvbduoTzpjnt
-DoCjjvbdjuwNcaww
-DncKjvbdTkvPBVni
-EPDLKvbdapGfdLzd
-EPDKjvbdvAdZTPEh
-EPCkKvbdwXLaVaWV
-EOcKjvbdZoNhddyj
-DncKjvbdqceIonVa
-DnbjjvbdIwsbHkqQ
-DoDKjvbdjFKfuPAO
-EOcLKvbdbhmJkFvx
-DncKjvbdDxYMUUTl
-DnbjjvbdMfbpNQVL
-DoDLKvbdZeXfzhIb
-EOcLKvbdVAbRSpqy
-DncLKvbdZxcjOCkr
-EOcKjvbdyTNiNSCH
-EObkKvbdiLddOUcZ
-DoCjjvbddwystRez
-DoDKjvbdUsmTelWK
-EPDLKvbdEPCjkWcE
-DoDKjvbdIwsaglQp
-EObkKvbdGcjvJbKK
-DoCkKvbdRzJgrbvA
-EObkKvbdkxsSSxft
-DncLKvbdfHjvSNpg
-DnbkKvbdxsNiMqag
-DoDLKvbdcImKKevx
-EOcLKvbdJutfDdgJ
-DoDLKvbdhancEwRR
-EObkKvbdnPzYvKyC
-DoDKjvbdNHDPlouL
-EPCkKvbdKaKgMbXq
-EOcLKvbdqUTgSRkU
-EPCkKvbdZjSgpHBf
-DncLKvbdHffzYxXg
-DoCkKvbdFkErbhMu
-EObjjvbdhancEwQq
-EPDKjvbdJYUCHkpp
-EPDKjvbdtkwwBUAw
-EOcLKvbdiZuGMRNf
-EObkKvbdrJAKElne
-DnbjjvbdIHHZxwwg
-EPDKjvbdkHgMGGNk
-DoCjjvbdeOeSjtUS
-DoDLKvbdJbicQjCx
-DncKjvbdnGeXlnGy
-EPDKjvbdKVtecdfi
-EOcKjvbdULuoBVni
-DnbkKvbdmJDtRVRa
-DncLKvbdJTZAsMxM
-EPDKjvbdVgxVxHYz
-EPCjjvbdVBCRSqSZ
-EPCjjvbdJqZdnfOF
-DncKjvbdqdEiQOVa
-DnbkKvbdZLqdTnLm
-EOcKjvbdzHZMANFX
-DncKjvbdVrNxBdkc
-DnbjjvbdKkAgvAKZ
-DnbjjvbdmbKWxOnV
-DoDKjvbdYqMeImEq
-EObjjvbdbUagYKtI
-DncKjvbdQZNAHSqj
-DoDLKvbdfoazvcwh
-DnbkKvbdVvhwvDdg
-DoDKjvbdURQoUthN
-EPDLKvbdvBDyTOeI
-DnbjjvbdrRuKmkBN
-DnbkKvbdRbDdlIxk
-EObjjvbdSCDdkhyL
-DoDKjvbdSBceMJYk
-DoDLKvbdwyhGGYFS
-EPDKjvbdQvmcblID
-DoDLKvbdaaWFGQQX
-DoDKjvbdEASImZvw
-EPDLKvbdnQZyWLYb
-EPDKjvbdbrcLUEJa
-EOcLKvbdKCicQjDY
-EPCjjvbdVBCQsQqy
-EPCkKvbdkaNPNALA
-DncLKvbdaNKartmH
-DoDLKvbdCTAbtFvr
-EObjjvbddZxowxpb
-EObkKvbdTpqOuUgm
-DncLKvbdZQleJNFR
-DnbjjvbdUVlPisaR
-EObjjvbdBsBCtFvr
-EPCjjvbdJutecdgJ
-EOcKjvbdfNFvgNKL
-DncKjvbddneSjtUS
-DoDKjvbdjcMKqGtg
-EOcLKvbdGdLWKCKK
-EOcKjvbdRDcBPpdS
-DoCkKvbdauCGwkTh
-EPCjjvbdaNLCStmH
-EOcKjvbdelfWgMjL
-DoDLKvbdtSrSxyeD
-EPCjjvbdemGXGmKL
-EOcLKvbduDCuXWOo
-DncKjvbdauBfxLUI
-DnbjjvbdIHGyyXwg
-EPCjjvbdEvYooljF
-EObjjvbddneTLUTr
-DoCjjvbdySmiNRag
-DoDKjvbdqUUHSRjt
-EObjjvbdczYpXxpb
-EObkKvbdaMkBrtlg
-EPDLKvbdnUuZkKRf
-DoDKjvbdcScKsdJa
-EPCjjvbdsrrTYydc
-EObjjvbdZoNiFEyj
-EPDLKvbdmttyjirG
-EOcLKvbdYqMeIleR
-DoDKjvbdKWUfEFGi
-EOcLKvbdcyxoxYqC
-EObkKvbdNeETiJLE
-EPCkKvbdUMWOaVoJ
-EPCjjvbdWSOXbElD
-EPCkKvbdNHCpNPuL
-EObkKvbdEuyQQNJe
-DoCkKvbdmgExNOGy
-EOcKjvbdZtJJYcsO
-EOcLKvbdMpXqVnGs
-EObjjvbdbsDLTcjB
-EPCjjvbddoFTLUTr
-EOcLKvbdaNKbTVNH
-DoCjjvbdJcKCpicY
-DoDLKvbdsBfMlGjy
-EPDKjvbdqiAJdlne
-EObkKvbdKefHaaRV
-DoDLKvbdbiNJjewY
-EPCkKvbdVTltFlWK
-DoDLKvbdbBWFGPpX
-DncLKvbdVZITzKoO
-EPCjjvbdnUtzLKSG
-EPCkKvbdBraDTevr
-EPDLKvbdTkunaWPJ
-EObjjvbdZRNFJNEq
-DnbkKvbdxUldqYkn
-EPDLKvbdtvOYJpsA
-EOcLKvbdJvUfEEgJ
-DoDKjvbdlYrqsZGt
-DncKjvbdePFSjstS
-EPDLKvbdqquLOLAm
-DoCkKvbdSPtHKFdX
-DoCjjvbdZyDjNcMS
-EPDKjvbdTlVnaWPJ
-EPCjjvbdZirgpHCG
-EObkKvbdNQYQvNfs
-DncKjvbdqqtjnLBN
-DoDKjvbdjJehJmYS
-DncLKvbdrNZixlHi
-EPDLKvbdMfcPlpVL
-EPCjjvbdUWMQJtBR
-DoCkKvbdfMfWfljL
-DnbjjvbdaRfDHtFk
-DncLKvbdiMFDnVDZ
-DoCkKvbdXrkaNToY
-DoCjjvbdZLqdUNlN
-EObkKvbdRjxetfkT
-EOcLKvbdmgFXmOGy
-EPDKjvbdUQpntuHm
-DoDKjvbdpstHRrKt
-DncLKvbdHkazmwRL
-EObjjvbdpfEFUWAh
-DoDKjvbdZyEJnDMS
-EObkKvbdiBoCeXQq
-DoCkKvbdeATplxKG
-DncLKvbdWRmwadkc
-EPDKjvbdUQqPUthN
-DoCjjvbdnBjXXnmu
-EPDLKvbdZjTIPfbG
-EPCkKvbdWHwuxGxz
-DncKjvbdYpmFJMdq
-DoDKjvbdhbPDFXRR
-DnbkKvbdBdQBVimG
-DoCjjvbdmIctRUqa
-EPDKjvbdZyDjNbkr
-EOcLKvbdQYmAHSrK
-DnbjjvbdqYoHgQcx
-DncKjvbdqiAKFMoF
-DncKjvbdOTUWHEuQ
-DoCjjvbdVTmTfLuj
-DoCkKvbdddoRbWcK
-EPDKjvbdIsYaTNYM
-EObkKvbdRosfiedX
-EOcKjvbdcTDLUEKB
-EOcLKvbdmozYujxb
-DnbjjvbdZirgogBf
-EPCjjvbdKWUeceHJ
-DnbjjvbdZoOJEdzK
-EPDKjvbdEJhKVwjA
-DoCkKvbdfpBzvcxI
-DoDKjvbdlrYtysDi
-DoDLKvbdZjSgofbG
-DoCjjvbdUtMtGMVj
-EPCjjvbdGGKRmiTq
-EPCkKvbdQvnDcMID
-DnbkKvbdKCjCqJbx
-EPCkKvbdYpleImEq
-DoDLKvbdjKFgjNXr
-DoDLKvbdZshhxcrn
-EPDLKvbdnVVZjjRf
-EOcKjvbdqdFIpNua
-DnbjjvbdVwIxVdEg
-DoCkKvbduaEZSneI
-DnbkKvbdznoqFClY
-DoCjjvbdoAKzsgcn
-EOcKjvbdSLZGVGkT
-DncKjvbdiCObeWqR
-EPCjjvbdWRnXbEkc
-EObjjvbdRotGiecw
-EObkKvbdKDKDQibx
-DnbjjvbdlYsRsYft
-EOcKjvbdUaBqSprZ
-DoCjjvbdhkdcmuDZ
-EOcKjvbdjgflFfNk
-DoCjjvbdGKdrcINV
-EOcLKvbdEJgjVxKA
-EObkKvbdSxKkmzkY
-DnbjjvbdsZkosBIO
-DoCjjvbdBvzchePv
-EObkKvbdGYtuBEXb
-EPDKjvbdiLeENtby
-EPCkKvbdRNXbYnUz
-EObjjvbdfHkWRnQg
-EObkKvbduDDVXWOo
-DoCkKvbdJbjCqJbx
-EPDLKvbdpedFTvBI
-DncLKvbdjJegjMwr
-EPCjjvbdUxgszLPO
-EObkKvbdxmrhXsJD
-EOcKjvbdJSxaSmXl
-EPDLKvbdfNFwGmJk
-EPDKjvbdsrrTYydc
-DncKjvbdhgKDZVjV
-EPCkKvbdZMRctNkm
-DoDKjvbdezuyEhtX
-EPCkKvbdEXwlUTsl
-EPDLKvbdeAUQlxKG
-DoDKjvbdZnmiEdyj
-EObkKvbdrzMPraIO
-EPCjjvbdxxIibPyk
-EPCkKvbdKfFgbBRV
-DoDKjvbdyzeORhIh
-DnbkKvbdbAvFGPpX
-DncKjvbdZoOJEdyj
-DnbkKvbdrJAJdmOe
-DoDKjvbdKVuFdEfi
-EOcKjvbdqdFJQNvB
-EPDLKvbdOEctIhkE
-EPDLKvbdvBEYsOeI
-DncKjvbdHELVjBjK
-DncLKvbdZshhyDsO
-EPDKjvbdGdKuibJj
-DoCkKvbdEYXkstUM
-DnbjjvbdJpyeOfNe
-EPDKjvbdzoPpdbkx
-DoCkKvbdMSXMytpz
-DncLKvbdqZOggQcx
-DoDKjvbdmuUyjirG
-DnbkKvbdNVSqkNAX
-DncLKvbdRotHJfEX
-EOcKjvbdZyEJnCkr
-EPDLKvbdyYJKBpZk
-DnbkKvbdxmrgxTJD
-DnbkKvbdhaoDFWqR
-DncKjvbdbhmJjevx
-EObjjvbdSKyGVGjs
-DnbjjvbdSKxfVHKs
-DnbjjvbdqdFIomua
-DnbkKvbdkHflGGOL
-DoDLKvbdqGDeUVaI
-EObjjvbdjmBlZeHP
-EPCkKvbdmttykJrG
-DncLKvbdRXOEDLgc
-DoDLKvbdhaoDFWqR
-DoDKjvbdvvkaWAuu
-DoCkKvbdbhmKKfWx
-EObjjvbdSBdFMJZL
-DnbjjvbdnUuZjjSG
-EPDLKvbdliDtQuSB
-EOcLKvbdsCFmMGjy
-DnbjjvbdtunXjQsA
-EObkKvbdkCkjqHUg
-EObjjvbdDoCkKvbd
-DnbkKvbdiZuFlROG
-EOcKjvbdRNYCZNtz
-EOcLKvbdxUmEpxlO
-EPCkKvbddePSBwDK
-EOcLKvbdauBfxKsh
-DoCjjvbdtkwwBTaX
-EObjjvbdmgEwmNfy
-DnbjjvbdOStWHEuQ
-EPCkKvbdGLFTChNV
-EPCkKvbdKDJbpjDY
-DoDLKvbdnPzZVjxb
-DoCjjvbdFVyPomJe
-DncLKvbdACqwizIp
-EPCkKvbdZirhQGaf
-DncKjvbdtTRsZZeD
-EObkKvbdLBLHMbYR
-EOcLKvbdrNZjZLgi
-EObjjvbdTXkLmzkY
-EPCkKvbdBsAbsfXS
-EOcKjvbdeATpmXif
-DoCkKvbdMSWmZuQz
-DncLKvbdVTmTfMVj
-DoDLKvbdZxdKODMS
-EPDKjvbdZjShPgCG
-EPDLKvbdxVMdpxkn
-EPDLKvbdcSbjsdKB
-EPDLKvbdiifIJlwr
-DoDKjvbdKQydoFnF
-EObkKvbdegkWRmpg
-EObkKvbdiBncFXQq
-DoDLKvbdNdctJJLE
-EOcKjvbdUyHszKnn
-EOcLKvbdSQUHKFcw
-EObkKvbdUaBqSprZ
-DoCkKvbdSCDeLiZL
-EPCkKvbdKDKCpjCx
-EPDLKvbdwygfFweS
-DoDKjvbdiVZeWqtb
-DoCjjvbdMRwMyuQz
-DoCjjvbdsCGNLfkZ
-DoCkKvbdmRxuZsEJ
-EPCkKvbdkDMLRGtg
-EObkKvbdGdKuibJj
-EPCkKvbdePFTLUTr
-EOcKjvbdXrlAlsoY
-DoDLKvbdZjTHogBf
-DnbjjvbdZirhQGaf
-EPCkKvbdFVxooljF
-DoCkKvbdbKkeoNcA
-DoDKjvbdqYngfqEY
-EPDLKvbdrWokcJYq
-DoCkKvbdMowqVnHT
-EPCkKvbdqqtjnKaN
-DoDLKvbdiCPDFWqR
-DoDLKvbdeJiqutzn
-EObkKvbdqcdiPmvB
-EPCjjvbdMgComQUk
-DoDLKvbduVnYKQsA
-DnbjjvbdjhHLfFmk
-EOcKjvbdVvhwvEEg
-DnbkKvbdZtIhyESn
-DncLKvbdznopeClY
-EPCkKvbdwtldqZLn
-EOcKjvbdeEnrBwDK
-DoCkKvbdkxrqsZHU
-DoDKjvbdijGHimYS
-DncLKvbdfNGWgMjL
-EOcKjvbdmbKWxOnV
-EPCkKvbdhtzEvrVC
-DoDLKvbdhfibyWJu
-DoCkKvbdXrkaMsoY
-DoCkKvbdzoPpdbkx
-EPDLKvbdSLYeuGjs
-EOcLKvbdqlyixlIJ
-EObjjvbdnVVZjiqf
-EOcLKvbdyNrhXriD
-DoCjjvbdRjyFtgLT
-EOcLKvbdkyTRryHU
-EPCjjvbdrykpTBIO
-EObjjvbdlqxtzSdJ
-EObjjvbdcarmSATm
-EOcKjvbdXsLaNToY
-EOcKjvbdlqxtysDi
-EOcLKvbdaMkCStmH
-DncKjvbdbAvFGPow
-EPDLKvbdTulQKTaR
-DncKjvbdXGYzUAOs
-DncKjvbdezuxeItX
-DnbkKvbdrykpTBIO
-DoCkKvbdxnShXsIc
-DoDLKvbdEPCjkXCd
-DnbkKvbdIxUBgkpp
-DnbkKvbdBiKbKhfK
-DoDKjvbdKNADygVB
-EObjjvbdADRxKZiQ
-EPCjjvbdMfcQMotk
-EObjjvbdSBcdkhxk
-EPDKjvbdNrtVgFVQ
-EPDKjvbdZMRdTnLm
-EObkKvbdehKvRnQg
-DoCkKvbdliETptqa
-DoDLKvbdEXwktUUM
-EObjjvbdBiLBjiFj
-EOcLKvbdRkYeuGjs
-EOcKjvbdmttzKjRf
-EObkKvbdxrmhmRbH
-DnbkKvbdyXiJaoyk
-EObkKvbdxmrgwsIc
-DoDLKvbdiZtfMQmf
-DnbkKvbdpxoHfpcx
-EObjjvbduaEZTOdh
-EObkKvbdqqtkNkAm
-DoDKjvbdxmrgxTIc
-DncLKvbdMgColpVL
-EPCkKvbdZnnJEeZj
-EPCjjvbdVYgszKoO
-EPCkKvbdBcpAuilf
-EObkKvbdlhdUQuSB
-EObkKvbdMIbLpxAS
-EPCjjvbdnVUyjirG
-DoDKjvbdKRZeOenF
-DnbjjvbduCbuXWPP
-DnbjjvbdssRsYydc
-EPCkKvbdlhctQtqa
-DoCkKvbdsQVoJcVf
-EObjjvbdegkWSNpg
-DoDLKvbdOAJTUKSA
-DoDLKvbdliEURVSB
-DoDKjvbdxsNhlqbH
-DnbjjvbdOSsvGdtp
-EPDKjvbdaaVeGPow
-EObjjvbdNeETiIjd
-DnbkKvbdJKEAJpHE
-EPCjjvbdANIYsWzY
-DoCjjvbdjvWmdCXw
-EPDKjvbdrouoJcVf
-DnbjjvbdiUzFWquC
-DnbjjvbdFxtuBEYC
-DnbjjvbdRkYfVHLT
-EObjjvbdQwNccMID
-DoCjjvbdXsMAmTnx
-DoCjjvbdjJfIKMxS
-EOcLKvbdbiMikGXY
-DoCjjvbdQdDAoqES
-EPCkKvbdVwIxVcdg
-EOcLKvbdCEQAvKMf
-EPDLKvbdzROmJKXA
-EPDLKvbdZLrDsnLm
-DncKjvbdjggMGFmk
-DnbkKvbdddnrBvcK
-DnbjjvbdpecdsvBI
-EPCkKvbdijFgjNYS
-EOcLKvbdUaBqTQqy
-DncKjvbdkHgMFfNk
-EObkKvbdZGvdAPSi
-DnbjjvbdqUTgSRjt
-DoDLKvbdqvpLcIyR
-DncLKvbdLqvlytpz
-DnbkKvbdKDJbpjCx
-DoCjjvbdlqyUyrci
-DnbkKvbdUQqPUuIN
-EObkKvbdTlVnaVni
-EOcLKvbdNdcshiLE
-EObkKvbdkDMLRHUg
-DncKjvbdIxTbILpp
-EPCkKvbdePFTKssr
-DnbjjvbddeOrCWcK
-DnbkKvbdatbGxLTh
-EObkKvbdqlzKZLgi
-EPCjjvbdOTUVgFUp
-EOcLKvbdpfEFTvAh
-DncLKvbdZnnIdeZj
-EObkKvbdZxdKODLr
-DoDKjvbdjggLfGNk
-EPCjjvbdRDcAopdS
-DncKjvbdlZTRryHU
-DncKjvbdZshiYdSn
-EPDKjvbdatbHYLTh
-EPDKjvbdLAjfmCXq
-EPDKjvbdOFEUIiLE
-DncKjvbdxVNFQxlO
-DoCjjvbdrafNLfkZ
-DoCjjvbdGFiqnJTq
-EPCkKvbdUsmUFlWK
-EObkKvbdLBLHMbXq
-EPCkKvbdtlYWaUBX
-EPCjjvbdSPsfjGEX
-EObjjvbdIjEAJogE
-DoDLKvbdNHCpNQUk
-DncLKvbdYkqdUNkm
-DoCjjvbdqquKmkBN
-DnbjjvbdEuyQQMjF
-EOcKjvbdURRPUthN
-EObjjvbdmoyxvLYb
-EObkKvbdGYtuAdYC
-DnbjjvbdZeYGzhJC
-DoDLKvbdCgLfHAzc
-DoDLKvbdhuZeXSUb
-DoCkKvbdjlbMZdgP
-DoCkKvbdemGWgMjL
-EPCkKvbdxxJJaoyk
-EPDLKvbdqGEEsuaI
-EObkKvbdEKHjVwjA
-EOcKjvbdiBoDFWpq
-EPCkKvbdffLzNfgA
-EObjjvbdDoCjkXDE
-EPDKjvbdhficZWJu
-DoCjjvbdWWiYVdFH
-EPCkKvbdKQzFOenF
-DoCkKvbdmbJvxPOV
-DnbkKvbdtAHQhAAr
-EPDLKvbdmSYtzSci
-EPDLKvbddeOqavcK
-DoCjjvbdCEQBVjMf
-EPDLKvbdlYrqsYft
-DnbkKvbdJSyBTNXl
-EPCjjvbdcbSmSATm
-DoDKjvbdfNFwGmJk
-DoCkKvbdGLErbhNV
-EObkKvbdiZuFlQnG
-DnbjjvbdxUmEpxlO
-EPDKjvbdUWMPitBR
-EPDKjvbdrafNLfjy
-EPDLKvbdrWolDJZR
-EObjjvbdhbPDFXQq
-DncLKvbdqrUkNjaN
-DnbkKvbdBiLCKhej
-DoDKjvbdSCEFMIxk
-DoDLKvbdffLzNgHA
-EPCkKvbdZLqcsmkm
-DnbkKvbdZMSEUOMN
-DnbjjvbdzaAPHHCM
-DnbjjvbdCIkBjhfK
-DoCkKvbdZirgpHBf
-DnbjjvbdIwtBhLpp
-EObkKvbdeOeTLUTr
-EObkKvbdUxgszLPO
-EObkKvbdhzVGLqOG
-DnbjjvbdOTTufdtp
-EOcKjvbdZRNEhleR
-EPCjjvbdKyRKSzuG
-DoCkKvbdZtJJYcsO
-EOcLKvbdemGXGmKL
-EPDKjvbdJXsahMQp
-DoDLKvbdhbObeWqR
-EObjjvbdFVxpPljF
-EOcKjvbdaNLBruMg
-DoCjjvbdpyPIGpcx
-EOcLKvbdZMRcsmkm
-EOcLKvbdnGeXmNgZ
-DoDLKvbdjlalZeGo
-DoDLKvbdaSGDHtGL
-EPCkKvbdCTAbsewS
-EPCjjvbdZjSgofbG
-DnbjjvbdJutecdfi
-EPCkKvbdIryBSmYM
-DoCjjvbdfekzOHHA
-DnbkKvbdREDAoqES
-EPCjjvbdtTSTYzEc
-EPCkKvbdmoyyVkYb
-EObkKvbdmfdxMnGy
-DoCkKvbdwuNFQxkn
-DncKjvbdsBelkfjy
-EPDLKvbdQvmdDLhD
-EPDKjvbdBhkCLJFj
-DoCkKvbdeJiqutzn
-EOcLKvbdqTsfrSKt
-DoDLKvbdakLfOmcA
-DncKjvbdKaLHMawq
-EPCkKvbdznopdcMY
-DoDKjvbdZtJIyDsO
-DoDLKvbdsQVnjCvG
-DncKjvbduDDUvuno
-DoCkKvbdJYUCHlQp
-DnbkKvbdnBiwYPNu
-EObjjvbdlYrqryHU
-EPCjjvbdqcdiPnWB
-DoCjjvbdUQpoUthN
-EPDKjvbdsZlQTAhO
-EOcKjvbdtbbtwWOo
-EPDLKvbdJuuGDdgJ
-EOcKjvbdjggMGGOL
-EPDLKvbdHffyxwxH
-EOcLKvbdSCEElIxk
-EObkKvbdIwsbHkqQ
-EPDLKvbdjbkjqHUg
-DnbjjvbdnQZxujxb
-EPDKjvbddePRbWbj
-DoCkKvbdhtydwRuC
-DoDKjvbdCDoaWKMf
-EOcKjvbdRjyGVGjs
-EObjjvbddCTNSATm
-EOcKjvbdZLrETmlN
-EPDKjvbdlrZUysDi
-EOcLKvbdwtmFRZMO
-EPCjjvbdtTRrxydc
-EObjjvbdeFPSBvcK
-DoCkKvbdwuNFRZLn
-DnbjjvbdhytfLpmf
-EPCkKvbdrykpTAgn
-EObkKvbdRDcApRDr
-DoCjjvbdZnnIeFZj
-EOcLKvbdePErkUTr
-DoDLKvbdrbGNLgLZ
-EObjjvbdVZIUZjoO
-DncLKvbdzHYlAMeX
-DnbkKvbdbsDLTcia
-EPCjjvbdOSsufdtp
-DncKjvbdpstHSSLU
-DncKjvbduDDVWuoP
-EPDKjvbdiMEdNuCy
-EOcKjvbdtbcVWuno
-DoDKjvbdqUTgRqjt
-DncLKvbdZyDjNcLr
-DoDLKvbdRWmdDLgc
-DncKjvbdZLqdUOMN
-DoDKjvbdijGIJlwr
-EObjjvbduMYXBUAw
-DoCkKvbdHDkWJajK
-DoCjjvbdRpTfifEX
-DoCjjvbdUyHszKnn
-EPDKjvbdqZPIGpdY
-EPDKjvbdRWmdCkhD
-EObkKvbdsrrSyZdc
-EOcKjvbdYlSDtNlN
-DncKjvbdbKkennDA
-EPCkKvbdiZuGMQmf
-EPCkKvbdEztQeLbi
-EPCkKvbdaRebgsfL
-DoCkKvbdBcpAuilf
-EOcKjvbdyNsIYShc
-EPCjjvbdcIlijewY
-DoCjjvbdmbKXXoOV
-DncLKvbduDCtwWPP
-EPDKjvbdnCJwXoOV
-EPCjjvbdjcLkQgUg
-DnbkKvbdtcCtwVno
-DncKjvbdGFjRmiUR
-DncLKvbdrWpLcJYq
-DncLKvbdKWVGDdfi
-EPCkKvbdnUuZkJrG
-EPCjjvbdiCPCeWqR
-DncKjvbdEYYMUUTl
-EObjjvbdrpWOicWG
-DoDKjvbdFejSOIsq
-DnbjjvbdqiAJdmOe
-EOcKjvbdUyITzKnn
-DoDKjvbdfMfWgMjL
-DnbkKvbdXrkaMtOx
-DoCkKvbdKefIBaRV
-EPCjjvbdyTNhlqbH
-EPCjjvbdtlXwBUAw
-EOcKjvbdRosfjFdX
-DoCjjvbdYpldiMeR
-DnbjjvbdwzIFexFS
-DncKjvbdSCDeLhyL
-DncLKvbdrzLpSaHn
-DncKjvbduCcVWuoP
-DoDLKvbdatagXkTh
-DnbkKvbdsCGMlGkZ
-EPCkKvbdkWXNdBww
-DncKjvbdJcKCpjCx
-EOcKjvbdNxPVzdNt
-EPCkKvbdKRZeOfOF
-DncLKvbdcIljLGXY
-EPDLKvbdVhXuwfxz
-DoCjjvbdaoffckzd
-EOcKjvbdLhbLpxAS
-DnbjjvbdnHExMmgZ
-EObjjvbdbhljKfXY
-DnbjjvbdkDLkRGuH
-EPDLKvbdfHkWSORH
-EObjjvbdzoPqFClY
-DncKjvbdznopdbkx
-EObjjvbdnUtzLKRf
-EPCkKvbdZQldiMeR
-DoDKjvbdFjeScHmV
-EPDKjvbdEOcLKwCd
-EPDKjvbdyqOmJKXA
-EOcKjvbdSQTfiecw
-DoDLKvbdDoDLLXDE
-DoDKjvbdhlEcmuDZ
-EObjjvbdfHkWRmqH
-DnbkKvbdIGfzYwwg
-DncLKvbdUWMPjUAq
-EPDKjvbdkHflGGOL
-DnbkKvbdnPzZVjyC
-EPDLKvbdSBceLiYk
-DncLKvbdUtMsfLvK
-DnbkKvbdbrcLTdJa
-EObkKvbdIwtCHkqQ
-EPDKjvbdtbcVWvPP
-EObkKvbdtbcVWuoP
-DoDKjvbdKVtfEFGi
-EPCjjvbdMRvlytpz
-DoDLKvbdwuMeRYlO
-EOcKjvbdlhdTqVRa
-EPDKjvbdiGjCyVjV
-DnbjjvbdrDeJQNua
-DoDKjvbdrbFmMHKy
-EOcKjvbdfHjurNpg
-DnbkKvbdZRNFJMeR
-EOcKjvbdqFdEsvBI
-DnbjjvbdZirgogCG
-DoDLKvbdDncKjwDE
-DoCkKvbdjhGlFfOL
-EObjjvbdmaivxOnV
-EObkKvbdKkAhWAJy
-EOcKjvbdNrtWHEuQ
-DnbkKvbdFkFTChMu
-EObkKvbdeOdrjstS
-EOcKjvbdIwsbHlQp
-DoCkKvbdeATpmXif
-EOcLKvbdKaKgMaxR
-EObkKvbdUGznLvvF
-DnbkKvbdbLMGPODA
-EObjjvbdTkvOaVoJ
-EOcKjvbdsQVoKDVf
-EPDKjvbdznopdcLx
-DoDLKvbdpfDdsvAh
-DncKjvbdrDdhpNua
-EOcLKvbdhficZVjV
-DncKjvbdFxuVBEYC
-EPDKjvbdzjVQQETU
-EObkKvbdKRZePGNe
-EObjjvbdDncLLXDE
-EOcLKvbdYkqctNkm
-DoDKjvbdtvOYKRTA
-DoCkKvbdmajWxPNu
-DncKjvbdIjEAJofd
-EPCkKvbdiCPDFWqR
-EOcLKvbdIHHZxwwg
-EOcKjvbdYpmEiNFR
-EOcLKvbdQmYCZNtz
-EOcLKvbdVYhTykPO
-EPCkKvbdJKEAKPfd
-DoCjjvbdRkYfUfjs
-EPDLKvbdlZTSTZGt
-DoDLKvbdNGbpNQVL
-DoCjjvbdvAdZTOdh
-EPCjjvbdliDsqUqa
-EPDKjvbdSPsfiecw
-EOcKjvbdYlRcsmkm
-DnbkKvbdwXMAvBVu
-EPCkKvbdRjxfVGjs
-EOcLKvbdCIkCKiFj
-DoCkKvbddxZssrFz
-EOcKjvbdREDApRES
-EOcLKvbdTpqPVVIN
-EObjjvbdaaWEeoow
-EOcKjvbddeOrCXCj
-EOcLKvbdAMgySvyx
-EPDLKvbdNPwqVnHT
-EObkKvbdwuMeRYlO
-DoCkKvbdTkuoAuoJ
-EPDKjvbdmJDspuRa
-EPCjjvbdNHCpNQVL
-DncKjvbdGcjvKBij
-EOcKjvbdbQHHELzd
-EPDKjvbdPxmAGrqj
-EPCjjvbdRbDdkiYk
-EPDLKvbdTAFJHand
-DoDKjvbdqmZjZMHi
-EObjjvbdtSrTYzFD
-DncLKvbdhlEcmtby
-EObjjvbdmJEUQuSB
-DncKjvbddndsKstS
-EPDLKvbdmgFYNOGy
-DnbjjvbdSCEElIyL
-DncKjvbdmaivxOmu
-DoDKjvbdFVyPomKF
-DnbkKvbdMpXqWOHT
-EObjjvbdKefICBRV
-EObjjvbdqGDdtWBI
-DnbkKvbdCJLCLIfK
-EObkKvbdLqwNZtpz
-DoDLKvbdiifHjMwr
-DoCkKvbdddoRawDK
-DncKjvbdbrcKscjB
-DnbjjvbdrSVLNkAm
-DnbjjvbdffLynHHA
-EObkKvbdTAFJHbPE
-DncKjvbdDncKkWcE
-EOcLKvbdrouoKDVf
-EOcLKvbdZisIPfbG
-EOcLKvbdiGicYuiu
-DoDLKvbdVgxWXfxz
-DoCkKvbdffMZmgHA
-EObjjvbdWfZZtAPT
-EPDLKvbdEzsqElCi
-DoCkKvbdYSlAlsoY
-EPDLKvbdFWYpPmKF
-DoDKjvbdkNCMZdfo
-EPDLKvbdehLWSOQg
-DnbjjvbdxxJKCPyk
-EOcLKvbdMfcQMpVL
-EOcLKvbdnVVZkKRf
-EObjjvbdczYoxZQb
-EPCkKvbdSQUGiedX
-DoDKjvbdeuzwpJzs
-DoDLKvbdqZPHfqDx
-DoCjjvbdKeehCBQu
-DnbkKvbdADSYJyiQ
-DoCjjvbdFkFTDHlu
-EPDKjvbdZoOJEdzK
-EPCjjvbdZjTIQGbG
-DncKjvbdZHWdAOri
-EPCjjvbdeXystRez
-EObkKvbdIxTagkpp
-EObjjvbdxZgfFxEr
-DoDLKvbdjhHLfGNk
-EObkKvbdTfznMWue
-DoDLKvbdOSsufeVQ
-DncKjvbdVUNTelWK
-EPCjjvbdZQmFImEq
-DnbjjvbdkClLQftg
-DnbjjvbdRXNdDLhD
-DncKjvbdTqQoVUgm
-EPCjjvbdNQYRVmgT
-DoDLKvbdnUuZjiqf
-DoDKjvbdbsCjsdJa
-EOcKjvbdFkEsDINV
-DoDKjvbdyOTHxSiD
-EOcKjvbdkMbMZdgP
-DnbkKvbdeEnqavcK
-DoCkKvbdxZhFfYEr
-DncKjvbdNPxQunGs
-EOcLKvbdOYOuzdNt
-DncKjvbdJbicRKDY
-DncKjvbdjAQHAofj
-EOcKjvbdWWiYVcdg
-DnbjjvbdjFKftoAO
-EPCkKvbdTXkLmzjx
-EPCkKvbdWSNxBeMD
-DoCkKvbduMXwBTaX
-DoDLKvbdLBKfmBxR
-DoCjjvbdEObjjwDE
-EPDKjvbdTlVnaVoJ
-DoDLKvbdhgJcZViu
-EObjjvbdatbHXjtI
-EOcLKvbdZeXfzgiC
-EPCkKvbdeFPRbXCj
-EPCkKvbdZQleJMdq
-DnbjjvbdUWLojUAq
-EPCjjvbdFaOpyJzm
-DnbkKvbdANIYrwZx
-EPCkKvbdbBWEeopX
-DoDLKvbdczYpYYpb
-EPCkKvbdbVBfxLTh
-DoDKjvbdLBKflawq
-DoCkKvbdyOSgxSiD
-EPDKjvbdkDLkQgVH
-EObkKvbdjmBlZdfo
-EPDKjvbduoTzqLOt
-EOcLKvbdaRebhUFk
-EPDKjvbdatbGwjtI
-EOcLKvbdCIjbLIfK
-DncKjvbdkIGkeemk
-DncKjvbdxVMeRZMO
-EOcKjvbdRXODcMHc
-DnbjjvbdqquLOLAm
-DoDKjvbdDHLfHAzc
-DoCkKvbdnVVZkKRf
-DoDLKvbdGcjvJbKK
-DoCjjvbdzoQRFDLx
-DoDLKvbdmuUzLKRf
-EPDLKvbdtumwiqTA
-EOcKjvbdmJDsptrB
-EPCjjvbdIGgZxwwg
-EPDLKvbdxLXDgzzG
-DnbkKvbdQwNdCkhD
-DnbjjvbdcasNSAUN
-EPCkKvbdTulQKTaR
-EOcKjvbdhgJbyVjV
-DoDLKvbdKVteceHJ
-DnbjjvbdHgGzYwxH
-EPCjjvbdxnSgxTJD
-EPDKjvbdyYJKCPzL
-EOcKjvbdOFDtJJKd
-EObkKvbdRadEkhxk
-DoCkKvbdiifHjNXr
-DoCjjvbdnUtyjirG
-EObkKvbdJpydoGNe
-DoDKjvbdZLqctOLm
-DnbkKvbdsBfMkfkZ
-EOcLKvbdOStWGeVQ
-EPDLKvbdijGIJmYS
-DoDLKvbdxxJJbQZk
-DncKjvbdHbLydzAD
-EOcLKvbdyTNiMqag
-EPDKjvbdMgComQVL
-DoDLKvbdzitoocsU
-EPDKjvbdsBfMkfjy
-DoCkKvbdFyUtaEYC
-DoDLKvbdJKEAJpGd
-DoCkKvbdygZMAMeX
-EPCkKvbdJqZdoFnF
-DnbkKvbdiBnbdvqR
-EOcLKvbdSQUGjFdX
-DnbkKvbdmSYtzTEJ
-DoCjjvbdehKvSOQg
-EOcLKvbdGckVibJj
-DncKjvbdhficYvJu
-EPDKjvbdwuMeRYkn
-EOcLKvbdFejSNiUR
-EPCjjvbdOFEUJJLE
-DnbkKvbdXsLaMtOx
-EPDKjvbddZyPxYpb
-EPCkKvbdhzVFkqNf
-DoDKjvbdOEdUIiLE
-EPCkKvbdnGeXmOHZ
-EObkKvbdiMEdNuCy
-DoDLKvbddoFTLTtS
-EObkKvbdIxTbHlQp
-DncLKvbdZRMdhmEq
-DoDLKvbdZnmheEyj
-EPDKjvbdKeegbApu
-DncLKvbdNVTSLNAX
-EOcKjvbdKDJbqKCx
-EPCjjvbdFfKSOIsq
-EPCjjvbdxnShYSiD
-EOcLKvbdOStWHFVQ
-DncLKvbdsPvOicWG
-DnbjjvbdxnTHwsJD
-DoDKjvbdLAkGmBwq
-DoCkKvbdwMvAMceN
-EOcLKvbdmRyVZsDi
-EPCkKvbdmpZyWKyC
-DoDLKvbdrykpTBIO
-DoCjjvbdVgwvYHYz
-EPDLKvbdTvMPjUBR
-EOcLKvbdgFkzOGgA
-DnbkKvbdVBBpsRRy
-DnbjjvbdRzKISbvA
-EObjjvbdxnTIXsJD
-EObjjvbdZoOJEdyj
-EPCjjvbdHDjuibKK
-EPCjjvbdezuxdiUX
-EOcKjvbdYTMAmToY
-EObjjvbdJYTbILpp
-DoDKjvbdkClLRHUg
-EPDKjvbdTkvPAvPJ
-EObkKvbdeAURNXjG
-DncLKvbdTukpKUBR
-DoCjjvbdcTDKsdJa
-DoDKjvbdBsAcUGXS
-EObjjvbdDoCjjvcE
-EOcKjvbdtlYWaTaX
-DnbjjvbdRDbaPpcr
-EPCjjvbdrylPsAgn
-DoCkKvbdOhAYZAYa
-DnbjjvbdiUydwSVC
-DoCjjvbdwzIFfYFS
-DoCkKvbdZshiZDrn
-DoCkKvbdZoOIddyj
-DncKjvbdpssgSSKt
-EPCjjvbdrSUkNkBN
-EPDKjvbdjJfIJlxS
-EOcLKvbdxVNFRYkn
-DoDKjvbdWWhwvEFH
-DncLKvbdRDcBQQcr
-DnbkKvbdliETpuRa
-EPCjjvbdZRMdiMeR
-DnbkKvbdiMEdOVCy
-EPCjjvbdznpREbkx
-DoCkKvbdwzIFexFS
-DnbjjvbdmSYuZrdJ
-DoDLKvbdCWzchdov
-EPDLKvbdpfEFTvAh
-EPDLKvbdyOTIYTIc
-DncKjvbdNQXqVnHT
-DoDLKvbdCgMFgAzc
-EOcKjvbdIwtBgkpp
-EPDKjvbdRjyGUfjs
-EObjjvbdACqwjZiQ
-DoDKjvbdpstGrSKt
-DnbkKvbdnGdwmOHZ
-DncKjvbdiZtfLpnG
-DoDLKvbdaSGCgtFk
-DoCkKvbdFfJqnIsq
-EPCkKvbdkNCLzEgP
-EOcKjvbdFeirOJTq
-EOcLKvbdUtNUGMWK
-EObkKvbdSQUHJfEX
-EPCkKvbdqquKmkBN
-DnbjjvbdbhmKKfXY
-DoCkKvbdIsYaTNXl
-DoCjjvbdZoNheFZj
-EOcLKvbdBhjbLIfK
-EOcKjvbdatafwjsh
-DoCjjvbdkxrrSyHU
-EPDLKvbdSCEElIxk
-EOcKjvbdfMevfmKL
-EPCjjvbdMJBlRYAS
-DoCjjvbdSxKkmzkY
-DnbkKvbdkNCLydgP
-EObkKvbdkxsSTZHU
-DoCjjvbdRpUGiedX
-EOcKjvbdjblLRGuH
-EObkKvbdyTNiMrCH
-DnbjjvbdZeXfzhJC
-DoDKjvbdZxdJmblS
-DncKjvbdOStWHEuQ
-DoCkKvbdyNsHwsIc
-EPDKjvbdkxrqryHU
-EObjjvbdZLqctNlN
-DoDLKvbdxnSgxShc
-EPDLKvbdnBjWwoNu
-DoDKjvbdkIHMGGOL
-EObjjvbdqUUGrRkU
-DncLKvbdRjyGVHKs
-EPDKjvbdhfjCyWJu
-EPCkKvbdHELVjBjK
-DncKjvbdgQBzvcwh
-DoDLKvbdVAaqSpqy
-DoCkKvbdySnJNSBg
-DoDLKvbdpeceUWAh
-DncLKvbdaRebgsfL
-EOcKjvbdZLqctNlN
-EObjjvbdtbbtvvPP
-DoCkKvbdZMSDtNlN
-EOcKjvbdsBelkfjy
-EPDLKvbdTpqPVVIN
-DnbjjvbdBiKbKhfK
-DnbjjvbdOFEUIiKd
-EPCkKvbdSiZjRAAl
-EObkKvbdwjwDgzyf
-EPCjjvbdhlEdNtby
-EPCjjvbdhtydwSUb
-EOcKjvbdnQZyVjyC
-DoDKjvbdRzKIScWA
-EOcLKvbdLBLHNCXq
-DoDLKvbdssSTYzFD
-EObjjvbdEvYpPlie
-DncLKvbdhficYvKV
-EPCjjvbdnUuZkJqf
-DnbjjvbdXnRAXtut
-EPDKjvbddijRutzn
-EOcLKvbdEvYpPljF
-DoCjjvbdTulQKUAq
-EObkKvbdxmsIYShc
-EPDLKvbdkyTRryHU
-EObjjvbdCEQAvKNG
-EObjjvbdGYuVBEYC
-EPDKjvbdvAdYsOeI
-EObjjvbdRpUHKGEX
-EPCkKvbdKDJcQjDY
-DoDLKvbdunszqKoU
-DoCjjvbdJvUfEEfi
-DncLKvbdrpWPJcWG
-DoCkKvbdajkfPNcA
-DnbjjvbdFpATXHFy
-EObkKvbdFfJrOJTq
-DncLKvbdZnnJFEyj
-DoCjjvbdOEctIiKd
-EPDLKvbdVhXuxGxz
-EPDKjvbdySmhlrCH
-EOcKjvbdiGjDZWJu
-DncKjvbddZyQYZRC
-DncLKvbdziuPpETU
-DncLKvbdJTYaTNXl
-EPCjjvbdNddThiKd
-DnbkKvbdbAudepPw
-EOcKjvbdMowpunHT
-DoDLKvbdmbKXYPNu
-DoDLKvbdezvZEiTw
-DnbjjvbdrMyixkgi
-DnbkKvbdKWVGEFGi
-DoCjjvbdkDLjpftg
-DnbjjvbdJqZePFme
-EObkKvbdDwxLsssl
-EPCjjvbdmoyyWLYb
-EPCkKvbdFjdrcHmV
-DoCkKvbdDwxLtTsl
-EOcLKvbdoAKztHdO
-EPDLKvbdTkuoAuoJ
-DncLKvbdURRPVVHm
-EPCkKvbdKCicRJcY
-DoCkKvbduDCuXWOo
-DoCjjvbdRXNdDMID
-DoDKjvbdBcpBWJlf
-DoCjjvbdTqROttgm
-DncKjvbdRadFMIxk
-DoDLKvbdCSaDTewS
-EOcKjvbdQlxCYmtz
-DncLKvbdeOeSkUTr
-DnbkKvbdTqQntthN
-DnbjjvbdhbObdvpq
-EPDLKvbdMowqVmgT
-DncKjvbdANIZTWzY
-EPDLKvbdiVZeXRtb
-DncLKvbdYNqAXtvU
-EOcKjvbdfIKurNpg
-DoCkKvbdFpATWfey
-EPCjjvbdHkazmwRL
-DoDKjvbdJvUfDdgJ
-EPCkKvbdSBdElIxk
-DoCkKvbdbsCjtEJa
-DoDLKvbdvBEYsOdh
-EOcLKvbdGGJqmhsq
-EOcLKvbdJSyBSlxM
-DncLKvbdnQZxukZC
-EOcLKvbdySnIlrCH
-DoCjjvbdIjEAKPgE
-DoDLKvbdhlEcnVDZ
-EPDKjvbdZeYGzghb
-EPDKjvbdbKlGOnDA
-EPDKjvbdkMbMZdgP
-EOcLKvbdDoCkKwCd
-DnbjjvbdLBLGlbXq
-EPDLKvbdZxcinCkr
-DoCkKvbdqTsfrRjt
-DoCkKvbdADSYJzIp
-DoDKjvbdbUagYKsh
-EObjjvbdjAQHAofj
-EOcKjvbdDoDKkXDE
-EPDKjvbdSZigsCvA
-EPCkKvbdKRZePGOF
-EPCjjvbdKaKgNCXq
-EObkKvbdxxJKBoyk
-EOcKjvbdxmrgwsIc
-DnbkKvbdmozYvKyC
-DoCkKvbdqquLOLAm
-EObkKvbdDncLLXCd
-EPDLKvbdjcMKpftg
-EPCjjvbdwkXDgzzG
-DoDLKvbdHffyxwwg
-DoCkKvbdvAdZSneI
-EOcLKvbdrovOjDVf
-EOcLKvbdsPuoJbuf
-DoDLKvbdySnJNSBg
-EObkKvbdXsMAltOx
-DncLKvbdFfKSOJTq
-EPCkKvbdddnrCWcK
-DoCjjvbdySmhlrBg
-DnbjjvbdNxPVzcnU
-DncKjvbdhtzEvrVC
-DoCjjvbdQwODblHc
-DoDLKvbdjcLjpgVH
-EOcLKvbdbKlGOmcA
-EPDKjvbdfMfWflik
-DncKjvbdmbJwXnmu
-EOcLKvbdTkuoAvOi
-DnbjjvbdsZkoraIO
-DoDKjvbdZMSEUOLm
-EOcLKvbdsCFmLfkZ
-DncKjvbdUxhTyjnn
-EPDKjvbdRosfjGEX
-EOcLKvbdmuUzKirG
-EPCkKvbdGGJrOItR
-EObjjvbdEXwktUUM
-DnbkKvbdiifHimXr
-EPDKjvbdmJDspuSB
-EObjjvbdwyhGFwdr
-DncKjvbdatafwkUI
-EPDLKvbdYNqAXtut
-DoDLKvbdEPCkLWcE
-EOcLKvbdqceJQOWB
-EPDKjvbdySnJNSBg
-DnbjjvbdyzdnSIIh
-DoDKjvbdrDdiQNvB
-DoCkKvbdYkqdTnLm
-DoCkKvbdlZTSTYgU
-EPDKjvbdMpXqWNfs
-EObkKvbdJbicQjDY
-DoDLKvbdGAoRYizm
-DncKjvbdmgExNOHZ
-DoCjjvbdznoqFDLx
-EOcKjvbdieLGtoAO
-DoCjjvbdMfbpMotk
-EObkKvbdyzdnSHiI
-EObkKvbdcSbjscia
-DoDKjvbdNGcQNQUk
-EPDKjvbdNGbpMpVL
-DoDLKvbdUQqPVUgm
-DnbjjvbdVvhwuceH
-EPDKjvbdDxXkstTl
-EPCjjvbdPyNAHTRj
-EPDLKvbdeOdsLTtS
-DoDKjvbdTAEiICPE
-DoDKjvbdZisIQGaf
-EObkKvbdxVMdpxkn
-EPCkKvbdnUtzKjRf
-EOcKjvbdhtydvrVC
-DoDKjvbdbrcLTcia
-EPDLKvbdbhlikFvx
-EPDKjvbdANIZSwZx
-EPDKjvbdtbbuXWOo
-EObjjvbdliDtQtqa
-DncLKvbdGLFScIMu
-DnbkKvbdfMfXGljL
-EObkKvbdCTBDTewS
-EPDKjvbdSiZiqAAl
-EOcKjvbdFfKSNhsq
-EPCjjvbdyYJKBpZk
-DncKjvbdAMgyTWyx
-DnbkKvbdpaJFAXIE
-EOcKjvbdEYYMUUTl
-EPCjjvbdeFOrBvcK
-DoDLKvbdptUHSRkU
-DoCkKvbdOYPVzcnU
-DnbjjvbdijFhKMxS
-DnbkKvbdEKHivXjA
-DncLKvbdsPvOicVf
-DoCjjvbdmbJvxOmu
-EOcKjvbdDxYMUUTl
-DoDKjvbdZtIhxdTO
-DncKjvbdTlVoAuoJ
-DoDKjvbdFyUuBDwb
-EObkKvbdQYmAGsSK
-DnbkKvbduLwwAsaX
-EPDKjvbdegkWRmpg
-EPDLKvbdRDcAoqDr
-DoCjjvbdFWZPolie
-DoCkKvbdbhmJkGWx
-DncLKvbdrWpMDJYq
-DnbjjvbdaaWEeoow
-DoDLKvbdzHYlANFX
-DoCkKvbdjFLHUoAO
-DnbjjvbdZyEKNbkr
-DoDKjvbdLrXMyuQz
-EPDLKvbdwNWAMdFN
-DoCkKvbdkWXODaxX
-EOcKjvbdraelkgKy
-EOcLKvbdmSZVZsDi
-EPCjjvbdkMbLzEfo
-EObjjvbdaSFbgtFk
-EObkKvbdmIctRUqa
-DncKjvbdhtydvquC
-EPDKjvbdZoOJEeZj
-DoDLKvbdyXiJaozL
-EOcLKvbdVwIxWEFH
-DnbkKvbdYpmFJMdq
-EPDLKvbdjKGIKMwr
-EPCkKvbdFpASwHGZ
-DncKjvbdKQzEnfNe
-DoDLKvbdkVwODaxX
-EPCjjvbdzaAOffal
-EObjjvbdnHEwlnGy
-DncLKvbdLqwMyuQz
-EPCkKvbdWRnXaeMD
-DoCkKvbdcbSlrAUN
-EPDKjvbdMJBlRYAS
-EOcLKvbdZxcimbkr
-DncLKvbdCDpBVimG
-DoDKjvbdGdKvKBjK
-EPDLKvbdziuPodSt
-DnbkKvbdbrbjtEKB
-EOcLKvbdmIcsptqa
-EPDKjvbdMRwMyuQz
-DoDLKvbdfHkVrNqH
-DnbkKvbdLZRKSzuG
-EPDKjvbdTfzmkwWF
-EOcLKvbdSKxeuHLT
-EPDLKvbdkHgLfGNk
-DoDLKvbdVhXuxHYz
-EOcKjvbdkHgMGGOL
-DoDKjvbdEARhmZvw
-EPDLKvbdjKFgimXr
-EObkKvbdSQUGiecw
-EPCjjvbdjKFhJlxS
-DoDKjvbdDxXlTtUM
-EPDLKvbdelfWgMik
-EOcKjvbdtcDVXWOo
-DoDKjvbdiZuFlRNf
-DoCkKvbdsBellHKy
-EPCkKvbdjlbLyeGo
-EOcKjvbdhfibxujV
-EObjjvbdhyuGMROG
-DoDLKvbdgQBzvdYI
-DoDKjvbdeATpmXjG
-EPDLKvbdjKFgilxS
-DoDKjvbdrpWPJbuf
-DncLKvbdDncLKvcE
-DoCkKvbdkVvmdCXw
-DncLKvbdGcjujCJj
-DncLKvbdpxngfpcx
-DnbjjvbdiCPCdwQq
-EPDLKvbdijFhJlwr
-DncKjvbdhgJbxvKV
-EPCjjvbdZxcjNbkr
-DncKjvbdZQleJMdq
-DncLKvbdyfxlAMeX
-EPCjjvbdFfJrNiUR
-EPDLKvbdzjVQPdSt
-DoDLKvbdjAQHBPfj
-EObjjvbdZoOJFEzK
-EObkKvbdFpATWgGZ
-EPDKjvbdvAcxrneI
-DoDLKvbdxrnJMrCH
-DoCkKvbdjmCLydfo
-EPCkKvbdegjuqmqH
-DoCkKvbdSBdFLiZL
-EObkKvbdbAvFFopX
-DncLKvbdGQASwGey
-DnbkKvbdQccAopdS
-EPCkKvbdZshiYdSn
-EPCjjvbdHDjujCKK
-EObjjvbduDDVWuno
-DoCjjvbdzjVQQDsU
-EOcLKvbdeFOqavcK
-DoDLKvbdyXhibPzL
-DoDLKvbdrzMPsAgn
-EObkKvbdUtNTfMWK
-EOcLKvbdLqwNZuQz
-EPDKjvbdqBJFAXHd
-DoCkKvbdnUuZkKSG
-DoCjjvbdZHXEAOsJ
-DncKjvbdQdDBPpcr
-DnbkKvbdCIkBkIej
-DnbkKvbdMgDPmQUk
-DnbkKvbdxxIjCPyk
-DnbjjvbdZsiIxdSn
-DoCkKvbdADRxJzJQ
-EObjjvbdkxsSTZHU
-DncKjvbdWXIxVdEg
-DnbjjvbdLrWmZtpz
-EPDKjvbdhzUelQnG
-DoDLKvbdSBceLhxk
-EObjjvbdWIXvYGxz
-EPDKjvbdEYXktUUM
-EObkKvbdhlFENtby
-EPDLKvbdNwnuzcmt
-EOcKjvbdaaWEfPpX
-DncLKvbdddoSCWcK
-EPDKjvbdmaiwXnnV
-DoDLKvbdMgDQMpUk
-DoDLKvbdjFKfuPAO
-DncLKvbdnGeYMmfy
-DncLKvbdrSUjmkAm
-EOcLKvbdfHkWRnQg
-DnbjjvbdnCKWxPNu
-DnbjjvbdraemLgKy
-EObkKvbdWWiYWDdg
-DoCkKvbdKfFgaaQu
-EPCkKvbdaSFcIUGL
-EOcKjvbdkxrqryHU
-DncKjvbdRDbaQQcr
-DncLKvbdbVBgXjtI
-DoCjjvbdqZPHfqDx
-DnbkKvbdcyxowxpb
-EPCkKvbdWXIxWDeH
-DoCkKvbdyXiKBozL
-DnbkKvbdlZSrTYft
-EObjjvbdGdKujBij
-DnbjjvbdtcDVXWPP
-DoDKjvbdZnmhddyj
-EObkKvbdTukoisaR
-EObkKvbdzoPqFCkx
-DncLKvbdLhalQxAS
-EPCkKvbdVwIwudFH
-DoDKjvbdjKGIKNYS
-DoDLKvbdjhHLeenL
-EPDKjvbdJTZBSlxM
-DoCjjvbdFaOqZJzm
-DoDLKvbdnBjXXnnV
-DoCjjvbdeFPSCXDK
-EPCjjvbdbAvFGPow
-DnbkKvbdVwIwvEFH
-EObjjvbdqUTfrSLU
-DncKjvbdqlyixkhJ
-DoDKjvbdSLZFuGjs
-DncLKvbdsCGNLfkZ
-EPDLKvbdaofgDkzd
-DoCkKvbddiirWUzn
-EOcKjvbduCcVWuno
-DnbkKvbdSPsfjGDw
-DoCkKvbdFWYpQMie
-DoDLKvbdRECaQRES
-EPDLKvbdhfibyVjV
-DnbjjvbdqTsgSSLU
-EObkKvbdrXQMChyR
-DncLKvbdNrtVfduQ
-EObjjvbdiUzEvqtb
-DncKjvbdUaCQsRRy
-EPCjjvbdRbEEkiYk
-DncKjvbdUtNUGMVj
-EPCjjvbdzHYlAMeX
-EPCkKvbdeEoRbXCj
-DoDLKvbdcScLUDia
-DoDLKvbdtbbuWuno
-EOcKjvbdbUafwkTh
-DoCjjvbdtcDVXWOo
-EOcKjvbdHgGyxxYH
-EOcLKvbdWSOXbEkc
-DoCkKvbdKeehCBRV
-DncLKvbdMgComQVL
-DoDKjvbdUMVoBVoJ
-DoCjjvbdzoQRFCkx
-DoCkKvbdUWMQJsaR
-DnbjjvbdkNCLydgP
-EOcKjvbdmozYvKyC
-DnbkKvbdmgExMnGy
-DncKjvbdznpQeDMY
-DoDKjvbdZxcjNbkr
-EOcKjvbdqdEiQNua
-EPDLKvbdfHkVrNpg
-DnbkKvbdXsMBMsoY
-EObkKvbdcJNKLGXY
-EPDLKvbdVqmwbEkc
-EPCkKvbdJcJbpibx
-EObjjvbdYNqAXtvU
-EObkKvbdjAQHApGj
-EPDKjvbdrbFmMHLZ
-DnbkKvbdPIAXyAYa
-DoDKjvbdSLZGVHLT
-DoCkKvbdDnbkLWcE
-DncKjvbdzoPpeDMY
-EPDKjvbdQwNdDLhD
-EPDKjvbdhfjCxuiu
-DoCjjvbdajkenmcA
-EPDKjvbdtTSTYyeD
-DoCjjvbdijFhKMwr
-DoDLKvbdpfDeTuaI
-EPCjjvbdJXtCHlQp
-EOcKjvbdjbkkRGuH
-EObkKvbdVTlselWK
-DoCkKvbdauCHXkTh
-DnbjjvbdSLZGVGjs
-DoDLKvbdehLWRmqH
-DncKjvbdSBdFLhyL
-DoDLKvbdmajXYPOV
-EOcKjvbdpeceTvAh
-EPCjjvbdNdctIhkE
-EOcLKvbduWNwjQsA
-DoCjjvbdtvOYKRTA
-DncKjvbdqiAJeNOe
-DnbjjvbdUtNUGLvK
-EPDKjvbdMgColotk
-EOcKjvbdQlxCZNtz
-DoDKjvbdmfdwmNfy
-EPDKjvbdrovPKDVf
-DnbjjvbdDjIJuwjA
-EPCjjvbdsBfNMHLZ
-DoCjjvbdJbjDRJcY
-EPDLKvbdZRMeJNEq
-EPCkKvbdRkYfVGkT
-DncLKvbdRbDeLiYk
-EPCjjvbdqiAJdloF
-DoCjjvbdFyVUaDwb
-DoCjjvbdMRvmZtpz
-DoDLKvbdGQATWffZ
-EPCjjvbdwtmFQyMO
-EOcKjvbdTIzKRAAl
-DoCkKvbdsQVnicVf
-DoDLKvbdFfKRmhtR
-EOcKjvbdsCFmLfjy
-DoDKjvbdddnqbXDK
-DoDKjvbdYgWdAOri
-DoCkKvbdmuUyjjSG
-EObkKvbdhficYvJu
-DoCkKvbdQlxCZNtz
-EPCkKvbdGZVUaEXb
-DncLKvbdEXxMTtTl
-DoDKjvbdGFirNiUR
-EPCjjvbdpssgRrLU
-EObkKvbdVZHsykOn
-DncKjvbdyTOJMrBg
-EOcKjvbdRacdlIyL
-EObkKvbdiCOcFWqR
-DoDLKvbdRjxfVGkT
-EOcLKvbdiBncFXQq
-DncLKvbdnQZxukYb
-DoDKjvbdpaIeAWgd
-DncKjvbdVqnYCEkc
-DnbjjvbdZRMdhmEq
-EPCjjvbdhgKDYuiu
-EOcLKvbdCIkBjhfK
-EPCkKvbdZnmhdeZj
-EOcKjvbdTppnuUhN
-EOcLKvbdbVBfxKsh
-EPDKjvbdFVxpQNKF
-DnbjjvbdjvWnDaxX
-EObjjvbdANIYrwZx
-EObjjvbdauCHXjtI
-EObkKvbdZirgpGaf
-EObjjvbduoTzqLPU
-DoDLKvbdxZhFeweS
-DoCjjvbdILaznWqL
-DncLKvbdaMkBrtlg
-EObjjvbdNrtVgFUp
-DnbkKvbdRzKHsCvA
-DoCkKvbdiZuFkpnG
-DnbkKvbdEztRElDJ
-EPCjjvbdRECaQQdS
-EPCjjvbdqqtkNkAm
-EObkKvbdyNrhXriD
-DoDLKvbdegkWRmqH
-DncKjvbdNQXqWNfs
-DoDLKvbdRadFLhxk
-EPDKjvbdxUmFQyLn
-EPCjjvbdxxJKBoyk
-EObkKvbdnVUzLJqf
-DnbjjvbdSQUGiedX
-DncLKvbdrpVnjCvG
-DoDKjvbdZirgpGbG
-DncKjvbdOAJTUJrA
-DnbjjvbdUyHsyjoO
-EPDKjvbdfpBzvdXh
-EPCjjvbdyTNhlqag
-DncKjvbdLBKflaxR
-DoCjjvbdVwJXvEEg
-EOcKjvbdVqnXadlD
-DoDKjvbdyNrgxSiD
-EObjjvbdnVVZjjRf
-DnbjjvbdFeiqmiTq
-EObkKvbdFVxpQMie
-DnbkKvbdIBkydzAD
-EPCkKvbdZjTHofaf
-DncLKvbdnPzYukZC
-EObkKvbdLYqKSzuG
-Dnbjjvbdxmrgwrhc
-EObkKvbdTkuoBWOi
-EObkKvbdIrxaSlxM
-EOcLKvbdJqZeOfOF
-DoCjjvbdBhjbKiFj
-EPCkKvbdrDeJPnVa
-EPCkKvbdNwoVzcnU
-EOcLKvbdXmqAYVWU
-EPCkKvbdZeYGzhJC
-EOcKjvbdNddUIhjd
-DoDKjvbdjggLeemk
-EObkKvbdxZgefXeS
-EOcKjvbdgFkzOGgA
-EObkKvbdNdcsiIkE
-EPDKjvbdbiMikFwY
-EPDKjvbdelfWfmJk
-EOcKjvbdHELWJajK
-DoDLKvbdZRMeIldq
-EOcLKvbdRXNccMHc
-EPCkKvbdQlxCZNtz
-DoCkKvbdyTOJMqag
-EPDLKvbdCTAcTevr
-EOcKjvbdrpVnicWG
-DnbkKvbdZLrETmkm
-EOcLKvbdRpTfifEX
-DnbjjvbdQcbaPqDr
-DoCkKvbdEuxpQNKF
-EPCjjvbdNeEThiKd
-EPDKjvbdVYgtZjoO
-DoCjjvbdZRMdhleR
-DoCjjvbdZsiIyDrn
-EPDLKvbdaSGCgtGL
-EPDLKvbdqTtGqrKt
-DoCkKvbdnVUzKjSG
-EPCjjvbdzQoMiJwA
-EPDKjvbdXrlBMtOx
-DoCjjvbdNHColpVL
-EObkKvbdXnRAXuVt
-EObjjvbdMJCMQxAS
-EObkKvbdIrxaTMxM
-DnbjjvbdbAudfQQX
-DnbkKvbdnCKXYOmu
-DoDKjvbdEXxMUUTl
-EObkKvbdyXhiaozL
-EObjjvbdEJhKVwjA
-EOcKjvbdpfEFTuaI
-EOcKjvbdbVCHYLTh
-DncLKvbdyqOliJwA
-EOcKjvbdkxrqsZHU
-DncKjvbdDjHjVwjA
-EPCkKvbdkDMLQfuH
-EPCjjvbdUVlPjUBR
-DoDLKvbdjJfHimXr
-DoCkKvbdEuxooljF
-DoDLKvbdYzcGRjWZ
-DoDKjvbdwyhGGYFS
-DnbkKvbdsrrSxyeD
-EPCkKvbdxmrhXrhc
-EPDKjvbdDjHivXjA
-EObkKvbdfMfXGlik
-EPDLKvbdGdKvKBij
-DoCkKvbdbLMGOmcA
-EPCkKvbdRXNdDLgc
-EPCjjvbdZsiIxcrn
-DoDKjvbdpyPIGqEY
-EPDKjvbdlZTRryHU
-DoDKjvbdUslsekvK
-DncKjvbdKfFhCBQu
-DncLKvbdSCDeMIyL
-EPDKjvbdJcJcRJcY
-DoDLKvbdraellHLZ
-EPCjjvbduDCtwWPP
-DnbkKvbdBdPaWJlf
-EPCkKvbdqFceUVaI
-DnbkKvbdcyxoxYqC
-DnbkKvbdlYsSTYft
-EObjjvbdZHXEAOsJ
-EObjjvbdURROtuHm
-EPCjjvbdZLrDsnMN
-EPCjjvbdfIKvRmpg
-EPDLKvbdwWlBVaVu
-EObkKvbdZMSDsmkm
-EPDKjvbdKNAEZfuB
-DnbjjvbdhyuGMROG
-EObjjvbdJuuGDdgJ
-EPDLKvbdgQBzwDxI
-EObjjvbdjvXNdCXw
-EPCjjvbdlZSrSyGt
-DoDKjvbdXsLaMsnx
-DoDLKvbdTlVoAuoJ
-DnbkKvbdptUGrSLU
-EObkKvbdEztRFMCi
-EOcLKvbdTkvOaVoJ
-EObkKvbdDoCjjwCd
-EPCkKvbdTfznLwVe
-EObkKvbdRjyGUfjs
-EPDKjvbdVviXvEFH
-DnbjjvbdKkBIWAKZ
-EOcLKvbdqFdFUVaI
-EOcLKvbdBhjakJFj
-DncKjvbdauBgYKsh
-DnbjjvbdxKvdHzyf
-DoCjjvbdxVMdqYlO
-EPCjjvbdEPDLLXDE
-EPDLKvbdVvhwucdg
-DncKjvbdaRfDITfL
-EPDKjvbdfpBzvcxI
-DoCkKvbdGLFTDHmV
-DoDLKvbdcTDKtDjB
-DnbkKvbdZRMeIldq
-EObjjvbdRjyGVGkT
-EPCjjvbdlhctRVRa
-DnbjjvbdyXhibPzL
-DnbjjvbdFpASvgFy
-DnbjjvbdKCicRJcY
-DnbkKvbdPxmAGrrK
-EPCjjvbdpstHSSKt
-EObkKvbdiZtelQnG
-DoDLKvbdKkAgvAJy
-EObjjvbdsPvPKCuf
-EOcLKvbdhyuGLqOG
-EPDLKvbdyOSgxShc
-EObkKvbdmJDsptqa
-EPCjjvbdbVCHYKtI
-DoCkKvbdCJLBkIfK
-EPDKjvbdTqQnuUgm
-EOcLKvbdypnmIjXA
-DoDLKvbdiLddOUby
-DoCkKvbdaSFbgtGL
-EPDLKvbdraellGjy
-EObkKvbdWRmwbEkc
-EPCjjvbdDoDLKvcE
-DnbjjvbdjEjfuPAO
-DnbjjvbdqvokbiYq
-DnbkKvbdVZITzLOn
-EPDKjvbdUWLpJtAq
-EObkKvbdwtmFQyMO
-DoDLKvbdFWZQPmKF
-EPDKjvbdLBKgMawq
-DncLKvbdANIYsWyx
-EObkKvbdqvolDJYq
-EOcKjvbdQlwbZOUz
-EPCkKvbdlqyUzTEJ
-EPCkKvbdSLYfUgKs
-DoCjjvbdRotHJfEX
-EOcKjvbdrXQMCiZR
-DncLKvbdaofgELzd
-DoDKjvbdehKvSNqH
-EPCkKvbdzaAOfgBl
-DoCkKvbdVUMsfMVj
-DoDLKvbdUGznLwVe
-EPDLKvbdDoDKjwDE
-DoCjjvbdANHxsXZx
-EPCkKvbdJpydnenF
-EPCjjvbdtTRsZZeD
-DoDLKvbdnQZyWLZC
-EPCkKvbdKNADyfta
-EPCkKvbdUVlPjTaR
-DncLKvbdeOeSjstS
-DncKjvbdXrlAmUOx
-DoCkKvbdxnTIXrhc
-EPDLKvbdZjTIQGaf
-DoCjjvbdPxmAGrrK
-EPDKjvbdLZQirztf
-DoDLKvbdkHflGFnL
-DoCjjvbdiMFEOUby
-DnbjjvbdhaoDFXQq
-EPCkKvbdyzeNqhIh
-EPDKjvbdbUbGwkUI
-DoCkKvbdEXxLsstM
-DoDLKvbdaRebhUGL
-EObjjvbdMfbpNQUk
-DoDLKvbdCEQAuilf
-EObjjvbdMowpunHT
-DoDLKvbdzHYlAMeX
-DoCkKvbdegkVqnQg
-DnbkKvbdwWlAuaVu
-DncKjvbdFfJqnItR
-EObjjvbdZjTHpHBf
-EPCkKvbdbsDKtEJa
-EOcLKvbdZtIiZESn
-DoDLKvbdpxoIHRDx
-EPDLKvbdTpqOtuIN
-DnbjjvbdmoyxvKxb
-DncKjvbdqGEEtWBI
-EPCkKvbdQwNdClHc
-DoCkKvbdHELViajK
-EPDLKvbdCJLBkIfK
-EPDLKvbdvwMBWBVu
-EPDKjvbdxrmiNRag
-EOcKjvbdxVMeQyLn
-DoCkKvbdraelkgLZ
-EPCjjvbddndsLUUS
-DoCjjvbdhgKDYvKV
-EPDKjvbdBiKbKiFj
-DncKjvbdKkBIWAKZ
-DnbjjvbdjlakzEgP
-EObjjvbdNrtWGeUp
-EPDKjvbdidkGuPAO
-DnbkKvbdjAQHBPgK
-DoCkKvbdUxgtZkPO
-DoDLKvbdDoCkLXDE
-DoDLKvbdkVvmcaxX
-EPCkKvbdmfeXmOHZ
-DoCjjvbdHDkWJajK
-DoDLKvbdkHgMGFnL
-EObjjvbdBdQAuilf
-EPDKjvbdxUleQxlO
-DoDKjvbdJbjDRJcY
-EPDKjvbdXsMAltOx
-EOcKjvbdIrxaSmXl
-DoDLKvbdyYJJbQZk
-DoDLKvbdQlwaxnUz
-EObkKvbdqvpMDIyR
-DoCkKvbdhzVGLpnG
-DncKjvbdJKEAJofd
-EOcLKvbdZLrETnLm
-DncKjvbdQvnDcMID
-EPDLKvbdiLddOUby
-EOcKjvbdeJiqvUzn
-DnbjjvbdsBemMGkZ
-EPCkKvbddtAUASmW
-EPCjjvbdiLeEOVCy
-EPDKjvbdkxrrSyHU
-DoCjjvbdURQoVUhN
-EOcKjvbdtkwwBUBX
-EOcKjvbddeOqawCj
-EOcKjvbdbAvEfPow
-EPCkKvbdzROmIjXA
-EObjjvbdKDKCpibx
-EPDKjvbdIGfyyYXg
-EOcLKvbdeOdsKssr
-EOcKjvbdsBelkgKy
-DoDKjvbdJYUCIMRQ
-EOcLKvbdjcMLQgVH
-EOcLKvbdJTYaSmXl
-DoDLKvbdNddUJIkE
-DoDLKvbdFjdsChNV
-DnbjjvbdmttyjjSG
-EPDLKvbdVgwuxHYz
-EOcLKvbdsCGMkfjy
-EOcKjvbdKWVGDeHJ
-EPDLKvbdjJegjMwr
-DoCkKvbdNHDQMotk
-DoDLKvbdjmBkydgP
-DnbkKvbdSLZFtfjs
-EPDKjvbdjbkjpfuH
-EObjjvbdkVwNdBww
-DncKjvbdFxtuBEYC
-EPCkKvbdrMzJxkhJ
-DoDLKvbdptUGrSKt
-EOcKjvbdhzUelQnG
-EObkKvbdsQVoKCuf
-DoCkKvbdzitpPcsU
-DoCkKvbdySnJMqag
-DncKjvbdZRMeImFR
-EObkKvbdYzcFrKVy
-DoDKjvbdrNZjZMIJ
-EPCkKvbdEvYoolie
-EOcLKvbdLBKgNCXq
-DnbkKvbdrpVnjDWG
-EObkKvbdLLBHvAJy
-DoCkKvbdqmZixkgi
-DoCjjvbdhytfLpmf
-DnbkKvbdVZHsyjoO
-EObkKvbdWWhxWEEg
-EObkKvbdhfjDZWJu
-DoCjjvbdZoOIddzK
-DoCjjvbdCDoaWJmG
-DoCkKvbdzitoocrt
-EOcLKvbdOSsvGduQ
-EOcLKvbdVqnXbElD
-EPDKjvbdgFlZnHHA
-EOcKjvbdUsltFkvK
-EPCkKvbdePFSkTsr
-EPCkKvbdssSTYzFD
-EOcLKvbdVTlselWK
-DncKjvbdZRMeJMdq
-EOcKjvbdYSlAlsnx
-DncLKvbdSZihTDWA
-DnbjjvbdvvlBWAuu
-EOcLKvbdEvZPoljF
-EPDKjvbdHELWJbJj
-DoDKjvbdDjHiuxKA
-DncLKvbdrMyjYkgi
-EOcLKvbdRbDdlIxk
-DoDLKvbdFVyQQMie
-EOcLKvbdZxdJmcMS
-EPDKjvbdFejRmiUR
-EPCjjvbdnPyxujxb
-DoCkKvbdjKGIKNXr
-DoCjjvbdYSlBNUPY
-DoDLKvbdZshiZDsO
-EPDLKvbdkyTRsYft
-DncKjvbdJbicQicY
-DoCkKvbdXGZZtAOs
-DnbkKvbdZjSgpGbG
-DncKjvbdWSOYBeMD
-DoDLKvbdKNADyfta
-DoDLKvbdLBKgMbYR
-EObjjvbdNddThhkE
-EPCjjvbdQdCaPqES
-DnbkKvbdvBDySoFI
-EPCkKvbdDoDLLWcE
-DncLKvbdaSGDHtGL
-EObkKvbdKNADzGta
-DncLKvbdTAFJHaoE
-EOcLKvbdTAFJIBoE
-DoDLKvbdUtNTelWK
-EPCkKvbdKefICApu
-EObkKvbdySmhlqbH
-EPDLKvbduaEYroFI
-DnbjjvbdSKxfVHLT
-EObkKvbdhkdcnVDZ
-DnbkKvbdCSaDTevr
-DoCkKvbdiBoCeXQq
-DncLKvbdZjShQGaf
-EPCkKvbdIwsagkqQ
-DnbkKvbdnCKWwoNu
-DncKjvbdelfWgNJk
-EOcLKvbdSPtHKFcw
-EObjjvbdZRNEhleR
-DoCkKvbdbLMGPNcA
-DoCkKvbdRkZFtfjs
-EOcLKvbdySmhmSBg
-DoCkKvbdWHxVwgYz
-EObjjvbdURQntuHm
-EPDKjvbdySnJMqbH
-EOcLKvbdOStWHEtp
-EPCjjvbdeOeTKstS
-DncLKvbdssRsZZdc
-EObjjvbdrovPKCuf
-EPDKjvbdiZuFkqOG
-DncLKvbdsBfNLfjy
-EOcLKvbdCDpAujNG
-EPDKjvbdOSsugFUp
-DoDLKvbdNQYRVmfs
-EOcLKvbdTAEiHaoE
-DoCjjvbdEPDKjwDE
-EPCkKvbdqUUGqqkU
-EPDKjvbdtbcVXVoP
-DnbjjvbdhbOcEvqR
-EOcKjvbdCTAcUGWr
-EPCkKvbdQdDApQcr
-DnbjjvbdTfznLwWF
-DnbkKvbdCDoaVjMf
-EPCjjvbdBsBDUFvr
-EPCkKvbdWWiXuceH
-DoCjjvbdJcJcRJbx
-DoDLKvbdsCGMlHKy
-EPCjjvbdSBceLhyL
-DoDKjvbdHffzZYYH
-EPCkKvbdvAdZTOeI
-DnbkKvbdxwhjBpZk
-DncKjvbdOFDtIhjd
-DoCjjvbdmpZxujxb
-EOcKjvbdIryAsMwl
-EPCkKvbdTqQnuUhN
-DncKjvbdOSsvHEtp
-EPDLKvbdZoOIdeZj
-DnbkKvbdKeegbAqV
-EPCjjvbdqFceUWAh
-DnbkKvbdCWzchdpW
-EPCkKvbdzQnlhiwA
-DoDLKvbdqdEiQNua
-DncKjvbdddoRawCj
-EPDLKvbdlYrrSxft
-DnbkKvbdRWnECkgc
-DncKjvbdGYuUaEYC
-EPDLKvbdZsiIxcrn
-DoCjjvbdJbibqJbx
-EPDKjvbdGYtuBDxC
-DnbjjvbdCEQAvKMf
-EObjjvbdvAcyTPEh
-DoCkKvbdxwhjBozL
-DoDKjvbdNsTugFVQ
-DoDKjvbdkHgLeemk
-EOcLKvbdwWlBVaWV
-EOcLKvbdrNZjYkgi
-DnbkKvbdJYUBglRQ
-DnbkKvbdjvWmdCXw
-EObjjvbdmajXYPOV
-DncKjvbdDihJuxKA
-EPCjjvbdwzIGGYFS
-DoDKjvbdMpYQvOHT
-DncLKvbdbhljLFwY
-EObjjvbdelevgMik
-DnbjjvbddePSCWbj
-DnbjjvbdKQydnenF
-DnbkKvbdZQmEhmFR
-DoDKjvbdjKFgimYS
-EObjjvbdANIZSvyx
-DoCjjvbdfHkWRnRH
-EObkKvbddiiqutzn
-EOcKjvbdqYnhHQdY
-DoDKjvbdKCjDQjCx
-DoDLKvbdjgflFfNk
-EOcLKvbdtTRrxzEc
-DnbkKvbduLwwBUAw
-DncLKvbdkWXOEBxX
-EPDKjvbdNxPVzcnU
-EPCjjvbdUMVnaWOi
-EObkKvbdZQmFImEq
-DncLKvbdQvmdDMID
-EObjjvbdGFjSNhsq
-EOcLKvbdbAvFFpQX
-DoCjjvbdkCkjqGuH
-EPCkKvbdbLLeoNcA
-DoDLKvbdemFwGmJk
-EOcKjvbdVUMtFlWK
-EPDLKvbdWXJXucdg
-DncLKvbdqcdhpNua
-DncLKvbdGYuUaDxC
-EPCkKvbdGZUtaDwb
-EOcLKvbdjuwODaxX
-EOcKjvbdSKyFuHKs
-EOcLKvbdNQYQvOHT
-EPCkKvbdNGcQNPuL
-EOcLKvbdPIAYZAZB
-EObjjvbdMfcPlpVL
-EPCjjvbdLAjflbXq
-EPCjjvbdySmhmRbH
-EPDKjvbdxsNhmSBg
-EOcKjvbdZMSDsmkm
-DoCjjvbdbAudfQQX
-DoCjjvbdePErjtTr
-DncKjvbdtkxXBUBX
-DoCkKvbdqvokbiYq
-DnbjjvbdMfbpMouL
-DnbjjvbdijFhKNXr
-DoDKjvbdhgJcZVjV
-EPDKjvbdIHGzZYYH
-DnbjjvbdNsTufeVQ
-DnbjjvbdqlyixlIJ
-EPDLKvbdmaivxPOV
-DnbkKvbdmJDsptrB
-DnbjjvbdQYmAGsSK
-EOcKjvbdZjTIQHCG
-EPDKjvbdqGDeTuaI
-EOcLKvbdADSYJzIp
-DncLKvbdeuzwoizs
-EObjjvbdFyUuBEXb
-DncLKvbdnUtykJqf
-EPCjjvbdelfXGmKL
-EOcKjvbdKCjDQjDY
-DncKjvbdaaVeGPow
-DncKjvbdqvolDJYq
-DoCjjvbdDnbjkWbd
-DoCjjvbdjlakyeHP
-DoCkKvbdLZRJrztf
-DncKjvbdZisIQHCG
-EPDLKvbdZyDjNbkr
-DnbkKvbdLAjfmBwq
-EOcKjvbdtSqryZeD
-EOcLKvbdIMBzmvqL
-EObjjvbdiVZdvqtb
-DoDLKvbdMgDPmQVL
-EPDLKvbdMgCpNPtk
-EObjjvbdKVuGDeHJ
-EOcLKvbdjJehJlxS
-EPCkKvbdhlEcmuDZ
-DoDKjvbdHfgZyXwg
-EPCjjvbdShyiqABM
-EPDLKvbdMgColouL
-EPDLKvbdVqmwadkc
-EPCjjvbdnCKWwnmu
-DncKjvbdRpUGjGEX
-DoDKjvbdkWWnECYX
-DnbjjvbdkMalZeGo
-EOcKjvbdxUleRYkn
-EObkKvbdFxtuBDxC
-EObjjvbdnGdwlnGy
-EObkKvbduaEYsOeI
-EPCkKvbdyTOJMrBg
-EObjjvbdDHMFgAzc
-DnbjjvbdEOcKkXCd
-EPDLKvbdBhjbLIfK
-EPCkKvbdZtJJZETO
-EOcLKvbdIwsagkqQ
-DoCkKvbdZyDjNbkr
-DnbjjvbdBsAbsfWr
-DoCjjvbdeOeSjssr
-EObkKvbdVUNUGMWK
-DncLKvbdfMfWfmKL
-DoCjjvbduaEZTOdh
-DoCkKvbdZisIPgBf
-DnbjjvbdVZHtZjoO
-DoCjjvbdCWzchePv
-EObjjvbdJmAEZfuB
-EObjjvbdvvkaVaWV
-DoCjjvbdiiegjNXr
-DnbjjvbdcScLUEJa
-DncLKvbdJXsbHlQp
-EPCjjvbdrpWOjDVf
-DoDLKvbdDnbjjwDE
-DnbjjvbdxnShYSiD
-DoCjjvbdqGEFUWBI
-DoDKjvbdtSrTYzEc
-EObkKvbdEPDLLWcE
-DoDKjvbdKQzEnfOF
-EPDLKvbdIwtBhMRQ
-DoCjjvbdTvLojUBR
-EPDLKvbdZyDimbkr
-EPDLKvbdptTfrSKt
-DncLKvbdkMbLyeHP
-EOcKjvbdKfFhBaQu
-EObjjvbdeEoRbXDK
-EOcKjvbdHDjvJbJj
-EObkKvbdEztQeLcJ
-DncKjvbdUtMsfLuj
-DnbjjvbdRXOECkgc
-DncKjvbdLAjfmBxR
-EOcLKvbdsPvPJcVf
-EPCjjvbdygYlAMdw
-DnbjjvbdmuVZkKRf
-EPCkKvbdSZigrcWA
-DncLKvbdcJMikGWx
-EOcKjvbdGLErcHlu
-DoDKjvbdKNADygUa
-EPDLKvbdMfbolpUk
-DoDLKvbdUxhTyjoO
-EPCkKvbdMtrqjmAX
-EPDLKvbdLBLGmBxR
-DoCjjvbdrzMQTAgn
-EPDLKvbdUxhTykPO
-DnbkKvbdnVUzLJqf
-DoCkKvbdLYpirztf
-EPDLKvbdFejSOItR
-DncLKvbdvlvANDeN
-DncLKvbdwtleRYkn
-EObkKvbdcJNKLFvx
-EPCjjvbdYSkaNTnx
-EOcLKvbdSxKlNzjx
-DnbjjvbdHbMZdzAD
-EPCjjvbdXnRAXuVt
-DoDKjvbdQmYBxnUz
-DoCkKvbdWSOYCEkc
-DnbkKvbdemGXGlik
-EObjjvbdNeDsiJLE
-DoCkKvbdbiMijfXY
-EPCjjvbdmIdTptrB
-DoCjjvbdEztQeMDJ
-DncLKvbdCIjbLIfK
-EPCjjvbdhkeENuDZ
-DoCkKvbdAMgxsWzY
-DoCjjvbdiZtelQnG
-EOcKjvbdWXJXuceH
-EOcLKvbdZRMeJMeR
-EPCkKvbdiVZdvquC
-DoDLKvbdkVvmdCXw
-EObjjvbdnHExMmgZ
-EPDKjvbdHgHZyYYH
-EPDKjvbdRbEFMJYk
-EPCkKvbdvBEZSndh
-DnbkKvbdcScLTdJa
-DoDLKvbdcJMijfXY
-DnbjjvbddndrjstS
-EPDLKvbdbiNJjevx
-DnbkKvbdOSsvGduQ
-DoDKjvbdMowpvNfs
-DoCkKvbdZjSgpGaf
-DnbkKvbdddnqawDK
-DoDLKvbdKaLGmCYR
-DoCjjvbdmuVZkKSG
-EOcKjvbdZQldiMdq
-EObjjvbdRNXayOUz
-DncLKvbdeuzxQJzs
-DncLKvbdEOcKkXCd
-DncKjvbdhtyeXSUb
-DnbjjvbdEObjkXDE
-DncLKvbdKQyePGNe
-EOcLKvbdHgGzZXwg
-EObkKvbdrMzJxlIJ
-EObkKvbdRXNdClHc
-DoDLKvbdwzIFexEr
-EPDKjvbdJYUCIMQp
-DnbkKvbdhbOcFWqR
-EOcKjvbdnGdxMmgZ
-EObjjvbddeOqawCj
-EPCjjvbdqTsgSSKt
-DncKjvbdJXtBhLqQ
-DoDLKvbdatagYKsh
-EOcKjvbdjEkHUoAO
-DncKjvbdLFfICBRV
-DnbkKvbdKQydoFme
-EPDKjvbdhlFEOVCy
-EPCkKvbdZxdJmblS
-EPDKjvbdJbjCqKCx
-DncKjvbdwNWANDdm
-EPDLKvbdpyPHfqDx
-EPCjjvbdOTTufeVQ
-EPCkKvbdtbbtvvOo
-DoCjjvbdbBWEfQQX
-EObjjvbdKNAEZgVB
-DnbjjvbdJXtBgkqQ
-EPCjjvbdGYtuBEXb
-DoDLKvbdZjShQGaf
-DoDLKvbdQmYCYnUz
-EOcLKvbdpedFTvAh
-EObjjvbdKQydoGNe
-EPCkKvbdKDJcRKDY
-EObkKvbdrafMkfkZ
-EObkKvbdiCObdwRR
-EPCjjvbddBsMrAUN
-DoDKjvbdWIXvXgYz
-DoDKjvbdkClKpftg
-EOcKjvbdkCkjpftg
-EOcLKvbdVrOYBeLc
-EObkKvbdmoyxukZC
-EPCjjvbddZyQXyRC
-DoCkKvbdhbPCdvqR
-DoCkKvbdJvUeceGi
-EOcLKvbdVqnXaeMD
-DoCkKvbdWWhxVceH
-EPDKjvbdiGjDZVjV
-EObjjvbdGAnpxizm
-DoCjjvbdiZuFlQnG
-EOcKjvbdTqRPVVIN
-EPCjjvbdqdEhomvB
-DoCkKvbdLAkHMaxR
-EPDLKvbdOEdThiKd
-DnbkKvbdkxrrTZGt
-EOcLKvbdEPDLLXCd
-DoDLKvbdTIzKRAAl
-EPDLKvbdSCDeLiZL
-EPCkKvbdpyOgfpdY
-EPCjjvbdtkwwBTaX
-EPDKjvbdiBoCeWqR
-DoCjjvbdhgJbxujV
-DoDLKvbdqdEhpNvB
-EOcKjvbdkCkjqGuH
-EPCjjvbdhbObeXQq
-EOcKjvbdxsOImRbH
-DoCjjvbdKWVFceHJ
-DoDKjvbdBiKbKiGK
-EPDKjvbdnGeXmNgZ
-EPDKjvbdiifHjNYS
-EOcKjvbdauBgXjsh
-DnbkKvbdUtMsfLvK
-DncKjvbdNrtVgEuQ
-EPDLKvbdUsmUGLvK
-EOcLKvbdNGcQMpVL
-EPCkKvbdqmZjZLhJ
-EObkKvbdFfKSOJUR
-DncKjvbdhaoCeXRR
-DoCkKvbdmfdwlnGy
-EPCjjvbdjbkjqGuH
-DoDKjvbdlqyVZsEJ
-DnbjjvbdWWiYVcdg
-EOcKjvbdeATqMwjG
-EOcKjvbdqUTgSSKt
-DncKjvbdqwQMDJZR
-EPCkKvbdsQVoJbuf
-DoCjjvbdVTmUFlVj
-DoDKjvbdmajWxPOV
-EOcKjvbdUQpoUthN
-DoDKjvbdwMvAMdEm
-EPDLKvbdDnbkLXDE
-DncLKvbdFfKSNiTq
-DncKjvbdIryBSlwl
-DoDKjvbdmgEwlmfy
-DncKjvbdqwPkbhyR
-DncLKvbdNeETiJKd
-EObjjvbdDoCjkXCd
-EObkKvbdjgflFfNk
-DncLKvbdxsNhlrCH
-DoCjjvbdeFOrCWbj
-EObjjvbdkNBkzFHP
-DoCjjvbdxrmiNSCH
-EOcLKvbdVwJXvDeH
-EPCkKvbdZRMdhmEq
-EObjjvbdjSzhsKiz
-DoCkKvbdqdEiQOVa
-EOcLKvbdpaJFAWhE
-EPDLKvbdRkYfVGjs
-DncKjvbdMpXqWNgT
-EOcLKvbdVYhUZkPO
-DoCjjvbdUxhTyjnn
-DoCkKvbdOYOuzcmt
-DoDKjvbdZLqdUNlN
-DoDLKvbdJSyBTMxM
-DoDLKvbdYORAXtut
-DncKjvbdHffzYxXg
-DncLKvbdmpZyVjyC
-EOcKjvbdmfeXlnGy
-DoDLKvbdkHfkeenL
-DoDLKvbdJTZBSmYM
-EObkKvbdrMzKZMHi
-DncLKvbdiLeDmuCy
-DoDKjvbdjvXNcbYX
-DnbkKvbdrJAJeMne
-DoDLKvbdvlvAMdFN
-EPCjjvbdZLrDsmlN
-DnbjjvbdaaVdfPpX
-EObkKvbdrbFlkfjy
-DoDKjvbdGLErbhNV
-DoCjjvbdCIkCKhfK
-DnbjjvbdeEoSBwDK
-DncLKvbdirziSjiz
-EPDKjvbdwzIGGYEr
-DncKjvbdbVCGwkTh
-EObkKvbdakMFnmcA
-DnbkKvbdRpUHKFdX
-DoDLKvbdMSWlytpz
-DncLKvbdpssgRrKt
-EPCjjvbdZRMeImEq
-DoCjjvbdqrVKmjaN
-EObjjvbdjAQGaPfj
-DoDLKvbdyqOmJJwA
-DnbjjvbdQccApRES
-DoDLKvbdIsYaSmXl
-EPCjjvbdrovPKDWG
-EPDLKvbdqdEhpOVa
-DoCkKvbdVviYVdEg
-DoCjjvbdqZPIGqEY
-EPCkKvbdOTTvGeVQ
-DoCkKvbdDncLLXCd
-EObkKvbdvBEYsOeI
-DoCjjvbdYORAYVVt
-EOcLKvbdhgKCxuiu
-DoDKjvbdddoRbWcK
-EObkKvbdmoyyWKyC
-EOcLKvbdyYJJbQZk
-DnbjjvbdUyIUZkPO
-DncKjvbdFyUuBDxC
-DoCjjvbdnQZyVjyC
-DoDLKvbdatbHYKsh
-DoCjjvbdczYowxpb
-DncLKvbdIsZAsMxM
-EPDKjvbdGKeTChMu
-DoCkKvbdptTgSRjt
-EPDKjvbdMtrqjmAX
-DncLKvbdKQzEoFme
-EObjjvbdFxtuAcxC
-DncKjvbdkDLkRHVH
-EPCkKvbdunszqKnt
-DoCkKvbdezuxeJTw
-EObkKvbdzjVQQDsU
-EPDLKvbdjKGIKMxS
-DoCjjvbdcyyQXxqC
-EObkKvbdhtydwRtb
-DnbjjvbdfNGXHNKL
-DoDKjvbdmoyxujxb
-DncLKvbdmuVZkJqf
-EObkKvbdZyDjNbkr
-DnbkKvbdyXhiaozL
-EObkKvbdKWUfDeHJ
-DoCkKvbddoFTLUUS
-DnbjjvbdJvUfEFHJ
-EObjjvbdsrqrxzFD
-EObjjvbdmgFYMmfy
-DnbjjvbdbrcLTcjB
-EPDKjvbdZtIiZETO
-DncKjvbdSLZGVHLT
-EObjjvbdhtzFXSVC
-EOcKjvbdvAcxsPEh
-EOcKjvbdbrbjsdKB
-DoDKjvbdezuxdiTw
-DoDKjvbdhkdcnVDZ
-DoCkKvbdNddUJIkE
-DnbjjvbdsCGMlGjy
-EOcKjvbdssSSxydc
-DoCjjvbdSPtHJfDw
-DoDLKvbdmRyVZrdJ
-EOcLKvbdBdQBVjNG
-EPCjjvbdtvOXipsA
-EOcLKvbdDwwlUUUM
-EObkKvbdhkeENuDZ
-EOcKjvbdwygfGYEr
-DncKjvbdbsCkUEJa
-DnbkKvbdvlvAMceN
-EPDKjvbdTvMPitAq
-EPDLKvbdMowpvOHT
-EOcKjvbdNQXpvNgT
-DncKjvbdYzcFqiuy
-EObjjvbdqUUGrRjt
-EOcKjvbdUaBqTRSZ
-DnbjjvbdrafMkfjy
-DncLKvbdmgFXmNfy
-DncKjvbdNrtVfdtp
-EOcKjvbdVZITyjoO
-EPDKjvbdTukpJtBR
-DoDLKvbdyOTHxTIc
-DnbjjvbdsBfNLfkZ
-EPCjjvbdmJDtRVSB
-EObjjvbdmJDtRUrB
-DnbjjvbdiVZeWrVC
-DncKjvbdBiKajhfK
-DnbkKvbdziuQPcsU
-EOcKjvbdGFiqnJTq
-DoCjjvbdAMhZTXZx
-DncLKvbdDjHiuwjA
-DnbkKvbdBdQBVjNG
-EPCjjvbdqlzKYkgi
-DncLKvbdLLBIWAJy
-DncLKvbdbhljKfXY
-DncKjvbdaogHELzd
-DnbkKvbdjEkGtoAO
-DnbjjvbdGdKvJbKK
-EPDLKvbdqrUjnKaN
-EObjjvbdnVUykKSG
-EPDKjvbdVrNwbFMD
-DoDKjvbdvlvAMdEm
-EPCjjvbdaaWEeopX
-EPDLKvbdULuoBVoJ
-EPDLKvbdzjUpPcsU
-EPDKjvbdZnnJEdyj
-EPDKjvbdtlXwAsaX
-EPCjjvbdjJfHimXr
-EPCkKvbdxwiKBpZk
-DoCkKvbdLiBlQxAS
-EObkKvbdXFxytAOs
-EObjjvbdnQZxukYb
-DncKjvbdZxcjNcMS
-DnbkKvbdQcbaQQcr
-EObkKvbdVgxVwgYz
-DoDLKvbddoEsLUUS
-EOcKjvbdTppnttgm
-DoDKjvbdBhkBjhej
-EPCkKvbdlhcsqVRa
-DoDKjvbdZshiYcsO
-DoDKjvbdtcDUvvPP
-DnbkKvbdRkZFuGjs
-DoCkKvbdaaVeFopX
-EObkKvbdYORAXtut
-DncLKvbdqwPlDJYq
-DoDLKvbdbBWEepPw
-DnbkKvbdVvhxWDdg
-EObkKvbdfHkVqmpg
-DncKjvbdaMjartmH
-EPCkKvbdBhjbLIej
-DoCjjvbdCIjbKiFj
-DoDKjvbdkIHLefOL
-EOcKjvbdrbGMlGkZ
-DncLKvbdPxmAGsRj
-EOcKjvbdZxdKODMS
-DncKjvbdkDLjqHUg
-EOcLKvbdjEkHUoAO
-DoDLKvbdrovOjDVf
-DncLKvbdZshiZESn
-DncKjvbdUyIUZjnn
-EPDLKvbdxmrhYSiD
-DoCjjvbdaNKasUlg
-DnbkKvbdYqMeJMdq
-DncKjvbdZoOIeEyj
-EOcKjvbdemGXGlik
-EObjjvbdyzdnRhIh
-DncKjvbdHEKvJbJj
-EObkKvbdSCDdlIxk
-EPCjjvbdGAoQxizm
-DoCjjvbdaNKasVMg
-EObkKvbdePErkTtS
-EPCjjvbdlhdUQuSB
-EPDKjvbdNQXpvOGs
-DoCkKvbdXnRAYUut
-EObkKvbdcTCkUEKB
-DncLKvbdmRyUzSdJ
-EPDLKvbdrSVLNkAm
-DoCkKvbdJvUecdgJ
-DoDLKvbdRDbaQRDr
-EPDKjvbdYlSETmlN
-EPCkKvbdbUagYKtI
-EPCjjvbdssRrxzFD
-EPCjjvbdRMwbYmtz
-DnbjjvbdxrmhmRag
-DoDKjvbdTvLpJtAq
-EPDKjvbdVBBprprZ
-DnbkKvbdRkYeuGkT
-EOcKjvbdmbKWwoOV
-EOcKjvbdZeYGzghb
-EPCjjvbdFeirOJUR
-DoCkKvbdZsiIxcrn
-EPDKjvbdDnbkKvcE
-DoDLKvbdsrrTZZeD
-DncKjvbdJbjCpicY
-DnbjjvbdcyxpXxpb
-EPCjjvbdrXQLbhxq
-DncKjvbdzROmJJwA
-DoDKjvbdqdFIpNvB
-EPDKjvbdkHfkfGNk
-DoDKjvbdFjdsDINV
-DoDKjvbdUyITyjoO
-EOcLKvbdiUzEwRtb
-EPCkKvbdmfeYMmgZ
-DncLKvbdHgGyyXxH
-EObkKvbdMuTSLNAX
-DncKjvbdtbcUwWOo
-DoCjjvbdVwIxWEFH
-EOcKjvbdhgJcZWKV
-DoCjjvbdsCFllHLZ
-EPDKjvbdGcjvJbKK
-EOcLKvbdnGeYNNfy
-DncKjvbdZnnIeFZj
-DoDKjvbdxUldqZLn
-EOcKjvbdrovOibvG
-DoDKjvbdUWLpKTaR
-DncKjvbdePFTKtTr
-EPDLKvbdFxtuAdYC
-DoDLKvbdfIKvRnQg
-EPDLKvbdypnmIjXA
-DncKjvbdbUagYLUI
-EPDKjvbdnVUyjiqf
-EObkKvbdKWVGDeGi
-EObkKvbdaNKbSuMg
-DoDKjvbdNVSqkNAX
-EObkKvbdhbPDFWqR
-DoDLKvbdLGFhBaRV
-EOcKjvbdbrcLUDjB
-EObjjvbdZHXEAPTJ
-EPCjjvbdCSaDTevr
-DncLKvbdgQBzvcxI
-EObjjvbdidjfuPAO
-DoDLKvbdzjUoodTU
-DncKjvbdGLEsChNV
-EPCjjvbdNeDshiLE
-EObjjvbdGGKRnIsq
-EObkKvbdeYZtTqez
-EOcKjvbdQwODblHc
-DoCkKvbdkClLRHVH
-EPCkKvbdxUldqYkn
-EPCkKvbdvBDxsPFI
-DnbkKvbdqvpLcIyR
-DncKjvbdqmZixkhJ
-DoDLKvbdkVwNdCYX
-EObkKvbdUxgsykPO
-EPCkKvbdjcLjpgUg
-DnbjjvbdbUagYKtI
-EObjjvbdDjHjWXjA
-EObjjvbdrykpSaIO
-EObjjvbdrbGMlGjy
-DncLKvbdVYhUZjnn
-DoDLKvbdjlakydfo
-DnbkKvbdVTmUGMVj
-EObjjvbdZjTIQHCG
-EOcLKvbdZxcjNcLr
-DoCkKvbdqTsgSRjt
-DnbjjvbdCIkBkJFj
-EPCkKvbdaogHELzd
-EPCjjvbdNPxQunGs
-EObjjvbdxZhFfXeS
-DoDKjvbdjblKqHUg
-EObkKvbdNPxRWNgT
-DoDKjvbdkaNOmALA
-EPDLKvbdxsOImSCH
-EOcLKvbdZshhyETO
-EPDLKvbdIHHZyYYH
-DoDKjvbdliEURVRa
-EObjjvbdiVZeXRtb
-EOcKjvbdiHJcYvJu
-EOcKjvbdIsYaTNXl
-DoCkKvbdtlXvaTaX
-EOcKjvbdNQYRVnHT
-DoDKjvbddjJqvUzn
-DoDKjvbdULuoBVoJ
-DoDLKvbdUslselVj
-EPCkKvbddePSCWbj
-EPDKjvbdNeDtIiKd
-EOcKjvbdiUzFXSUb
-DoCkKvbdmRyVZsEJ
-EPCjjvbduLwwAtBX
-EPDLKvbdxZgfGXdr
-DnbkKvbdBcpAujNG
-DnbjjvbdZtJIyDrn
-EObjjvbdmbJvwnmu
-EPCjjvbdXnRAYVWU
-EOcLKvbdyOShXsJD
-DoCjjvbdptUGqqkU
-DnbkKvbdFpASwHGZ
-DnbkKvbdwtleRYlO
-EPCkKvbdnHFYMmfy
-EPDKjvbdKCjDQjDY
-EObkKvbdeqaWzlDP
-DoCkKvbdbLMGPODA
-DoCjjvbdpyPIGqDx
-EOcKjvbdbhmKLFwY
-DoDLKvbdEOcKjwCd
-EPCkKvbdePFTKtUS
-EPCkKvbdtvNwipsA
-EPCkKvbdzoQQdblY
-EOcLKvbdKjaHvAJy
-EPDKjvbdvPTzpkOt
-EPDKjvbdMJCLpxAS
-EObkKvbdWWhwvEEg
-DnbkKvbdcJNJjevx
-DoCkKvbdNQXpunGs
-EPDKjvbdWSNxBdlD
-EPDKjvbdwyhFeweS
-DncKjvbdddnrCWcK
-EObjjvbdeKJrVtzn
-EObjjvbdrykosBIO
-EPDKjvbdiiehKMxS
-DncKjvbdrWpMCiZR
-DoCjjvbddoFSjssr
-DoCjjvbdbhmKKfWx
-EObjjvbdmajWwoNu
-EOcLKvbdDxYLstUM
-EPCjjvbdddoRawDK
-DncKjvbdmuUzKjSG
-DoDKjvbdLFegbBRV
-EPCkKvbdySnJMqbH
-DnbjjvbdLLAgvAKZ
-EPCjjvbdraemMHLZ
-EObjjvbdnUtzLKSG
-EPDKjvbdkDMLQgVH
-DoDKjvbdkHgMGGOL
-DoCjjvbdxsNiNSCH
-EObkKvbdNQXpvOHT
-EObkKvbdQwNdDLgc
-DnbjjvbdegkWRnRH
-DnbkKvbdGZUuAcwb
-DncLKvbdiMEcmuCy
-DoDLKvbdFfJqnJTq
-DoDKjvbdZnnJFEzK
-EOcLKvbdTqRPUtgm
-EOcLKvbdRjyFuHLT
-EOcKjvbdhtzEwRtb
-EObjjvbdTXjkmzjx
-DoDKjvbdqdFJQOVa
-DoCkKvbdGckViajK
-DncLKvbdDxXlUTsl
-EOcLKvbdeUAUASlv
-DnbkKvbdzjUpQETU
-DnbkKvbdtcCuWuoP
-DncLKvbdauBgXkUI
-DoCjjvbdUVlPitBR
-DnbkKvbdFfJrOItR
-DoDLKvbdxnSgwsJD
-EPCkKvbdXsMBNToY
-DncLKvbdCTAcUFwS
-DoDKjvbdhgJbxvJu
-DoDLKvbdhkeDnUby
-EObkKvbdEvZPpNKF
-EPCjjvbdiHJcZWJu
-EObjjvbdIHHZyYXg
-DoCkKvbdegkVqmqH
-DoCjjvbdxVNFRZMO
-DoDLKvbdUQpntuIN
-DoDKjvbdEJhJuwjA
-DoDKjvbdkHflGGNk
-DnbkKvbdmttykKRf
-DncLKvbdZxdJmblS
-DnbjjvbdZQmEhmEq
-DoCjjvbdJcJcQjDY
-DoDKjvbdBhkCLIej
-DoDLKvbdmIcspuRa
-DnbjjvbdqiAKElne
-DoCjjvbdJpzEoFnF
-EOcKjvbdyOShYTJD
-DoCkKvbdmuVZjiqf
-DoDLKvbdSCDeLhyL
-EOcKjvbdJvUedFGi
-EObkKvbdehLWRnRH
-EPDKjvbdxmrhXriD
-DoDLKvbdOTUWGeVQ
-EPCjjvbdzRPMhiwA
-EPDKjvbdKRZePGOF
-DoCkKvbdrDeIomvB
-EPDKjvbdkVvmdBww
-DoDKjvbdIGfzYwwg
-EPDLKvbdFVyPpNKF
-DoDKjvbdhytfLqNf
-DnbjjvbdMfbomQUk
-EOcLKvbdtcDVXWOo
-DoDKjvbdqwPlDJYq
-EOcLKvbdZshiZETO
-EOcLKvbdeEnrCXCj
-EOcKjvbdZLrDsnLm
-EPCjjvbdLYqKSzuG
-DncLKvbdMtsRjmAX
-DoCjjvbdJTZArlxM
-EPCkKvbdlZSrTZGt
-DncKjvbdRyjITCvA
-DoCjjvbdEuxpPmKF
-DnbkKvbdTYKkmzjx
-DoDLKvbduDDVXWPP
-DncLKvbdjAPfaPgK
-DncLKvbdrEFJPnVa
-EPCjjvbdrXQMChyR
-DnbkKvbdznpQeDLx
-DoCkKvbdjgflFfOL
-EObjjvbdjlalZdgP
-DoCjjvbdtbcUvvOo
-DoCkKvbdrEFIonWB
-EObjjvbdwXMAvAuu
-DncLKvbdePFSkUTr
-EPCkKvbdTppoUuIN
-EPDKjvbdIxUCHlQp
-DnbkKvbdBiLBjiGK
-DoDKjvbdliDspuRa
-EObjjvbdFkFTDIMu
-EPCjjvbdsQVnjDVf
-EPCjjvbdKefIBaRV
-DoDKjvbdIryAsNYM
-DoCkKvbdsrqrxzEc
-EPCjjvbdLqwNZuQz
-EOcLKvbdcIlikGXY
-DoCjjvbdADSXizIp
-DoCkKvbduaEZTOeI
-DncKjvbdvBDyTPEh
-EPCkKvbdRkZFuHKs
-DoDLKvbdSLZFuGkT
-EOcLKvbdfekzOHHA
-EOcLKvbdkaMoNALA
-DncLKvbdkNCMZeGo
-EObjjvbdNsUVfduQ
-EPCjjvbdZoNiEeZj
-DoDLKvbdLYpirzuG
-EPDKjvbdmoyxujyC
-DoCkKvbdaMjbSuNH
-EPDLKvbdxxIjCPzL
-DnbkKvbdVAaqSprZ
-DoCjjvbduVmxJqTA
-DoCkKvbdRkZGVHLT
-DoDKjvbdEuyQPljF
-DnbkKvbdptUHSRkU
-DncLKvbduLxWaUAw
-EObjjvbdaaVdfQQX
-EPDLKvbdWWiYVdFH
-EOcLKvbdfelZmgHA
-DoCjjvbdADRxKZiQ
-EOcKjvbdfHkWSORH
-EObkKvbdTAEiIBoE
-DncKjvbdEKIKVxKA
-DoCkKvbdkDMKpgVH
-DnbkKvbdCWzciEpW
-EObjjvbdxZgefXeS
-EOcLKvbdsZkpTBIO
-DoDLKvbdrJAKFMne
-EPDKjvbdkWXNdBww
-DnbkKvbdRbEFLhyL
-DncLKvbdWXJYWDeH
-EOcLKvbdijFgjMwr
-DoDLKvbdnHExMnGy
-EObkKvbdZeYGzhJC
-DnbjjvbdEvZPpMie
-EObjjvbdYpldiMdq
-DoCjjvbdfRaWzlCo
-EPCjjvbdGYtuBDxC
-EOcLKvbdQYmAGrrK
-EPCkKvbdlhcspuSB
-DoDLKvbdezvZFIsw
-EOcKjvbdlYsSTZHU
-DnbkKvbdmfeXmOGy
-DncLKvbdKDKDQicY
-DncKjvbdZjTIQHCG
-DnbkKvbdgFkzOHHA
-DnbkKvbdaNLBsVNH
-DoCjjvbdBsBCtGWr
-DncKjvbdqdFIomvB
-DnbkKvbdkNBlZdfo
-DnbkKvbdSQTgKGDw
-DoCkKvbddoFTLTsr
-DoDKjvbdEYYLtTtM
-EOcKjvbdVwJYWEEg
-DoDLKvbdyOSgwrhc
-DoCkKvbdZMRdUOLm
-DoDLKvbdYSlBMtOx
-EPCkKvbdkxsRsYft
-DnbkKvbdrzLpTAgn
-DncKjvbdRjxfUgKs
-DnbkKvbdqquLNkAm
-DoDLKvbdRMxCYnUz
-EPCjjvbdZoOIdeZj
-EObkKvbdrpWOicVf
-EPDLKvbdkCkjqHVH
-EOcKjvbdmSZUzSci
-EObjjvbdRjxfUgLT
-EObjjvbdNddThhjd
-DoCjjvbdKVuFcdfi
-EPDKjvbdzjVPodTU
-DncKjvbdJTYaSmXl
-DncKjvbddZyQXyQb
-EPCjjvbdCIkCKiFj
-EPDKjvbdTkunaWOi
-EObjjvbdfIKuqnRH
-DoCjjvbdZRMdiMeR
-DnbjjvbdMpXpunHT
-DoDLKvbdZRNEhmFR
-EObjjvbdaoffdLzd
-DoDLKvbdvAdYsOdh
-DnbjjvbdSLZGUgLT
-DoCjjvbdSCDdkiZL
-DoDLKvbdelewHNKL
-DoCjjvbdRXNdDMHc
-EObjjvbdkWWnDaww
-EObjjvbdcyxoxZRC
-DncKjvbdelfWfljL
-EObjjvbdZnnJEdzK
-EOcKjvbdkHflGFnL
-DoCkKvbdhbPCdwRR
-EPDLKvbdHDkWKCKK
-DnbkKvbdRadEkiYk
-EOcLKvbdFWYopNJe
-DoDLKvbdqTsfrSKt
-EObjjvbdxnSgxTJD
-EPDLKvbdxZhFewdr
-EPCkKvbdTvLojTaR
-EObjjvbdfIKuqnQg
-EPCjjvbdDxXlTssl
-EObjjvbdQvmccLhD
-EObkKvbdRNXayOUz
-EPCjjvbdatbGxLTh
-EOcKjvbdOSsvGeVQ
-EPDKjvbdePFTKstS
-DnbjjvbdlYsRsZHU
-DnbjjvbdZisIQGaf
-DoCkKvbdsrqsYzEc
-EObjjvbdfILVqnRH
-DnbkKvbdZHWdAPTJ
-DoDLKvbdEPCkLXCd
-EObjjvbdEXwktTsl
-DncLKvbdFVyQPlie
-DncKjvbdNsUWHEtp
-EOcKjvbdyqOmJKXA
-EOcKjvbdADSYJyhp
-EPDKjvbdUyIUZjoO
-EOcKjvbdmJEURVSB
-DnbjjvbdIwtBgkpp
-EPCjjvbdZQmEhldq
-EPCkKvbdDjHiuxKA
-DoDKjvbdrEEiQOVa
-DncKjvbdKDKDQjCx
-DncKjvbdZRNFJMeR
-DncLKvbdwygeeweS
-DncLKvbdnUuZkKSG
-DoDKjvbdvwMAvBWV
-DoCjjvbdBhkCLIfK
-DnbjjvbdoznDkXoA
-EOcKjvbdjgflFemk
-EObkKvbdKVtfDdgJ
-DnbjjvbdXrkaNUPY
-DncKjvbdhlEdNtby
-EPDKjvbdemGWfmJk
-DoDLKvbdlhctQtrB
-EObjjvbdnVVZkJqf
-EObjjvbdwuNEpyMO
-DoCjjvbdTpqOuVHm
-EObjjvbdbLLennDA
-DoDLKvbdiGjDZWKV
-EPDLKvbdFjeTDHlu
-DoDLKvbdDxYLstUM
-EPDLKvbdiUzFXSVC
-DncKjvbdJYTbHkpp
-DoCkKvbdZshhxdSn
-EPDKjvbdxrnIlqag
-EOcLKvbdiHJcYvJu
-DnbjjvbdkVwNcaxX
-EObjjvbdpyPIGpcx
-EPCkKvbdauCGxLUI
-EObkKvbdWRnXadkc
-DnbkKvbdVUNUGLvK
-EObkKvbdDxYLsssl
-DnbkKvbdCJKbKhfK
-DncLKvbdbhmKKfXY
-EOcLKvbdZoOIeFZj
-DoDLKvbdkNCLzFHP
-EObkKvbdpxnggQdY
-EObkKvbdYqNFJNEq
-EPCjjvbdyzdnSHhh
-EOcKjvbdczZQYZQb
-DncKjvbdZyDimblS
-DncLKvbdyOTIXrhc
-EObjjvbdhzUelQnG
-EObjjvbdFjeTChNV
-DoCjjvbdwMvANEEm
-DoDLKvbdRXOEDMID
-DncKjvbdiHJcYvJu
-EOcLKvbdhtzFWrVC
-DncKjvbdVYgsykPO
-DoCjjvbdGGKRmiUR
-EPDLKvbdQmXbYnUz
-DnbkKvbdkIGlFemk
-DoCjjvbdSPsgJfDw
-DncKjvbdzjVQPcrt
-EPDKjvbdmfdxNNfy
-EPDKjvbdZyDimblS
-DoDKjvbdANIZSvzY
-DoCkKvbdJqZdoGOF
-EOcKjvbdcJMijewY
-DncLKvbdNQXqWNfs
-DncLKvbdkNBlZeGo
-DoCjjvbdHffzZYXg
-DoDKjvbdjhHMGGOL
-DnbkKvbdiCObdvpq
-DoDLKvbdYlRctNkm
-EObkKvbdiUzEwRuC
-DncLKvbdMfbomPuL
-EPCkKvbdlZSrSyGt
-DncLKvbdvAcxroFI
-DoCjjvbdNGcQNQUk
-DncKjvbdWSNxBeLc
-EPCkKvbdqvokcIyR
-DncLKvbddZyQXxqC
-DoCkKvbdvPTzqLPU
-DncLKvbdZxcjNblS
-EPCjjvbdkMbLzFHP
-EPCkKvbdlYrqsYgU
-DnbjjvbdWSOXbFMD
-DnbkKvbdWeyZtAPT
-EPCkKvbdEKHivYKA
-DoCkKvbdkNBkyeGo
-DoDLKvbdiBoDEvqR
-DoDLKvbdRkYfVGjs
-EOcKjvbddneSkUTr
-EObjjvbdFejRnItR
-DncLKvbdLAjgMbXq
-DnbkKvbdUGznLwVe
-DoDKjvbdLqwNZtpz
-EPDKjvbdUxhTyjnn
-EPDLKvbdkNBkyeHP
-DoCjjvbdgFkzNgHA
-EObjjvbdunszpjnt
-EPCkKvbdtAHQhABS
-DnbjjvbdbKkfOnDA
-DoCjjvbdVviYWEFH
-DoCjjvbdGZUuAdXb
-EObjjvbdhlFDmuCy
-DncLKvbdyfyMAMdw
-EObjjvbdFyUtaDxC
-DnbkKvbdeEoSCXDK
-EOcKjvbdbVCGwjtI
-EOcLKvbdTAEhgand
-EObkKvbdRpUHJecw
-DnbjjvbdZsiJZDrn
-DncLKvbdtSqrxyeD
-DoDKjvbdJSxaSmYM
-EPCkKvbdjuvnECYX
-DoDLKvbdrMyjYkgi
-DnbkKvbdjJegjNXr
-DoDLKvbduaDxsOdh
-DoDLKvbdmIcsptrB
-EObkKvbdFkFTDHmV
-DnbjjvbdYORAYVVt
-DncLKvbdddoRbWcK
-EPDLKvbdLrWmZuQz
-DoDLKvbdliETpuRa
-DoCjjvbdbrcKsdKB
-DoCkKvbdHkazmvpk
-EPCjjvbdUaBpsRRy
-EObkKvbdKfFhBaQu
-DoCkKvbdKQydnfNe
-EOcLKvbdDjIKVxKA
-DncKjvbdpeceUWBI
-DncLKvbdKaLHNBxR
-EPDLKvbdptTfrRkU
-EPDKjvbddndsLTtS
-EObjjvbdMpXpvOHT
-DnbkKvbdaMjaruNH
-DoCkKvbdpecdtVaI
-DncLKvbdRpTfjGEX
-EObkKvbdCSaCsevr
-DoCkKvbdnHEwmNgZ
-EObjjvbdfHjuqmqH
-DoDKjvbdKWVGDeGi
-DoDLKvbdWHxVxHYz
-DnbjjvbdXsLaMsnx
-EPDLKvbdDjHiuwjA
-DnbjjvbdaaWFGQQX
-DnbjjvbdsrrTZZdc
-DoCjjvbddneTKtUS
-DoDKjvbdcJMjLFvx
-DoDKjvbdaNKbTUlg
-DnbjjvbdkHflFfOL
-EObjjvbdJpzFOeme
-DoCjjvbdrounibuf
-DoCjjvbdHgHZxwxH
-EOcLKvbdSKxeuGkT
-EOcLKvbdzQoNJJwA
-EObjjvbdZnnJEdzK
-DoDLKvbdJuuFcdfi
-DncKjvbdIryBSmYM
-EObkKvbdyYJJaozL
-EObjjvbdFkEsDHmV
-DnbkKvbdfMfXHMjL
-DnbkKvbdLGGIBaRV
-EOcLKvbdRXNdDMHc
-DoDKjvbdegjvRnRH
-DnbkKvbdKeegaaQu
-DnbjjvbdkMakzEgP
-DoDKjvbdcTDKtEKB
-DncLKvbdhaoDEvqR
-DncLKvbdmgEwmNfy
-EPDKjvbdCIjbLIfK
-DncLKvbdJvUedEgJ
-DoCjjvbdFVxpPljF
-EOcLKvbdJYUCIMRQ
-EPDKjvbddwyssrFz
-DoDKjvbdiMEdOUcZ
-DoDKjvbdZQleIldq
-EPCkKvbdnQZyVkYb
-DoCjjvbdNGbpNPuL
-DoCkKvbdOStVgFVQ
-EOcKjvbdGBPQxizm
-DnbjjvbdOXoVzcnU
-DncKjvbdyqPNIiwA
-DoDLKvbdkIGlGGNk
-EPDKjvbdbiNKLFvx
-DoCkKvbdCTBCsfWr
-DoDKjvbdShyjRABM
-EPCjjvbdxwhjBozL
-DoCkKvbdqUUHSSLU
-DoDKjvbdbBVdfPow
-DoCkKvbdqYnggRDx
-DoCkKvbdtkwwAsaX
-EPDLKvbdZMSDsnMN
-EPDLKvbdZjTIQGbG
-EPCjjvbdzoPpdblY
-EPDKjvbdVviYWEFH
-DnbjjvbdUsltGLuj
-DoCkKvbdQdDAopcr
-EPDKjvbdZxcjNbkr
-EPCjjvbdZisHpGbG
-EPDKjvbdEuxpPmKF
-EOcKjvbdQwNccLgc
-EPCjjvbdEYYLstUM
-EObkKvbdZRNEhmEq
-DoDKjvbdaRfDIUGL
-DncKjvbduaDxsOeI
-EObkKvbdmaiwYPOV
-EOcKjvbdKDJbqJbx
-DoDKjvbdQvnEDLgc
-DnbkKvbdtlXvaTaX
-EPDKjvbdzQoNIiwA
-EOcLKvbdNeDsiIjd
-DnbkKvbdBdQAvJlf
-DoCkKvbdhzVGMROG
-EPDLKvbdUaCQsRRy
-EOcLKvbdZisHogCG
-DoCkKvbdlqxtzTDi
-DoCjjvbdRkZGUgKs
-EObkKvbdZnmhdeZj
-EOcLKvbdZjTHogBf
-DncLKvbdhytfLqNf
-EPCkKvbdnPyxvKxb
-DncLKvbdjcMKqHVH
-EPCkKvbduWNwjRTA
-DnbkKvbdwygfGXeS
-EObjjvbdTlWOaVoJ
-EPCjjvbdUtNUGLvK
-EObkKvbdKkAgvAKZ
-EObkKvbdaMkCTUmH
-EPDKjvbdOFDshhjd
-EPDLKvbdhzUfLpmf
-EPCkKvbdkySrTYgU
-EOcLKvbdFfKSNhsq
-DncKjvbdOAJTUKSA
-EPDLKvbdrDeJPmvB
-EPCkKvbdKRZdnfNe
-EPCjjvbdRDcAoqDr
-EOcKjvbdNHDQNPtk
-EOcLKvbdVTmTfMVj
-EOcKjvbdrXQMChyR
-DoCjjvbdZQmFJNEq
-EPCkKvbdWRmwadkc
-EObkKvbdSCDeLhyL
-DncKjvbdyNsHxTJD
-EPDKjvbdtSrTYydc
-DoDLKvbdiGjCxuiu
-DoCkKvbdrNZjZLgi
-EPDLKvbdJmADzGuB
-DncLKvbdtcCuWuno
-DnbjjvbdDxXktTtM
-EPCjjvbddZyPxZQb
-EPDLKvbdlqxtysDi
-DoDLKvbdbAueGPpX
-EObjjvbdVviXvDdg
-EPDKjvbdBdQAvKMf
-DnbkKvbdPxmAHSqj
-DoDLKvbdUsltFlWK
-DncKjvbdVhYWYHYz
-DoDKjvbddwzTtSFz
-DncLKvbdIGfzYwwg
-EPCjjvbdmJDsqUrB
-EPCkKvbdGQASwGey
-EOcLKvbdTlWOaVoJ
-DncLKvbdLFehCBRV
-DnbjjvbdTkvOaVoJ
-EPCkKvbdwXMAvBWV
-EObjjvbdpxnhGqDx
-EOcLKvbdsrqryZeD
-DoDLKvbduVnXjQsA
-DncLKvbdRotHKFdX
-EOcKjvbdnUtyjirG
-EOcKjvbdCJLCLJFj
-EOcLKvbdSCEFLiYk
-DoDLKvbdjcMLQgVH
-DoCkKvbdLBLGlaxR
-EObkKvbdZQldiNFR
-EOcLKvbduMXwAsaX
-DncKjvbdxrnIlrBg
-EObkKvbdehKvRnRH
-DoDLKvbdRosfiecw
-DoCkKvbdFjdrcINV
-EPCjjvbdkWWmdBxX
-DnbjjvbdFkFTDHlu
-DoCjjvbdTAEhgaoE
-DoDKjvbdANIZTWyx
-EObkKvbdJSyAsNYM
-EPDLKvbdqTtHRqkU
-EPDKjvbdbBVeFoow
-EPCkKvbdYSkaMsoY
-DncLKvbdDnbkKwDE
-DncKjvbdMSWlzUpz
-DncKjvbdauCHXjsh
-DoCjjvbdTvMQKUBR
-DoDLKvbdrRuLOLAm
-EOcKjvbdatbGxKtI
-DncLKvbdNGcQMotk
-EPDKjvbdiCObeWqR
-DoDKjvbduDDUwVno
-DncLKvbdYlRcsmkm
-DncKjvbdbAueFoow
-EObkKvbdYTMBNToY
-DncKjvbdvAdYsPEh
-EObjjvbdBdQBWKMf
-DnbkKvbduCbuWuno
-EOcLKvbdKWVGEFHJ
-EObkKvbdcyyQXxqC
-DnbkKvbdaMjasUmH
-EPCkKvbdmgEwlmfy
-DoDLKvbdrDdiQOVa
-DoDKjvbdUyIUZjnn
-DnbkKvbdnBjXYOnV
-EOcKjvbdRpTgJfDw
-DncKjvbdjcLjqGuH
-DnbkKvbdZjTIQHCG
-EOcKjvbduVnYKRTA
-DnbkKvbdGckWJbKK
-EObjjvbdZyEJnDMS
-DncKjvbdNsUWGduQ
-EObjjvbdKQzEoFme
-EOcKjvbdVUMtGLvK
-EPDKjvbdrJAKFMoF
-DoCkKvbdNrsvHFVQ
-DncLKvbdSKyGUfjs
-DoCkKvbdVvhxWEFH
-DncLKvbdFejRnIsq
-EObjjvbdVYhUZkOn
-DoCjjvbdxUmEpxkn
-DoDLKvbdBiLCKhej
-DoDKjvbdIjEAJofd
-EOcKjvbdwzHfFwdr
-DncKjvbdFjeTDHlu
-DnbjjvbdbiMjKewY
-DnbjjvbdaNLCTUlg
-EObjjvbdDwxMUUTl
-DoCkKvbdmttykKSG
-EPDKjvbdiUyeXSVC
-EPDLKvbdWIYVwfxz
-EPDLKvbdemFvgMik
-DoCkKvbdUyHszKoO
-EObkKvbdTXkMNzjx
-DoDKjvbdSQTgKFdX
-DnbjjvbdLiBkpxAS
-EPCkKvbdRosgKGEX
-DoCkKvbdmfdwmNgZ
-DncLKvbdiHJbyViu
-DncLKvbdxrnJMqbH
-EOcKjvbdhlFENtcZ
-DoCjjvbdbKkennDA
-DnbkKvbdGckWKBjK
-DnbjjvbdUyIUZkOn
-EPDKjvbdeEnrCXDK
-EOcKjvbdsBfMkgKy
-DncKjvbdxsNiNSBg
-EPDKjvbdkNCLzEgP
-EPDKjvbdSKyGVGjs
-DoDKjvbdrWolChyR
-DncLKvbdWSNwaeLc
-EOcKjvbdJYTbHkqQ
-DnbjjvbdZshiZDsO
-DoDKjvbdSKxfUfjs
-EPCkKvbdptTgRrKt
-EPCjjvbdREDApQdS
-DncLKvbdtvOXjRTA
-EPDKjvbdemGXGljL
-EObjjvbdBdQAvJmG
-EPDLKvbdhuZdwRuC
-DncLKvbdjvWnDaxX
-EPDLKvbdFVxopMie
-EPCkKvbdajkeoNcA
-EPCjjvbdSPsfifEX
-DnbkKvbdBsAcTfWr
-EPCjjvbdEOcLLWcE
-DoCjjvbdZLrDsmlN
-EPCkKvbdxnSgxTIc
-EObjjvbdGQATXGey
-EObkKvbdbsDLUEKB
-DoCjjvbdrSVKmjaN
-EPCkKvbddneTLUUS
-DoCkKvbdxmrgwsJD
-EPDKjvbdGYuVAdXb
-DncLKvbdauBfxLTh
-EPDLKvbdrMzKZLgi
-EObkKvbdUsltGLvK
-DnbjjvbdDxXlTstM
-EObkKvbdsBfNLgLZ
-DncKjvbdidjgUoAO
-EPDLKvbdJJdAKQHE
-EOcKjvbdbBWFFpQX
-EPCjjvbdSZihTDWA
-EPCkKvbdhgKCxuiu
-DncKjvbddneTLUTr
-DoDKjvbdczZPxZRC
-DnbjjvbdlYrrTYft
-DoDKjvbdWXJXvEEg
-EPDLKvbdbhmJkFvx
-EPCjjvbdDxYLtTsl
-EPDKjvbdqdFIonVa
-EObjjvbdCIjbLIej
-DnbjjvbdmbKXXnmu
-EPDKjvbdlZTSTYft
-EPDKjvbdwXMBVaWV
-DnbjjvbdSPtGjGEX
-DoDKjvbdrMzKYlHi
-EPCkKvbdiVZdwSVC
-DnbjjvbdptUHSSKt
-DncLKvbdcSbjscjB
-DoDKjvbdSPsfiecw
-EOcKjvbdegkVqnQg
-EObkKvbdjuvmcbXw
-DncKjvbdCJLCKhfK
-EObjjvbdVqnYBeMD
-DoCjjvbdKCjCqJcY
-DncLKvbdZRMdhmEq
-EOcKjvbdrRtkOKaN
-DoDLKvbdRpTfiedX
-DoCjjvbdRMwbZOUz
-DoCjjvbdrXQMDIxq
-EObjjvbdsrqsZZdc
-DnbjjvbdfjfzbfAE
-DoCkKvbdJSyBTMxM
-EPDKjvbdnCJvwoNu
-DoCjjvbdmbJvwoNu
-DnbkKvbdFWZQPljF
-DncLKvbdxnSgwriD
-DnbjjvbdVvhwucdg
-DoCjjvbdjgfkfFnL
-DncLKvbdzRPMiKXA
-EOcLKvbdqZPHgREY
-EPCkKvbdrylPsAgn
-EPCkKvbdVZITykPO
-DoCjjvbdhkeEOVDZ
-EOcKjvbdUVkpJtAq
-EOcKjvbddCTMrAUN
-EPDKjvbdZeXfzghb
-EPCjjvbdiMFDmuDZ
-EPCjjvbdJKEAJpHE
-EOcLKvbdajkeoODA
-DnbjjvbdZRNEhmFR
-EOcLKvbdNHCpNQVL
-EObjjvbdmRxtzSci
-DoCjjvbdzRPMhjXA
-DnbkKvbdnGdwmNfy
-EObkKvbdvAcxsOeI
-DoDLKvbdBsAcTevr
-DoCkKvbdozmdKxPA
-DnbkKvbdTlVoBVoJ
-EPCkKvbdqwQLcIxq
-DncLKvbdbiMjLGWx
-DoDLKvbdfHkWRnRH
-EOcKjvbdbVCGxKsh
-DoCjjvbdTqRPUthN
-DoCkKvbdbQGgELzd
-EOcLKvbdQZNAHSrK
-DoDLKvbdZyDjNbkr
-EPCjjvbdqiAJdmOe
-EObkKvbdKaLHNBxR
-DncKjvbdyXhjBozL
-EObjjvbdDjIKWYKA
-EOcKjvbdLFegaaQu
-EPDKjvbdZjTIPgCG
-EOcLKvbdfHjuqnQg
-DnbjjvbdlhcsqVRa
-DoCjjvbdMuSqkNAX
-DncLKvbdCIkBkIej
-DncKjvbdUaCQsQqy
-EObjjvbdRbDdkhyL
-EOcKjvbdpssfrRkU
-EOcKjvbdLGFhBaQu
-EPCkKvbdqqtjnLBN
-EOcLKvbdWRmwbEkc
-EObjjvbdpedFTuaI
-DoCkKvbdJJdAJofd
-DoDLKvbdwNWANEEm
-EPCkKvbdYgWdAOri
-DoDLKvbdvAcyTOeI
-DnbkKvbdbhmJjfWx
-EOcLKvbdypnliKXA
-EOcKjvbdZyEJnClS
-DoCjjvbdZoNhdeZj
-EPCkKvbdkDLkRGtg
-EObjjvbdNsUWGdtp
-DnbjjvbdZQldhmFR
-EOcKjvbdYpmEhldq
-EPCkKvbdZQmEiMeR
-DnbjjvbdhytfLpnG
-EObjjvbdmtuZkJrG
-EObjjvbdGLEsDINV
-EPCjjvbdVhXvYHYz
-DoDLKvbdKefICAqV
-DncKjvbdUtMsfLvK
-EOcLKvbduaEZTOeI
-EPDKjvbdddoSBwDK
-DoCkKvbdffLymgHA
-DnbkKvbdbAueGQQX
-DnbkKvbdbrcLTcia
-EPCjjvbdRbEElJYk
-DoCkKvbdGFirNiTq
-DoDKjvbdNdctIhkE
-EPDLKvbdQccAoqES
-DnbkKvbdFfKRnJUR
-DnbjjvbdFfJrNiUR
-EPDLKvbdCfkegAzc
-EPCjjvbdRXNccMHc
-DoCkKvbdZjShPgBf
-EOcKjvbdSLZGUfkT
-DoDLKvbdBcpAujMf
-EOcLKvbduWNwiqTA
-DoDLKvbdpyOgfqEY
-EOcKjvbdcScKtEJa
-EObjjvbdnCJwXoNu
-DnbkKvbdjFLGtoAO
-DoCjjvbdXrlBMsnx
-EPDKjvbdhgJcZWJu
-DoCjjvbdiBoDEvpq
-EPDKjvbdczYoxYqC
-DoDLKvbdjFLHVPAO
-DnbjjvbdbPgGdLzd
-DoDKjvbdWIYWYGxz
-DncKjvbdhytfLpnG
-EObjjvbdfHjuqnQg
-DnbjjvbdmgExMmgZ
-EOcLKvbdhgKDYuiu
-EPDKjvbdmJEURVRa
-DoDLKvbdJpyePGNe
-DoDLKvbdlhdUQuRa
-EObkKvbdmuUzLKSG
-DnbjjvbdxwhjBozL
-EPDLKvbdVZIUZjnn
-EPDLKvbdJpydnfOF
-EPCkKvbdqqtjmjaN
-EPCkKvbdZoOJFFZj
-DnbjjvbdmttzKjRf
-EPDLKvbduWOXjQsA
-EOcLKvbdwtleRYkn
-DoCjjvbdLYpjSzuG
-EObjjvbdIsYaSmYM
-DnbjjvbdyzeORhJI
-EOcLKvbdkWWnECXw
-EPDKjvbdVviYVcdg
-DoDKjvbdBcoaVjMf
-DoCkKvbdiMEcmuDZ
-EObjjvbdLKaHvAKZ
-DncLKvbdJTZArlwl
-EOcLKvbdhaoCeWpq
-DncLKvbdrWpLcJZR
-EObkKvbdHkaznWpk
-DnbjjvbdzjVPocrt
-EOcKjvbdyqPMhiwA
-DoCkKvbdpstHRqkU
-DnbkKvbdRkYfVHKs
-DoDLKvbdVgwvYGxz
-EOcKjvbdFfKSNiUR
-DnbkKvbdqquLOLBN
-DncKjvbdOAJTTjSA
-DoDKjvbddneSkUTr
-EObkKvbdlqyUysEJ
-DoDKjvbdbhmKKevx
-EOcLKvbdiCObdwQq
-EPCkKvbdFejSNiTq
-EObkKvbdwygfGYEr
-EPDLKvbdsQWPKDVf
-DncKjvbdjbkjpfuH
-EPDKjvbdRkZFuGjs
-EPDKjvbdwyhFfXdr
-DncKjvbdcIlikFvx
-DoCkKvbdiUydwSVC
-DncKjvbdiUzFXSVC
-EOcKjvbdjKFgimYS
-EPDKjvbdjvXODaww
-EPCkKvbdRbDdlJZL
-EObkKvbdrEEhpNvB
-EObjjvbdrpVoKDWG
-DoCjjvbdNxPVzcnU
-EPDKjvbdVgwvYHYz
-DnbjjvbdmuUyjirG
-EObjjvbdrSVLNkBN
-DncKjvbdUWLojUBR
-EOcLKvbdwygefXeS
-EObkKvbdhaoDEvqR
-EOcLKvbdGGKRmiUR
-EOcKjvbdeEnqawDK
-EPDLKvbdGGJqnItR
-DoDLKvbddeOrBvbj
-DnbkKvbdiVZeWquC
-DncLKvbdJcJcQjDY
-EPDLKvbdkDMLQgUg
-EObjjvbdemFvflik
-EObkKvbdwzHeewdr
-DoCjjvbdHDjuiajK
-DoCkKvbdrEEiPnVa
-EOcLKvbdypnmJKXA
-DoDLKvbdmgFXmOHZ
-EObkKvbdUsmUFkuj
-EPDLKvbdcScKtDjB
-EPCkKvbdUyITzLOn
-DncKjvbdZnnIddyj
-EPCkKvbdaaVeGPow
-DoCjjvbdSQTfifDw
-DoDKjvbdDoDKkXCd
-DncLKvbdhtzEwRuC
-EObkKvbdMpXqVnGs
-DoDKjvbdDncLLXCd
-DoCkKvbdtcDUwVoP
-DoDKjvbdtSqryZdc
-EPDKjvbdbBWFGPpX
-EPCjjvbdmRxtyrdJ
-DoDLKvbdGckVjCJj
-EObjjvbdzoPpeCkx
-DnbjjvbdKWVFceHJ
-EPCjjvbdSKyGVHLT
-DoDLKvbdelevgNKL
-DoCjjvbdTXjlNzkY
-DoDLKvbdpstHSSLU
-EPDKjvbdhgKCxuiu
-EObkKvbdZQleJMeR
-EPCjjvbdKVuGDdfi
-DncKjvbdUGzmkvvF
-DncKjvbdxrnJMqbH
-EPCjjvbdKVuGDdgJ
-EObjjvbdptTgRqjt
-EObjjvbdCDpAujMf
-EPDKjvbdczZQXyRC
-DncLKvbdqYngfpdY
-EOcLKvbdqBIeAXIE
-EPDLKvbdZLrETmlN
-EPDKjvbdNeEThhjd
-EOcLKvbdmbKWxOnV
-DoCkKvbdCDoaWKNG
-EOcLKvbdEOcKkWbd
-EPCkKvbdNQXpvOGs
-EPDLKvbdFyUtaDxC
-EPDKjvbdbLMGOnDA
-DoDLKvbdJcJcQjDY
-EPDLKvbdOTUWHFUp
-DoCjjvbdmgFXlnGy
-EOcLKvbdRDbaQRES
-DoDLKvbdcyxowxpb
-EPDLKvbdliEURVSB
-EOcKjvbdXnRAXuWU
-DoCkKvbdDnbjjwDE
-DoCkKvbdKVuGEEfi
-EObkKvbdyOTHxShc
-EPDKjvbdySnIlqbH
-DoDLKvbdHELWJbJj
-DnbjjvbdyOTHxShc
-DnbjjvbdczZQXxpb
-EPDLKvbdZLrDsmkm
-EPCjjvbdfNGWflik
-EPDKjvbdmbKWwnmu
-DncKjvbdrDdiPnWB
-EObjjvbdHDjvKCKK
-DnbkKvbdUVkojTaR
-EObjjvbdptTfrSKt
-EPDKjvbdFxttaEXb
-DoCkKvbdjvXNcbYX
-DoCkKvbdSLYfUgKs
-EOcKjvbdHakzEzAD
-DncLKvbdiCObdwQq
-EPDLKvbdZLqdUNlN
-DoDLKvbdhkeDnVCy
-EPCkKvbdemFvgNKL
-EObjjvbdliDtQuRa
-EObkKvbdwuMdpxkn
-EObkKvbdirzhrkJz
-EPCjjvbdJYTahLqQ
-DncLKvbdIHGyxwwg
-EPCjjvbdSQUHKGEX
-DoCjjvbdZshiYcsO
-EOcLKvbdPyNAHSrK
-EPCjjvbdbsCjscia
-EObjjvbdUWLojUBR
-DoDLKvbdKeehBaQu
-EObjjvbdjuwODaww
-DoDLKvbdtkxXAsaX
-DncLKvbddneSkTtS
-DnbjjvbdZtJIxcsO
-DnbjjvbdJTYaTNXl
-EPCjjvbdGKeTDHlu
-DoDLKvbdKQydoGNe
-DoDKjvbdVrOXaeLc
-EPCkKvbdzHYlAMeX
-DoDLKvbdBvzchdov
-EObkKvbdapGgELzd
-DoDKjvbdaMkBsUlg
-DnbjjvbdVUNTelWK
-EObjjvbdiHJcZWKV
-DncLKvbdZoNheEyj
-DncKjvbdDHMFgAzc
-DnbkKvbdFpATXGey
-EPDKjvbdMpXqWOHT
-EPCjjvbdmSZVZrdJ
-EPDKjvbdcIljKfXY
-DoCkKvbdjcLkRGuH
-DoDLKvbdGYuVBEXb
-EObkKvbdWXIxWDeH
-DncKjvbdQlxCZOUz
-DnbjjvbdYNqAXtut
-EPDLKvbdGdKvJbJj
-DoDLKvbdGLFSbglu
-EPCkKvbdRjxfVGkT
-DoCkKvbduCbuXWOo
-DoCjjvbduCbtvuno
-EObkKvbdjAQGaQGj
-DoDLKvbdqBJFAXHd
-EOcKjvbdkClKpgVH
-EOcLKvbdiMFDmtby
-EPDLKvbdjvXNcbXw
-EPCkKvbdxUmFRYkn
-DoDKjvbdHgGyyYXg
-DoCjjvbdRzJhScWA
-DnbkKvbdlZTRsYgU
-DnbkKvbdFVxpQNJe
-EPCkKvbdZyEJmcMS
-EObjjvbdZQldhmFR
-EObjjvbdYSlBMtPY
-DncLKvbdvBDxsOdh
-DoDLKvbdvAdYrndh
-DoCjjvbdZyEJmcLr
-DnbkKvbdKaLGmCXq
-DnbkKvbdZQmFImEq
-EOcKjvbdqvolDIxq
-DnbkKvbdVqnYBdkc
-DoCkKvbdnPyxvLZC
-EOcLKvbdmJEURUqa
-DoDLKvbdfHkVrNpg
-DoCjjvbdznopdblY
-DoCkKvbdjvWmdCXw
-EOcKjvbdunszpjnt
-EObkKvbdzoPqFDMY
-EObjjvbdDxXktTtM
-EObjjvbdBcoaVjMf
-DncKjvbdtcDVWuno
-EObjjvbdpyOggQdY
-DnbkKvbdwWkaWAuu
-EPCjjvbdajkeoODA
-EOcKjvbdKNAEZfta
-EOcKjvbdZisIQHCG
-DncLKvbdEXwksstM
-DoDKjvbdtbbuXVoP
-DncLKvbdDxYMTstM
-DoCkKvbdcyyPwxpb
-EPCkKvbdxmrgwsJD
-DoDKjvbdYSkaNUOx
-EOcLKvbdxwhjCPyk
-DncKjvbdUsmTekuj
-DnbkKvbdkVwOECXw
-EObkKvbdnBjXYOnV
-DncKjvbdcasNSATm
-EPDKjvbdTAFIhCOd
-DnbkKvbdkWWnECYX
-DnbkKvbdFjeSbgmV
-DoCjjvbdJzoewdAN
-DnbkKvbdZeXfzhIb
-DncKjvbdMJCLqYAS
-DoCkKvbdGLFTCglu
-DoDLKvbdMuSrLNAX
-EOcKjvbdqceIomvB
-DoDLKvbdegkVqnRH
-DoDKjvbdKfGICBQu
-EOcKjvbdEvYopNKF
-DnbjjvbdlrZVZsEJ
-DoDLKvbdqqtjmjaN
-DncLKvbdQmXaxmtz
-EPDKjvbdCDoaVjNG
-EPCkKvbdqquLNjaN
-DnbjjvbdKRZdoFnF
-DoCkKvbdkVwOECYX
-DncKjvbdGQATXGfZ
-DncLKvbdCDpAujMf
-EOcKjvbdDxXlUUTl
-EPCjjvbdYkrEUNlN
-DnbjjvbdZtJIyETO
-DoCjjvbdXsMAltPY
-EOcLKvbdxxIjCPzL
-DoDLKvbdSLZFuHLT
-DncKjvbdFVyQQMjF
-DoCjjvbdFaOpyJzm
-EPCjjvbdrJAJdmPF
-EOcLKvbdMuSqjmAX
-DncLKvbdEJgiuxKA
-EPDKjvbdBdQAuimG
-DnbjjvbdWXIxVdFH
-DnbkKvbdHDkVjBjK
-EPDKjvbdnHEwlmgZ
-EPCkKvbdBiKbKhfK
-EPDKjvbdhyuGLpnG
-DoCkKvbdZsiJZDsO
-DnbjjvbddBrlrAUN
-DoCkKvbdYqMeIldq
-DncLKvbdZLqdUNkm
-EOcLKvbdMuSrKmAX
-DoCkKvbdDxXksstM
-EOcKjvbdqdEiPmua
-DoCjjvbdOEdUJIjd
-DoCkKvbdEObkLWbd
-EObkKvbdfekynHHA
-EPCkKvbdrEFIpNvB
-DnbkKvbdnBjXXoOV
-EPCjjvbdmgEwmOGy
-DncKjvbdKCjDQjCx
-EPDKjvbdJqZdoGOF
-DncKjvbdUsmTfLuj
-DoDLKvbdjcMKpgUg
-EPDLKvbdSQUGjGDw
-DnbjjvbdRacdlJYk
-DncKjvbdYgXEAOsJ
-EPCjjvbdhficZWKV
-DoDKjvbdGAnpxizm
-EPCkKvbdRbDeLhyL
-DoDKjvbdiBncEwQq
-DoCkKvbdxZgfFxFS
-DoCjjvbdqvpMChyR
-EObjjvbdbUbGxKtI
-DoCkKvbdEObkKvcE
-DnbjjvbdKQzEnfNe
-DoCjjvbdRWnDblID
-DnbkKvbdkxrqsYgU
-DncLKvbdqwPlCiYq
-EPDKjvbdSZjHsDWA
-DncLKvbdEPCjjvbd
-EOcLKvbdpyPIGpcx
-DncLKvbdbVCGwkTh
-DnbkKvbdnPzZWKxb
-EObkKvbdGKeTDIMu
-EOcKjvbdiifIKNYS
-DncLKvbdnQZxvKxb
-EPDLKvbdGFjSNiUR
-DnbjjvbdRNXaxnUz
-EPCjjvbdOTTvGduQ
-EObkKvbdUtMselVj
-DoCjjvbdnUuZkKSG
-EPDKjvbdQmXaxnUz
-EPCkKvbdNeDtIhjd
-DncLKvbdNxOuzdOU
-DncKjvbdJJdAJpGd
-DoDKjvbdwuNEqYkn
-DncKjvbdZMSDtOLm
-DnbjjvbdNeDsiJLE
-EPCjjvbdJpzEoGOF
-EPCjjvbdkDLkRGtg
-DoCjjvbdUWLpJtAq
-EPDKjvbdfMfWfljL
-EPCkKvbdrMzJyMIJ
-DoCjjvbdJKEAJofd
-DnbjjvbdnBiwXoNu
-DoCjjvbdDihJvYKA
-DnbkKvbdSZigsDWA
-DoCjjvbdFejRmhsq
-DnbkKvbdaMkCTVNH
-EObkKvbdczZPxZRC
-EPDKjvbdVZIUZjnn
-DoDKjvbdkySrTZGt
-DoDLKvbdsPvPKDVf
-DoCkKvbdwWlBVaVu
-EPDKjvbdANIZSvyx
-EPCkKvbdnHFYNNgZ
-DnbkKvbdNdcsiIkE
-EPDLKvbdDoCkLWbd
-EPDKjvbdQccBPqDr
-EObkKvbdSPsfifEX
-EOcKjvbdelfXHNJk
-EObkKvbdFfKRmiUR
-EOcLKvbdKCibqKDY
-EPDLKvbdUWLpJsaR
-EPCkKvbdKfFhCBQu
-EOcKjvbdmuUzLJrG
-EOcLKvbdBdQBVjMf
-EOcKjvbdfpBzvcwh
-EOcKjvbdmRyUzSci
-EOcKjvbdFVxpPlie
-DnbjjvbdDwwlUUUM
-DncKjvbdUyHsyjoO
-DoCkKvbdUslselVj
-DncLKvbdmuUykJqf
-DncLKvbdLFfHbApu
-DncLKvbdhyuFlROG
-EPDKjvbdxnTIYTJD
-EPDKjvbdTulPjUAq
-DoCjjvbdCDoaWJlf
-DoCkKvbdbLMGOnDA
-EPDKjvbdOStVfdtp
-EPCkKvbdZRMeImFR
-DoDLKvbdiVZeXRuC
-EPDKjvbdRosfiedX
-DoCjjvbdnGeYMnGy
-DoCjjvbdiiehKNYS
-DncKjvbdbhmKKfXY
-EOcLKvbdnBjXXoNu
-EPDKjvbduLwwAtAw
-EOcLKvbdygYlAMeX
-DoCkKvbdNsTvHEtp
-EPCjjvbdsrrTYzFD
-EPCkKvbdBdQAuimG
-DncKjvbdmfeYMnHZ
-EOcKjvbdxZhFexEr
-DncLKvbdZshhyETO
-EObkKvbdOFEUJJLE
-DoDLKvbduDCtvuoP
-EOcKjvbdGZVVBEYC
-EObjjvbdZRMeJNEq
-DnbkKvbdkxsRsYft
-DnbkKvbdsBfNLfjy
-EOcLKvbdNPxQvOHT
-DnbjjvbdpstHRqkU
-EOcLKvbdZQleJNFR
-EPCjjvbdxVNEpxkn
-DoCkKvbdwtmEqZLn
-DoCkKvbdGAoQxizm
-DoDLKvbdVqmwaeLc
-DoDKjvbdKfGHaaQu
-DoCjjvbdcJNKLGWx
-EPDLKvbdrzMPsBHn
-DncKjvbdfoazwDxI
-EPDKjvbdZyEJnClS
-DnbjjvbdwMvANDeN
-EObjjvbdZshiZETO
-EPDKjvbdUslselVj
-DoDKjvbdwtmEpyLn
-DncLKvbdJTYaTMxM
-EPDKjvbdvBDxsOeI
-DoDKjvbdxrmhmSCH
-EPDLKvbdjJegjNYS
-EOcKjvbdJvUedEgJ
-DnbkKvbdVZITyjoO
-DoDKjvbddePSCWbj
-DncKjvbdWIXvXgYz
-EPDKjvbdZQmFJMeR
-DnbjjvbdqdEiPnWB
-DoDLKvbdUVkojTaR
-DoDLKvbdFVxpPmJe
-EPCjjvbdxmsHwsIc
-EPDLKvbdiiehJlxS
-EPDLKvbdCTAbsewS
-EPCjjvbdzoPpdbkx
-DnbkKvbdijGHilxS
-EPDLKvbdOYOuzdNt
-EOcLKvbdTppoUuIN
-DnbkKvbdcScLUDia
-EOcLKvbdePFTLUTr
-EOcLKvbdhgKCxvKV
-EPCkKvbdrJAKFNOe
-EOcKjvbdVwJXucdg
-EPCkKvbdNddUJJKd
-DncLKvbdJYUCHlQp
-EObjjvbdkVvnDaxX
-EPCjjvbdNeDsiJLE
-EPDKjvbdyzeNqhJI
-EPCjjvbdmIdTqUrB
-EPDKjvbdZoOJFEyj
-DoDKjvbduaDxsOeI
-EPCkKvbdKjaIWAKZ
-DncLKvbdKaLHMbYR
-EOcKjvbdrafMlHKy
-EPCjjvbdhtzEvqtb
-EPCkKvbdddoSCXDK
-EOcKjvbdzjUpPdTU
-EPCjjvbdLZRJrzuG
-EOcKjvbdaMjaruMg
-DoCkKvbdyOSgwsJD
-EPCjjvbdKDKCqJcY
-EObkKvbdvAcxrneI
-EObjjvbdwuMeQxkn
-DncLKvbdmSZUysDi
-DnbkKvbdcIlijfWx
-DoDKjvbddndrjtTr
-EOcKjvbdwtmEqYlO
-EOcKjvbdYzcFqivZ
-DnbkKvbdCDpBWJmG
-EOcKjvbdaSGCgsfL
-EObjjvbdIwtBhLqQ
-DnbkKvbdyzdmrIIh
-EPDLKvbdWexzUAOs
-DncLKvbdRXNdCkgc
-EOcKjvbdkVwNdBww
-DncLKvbdIGfzYxYH
-DoCkKvbdbAvFGPow
-DoCkKvbdQlxBxnUz
-DncKjvbdqrUkOKaN
-EPDLKvbdZisIQGaf
-DoDKjvbdsQWPJbvG
-DncLKvbdjhHMFfNk
-EObkKvbdwNWAMdFN
-DoCkKvbdeKKRutzn
-EObkKvbdJpyeOfNe
-EOcKjvbdQmXayNtz
-DncKjvbdnHExNNgZ
-EPCjjvbdULuoBVni
-DoCjjvbdqquLNjaN
-EPDKjvbdyzdnSIJI
-DnbkKvbdQvnDcLgc
-DoCkKvbdtcDUvvOo
-DnbjjvbdnGeXmNfy
-DoDKjvbdxsNhmRbH
-DoDKjvbdtTSSyZeD
-DoDKjvbdRadFMJZL
-EOcKjvbdUaCQrpqy
-DoDLKvbdEJgivXjA
-EOcLKvbdGFjSOItR
-EPDLKvbdaSGDIUGL
-DnbjjvbdJYTagkqQ
-EOcLKvbdZLrDsmlN
-EOcLKvbdEJgiuwjA
-DoDKjvbdxUleRYlO
-DnbjjvbdQwODcLhD
-EObkKvbdOTUVgEtp
-EObkKvbdRMwaxnUz
-EObjjvbdrEFJPmua
-EOcLKvbdiUzEvquC
-DoDKjvbdMpYQumfs
-EPCkKvbdhancEvqR
-DncKjvbdkNCMZdfo
-DncLKvbdZHWdAOri
-EObjjvbdlrYuZrci
-EObjjvbdgLGzbfAE
-EObjjvbdcTCkUEJa
-EPDLKvbdVAbRTRRy
-DoCjjvbdYqNEiMeR
-DncKjvbdBvzchdpW
-DnbkKvbdtSqryZdc
-EPCjjvbdwygeeweS
-DoCkKvbdqlzJyLhJ
-EOcLKvbdtbbtvvOo
-DoDKjvbdrSVKnLAm
-DnbkKvbdfMevgNKL
-EObjjvbdRacdkhyL
-EPCkKvbdFpASvgGZ
-EPDLKvbdZoOJFEyj
-EPCjjvbdzjUpPcrt
-EOcKjvbdcbSlrATm
-EOcKjvbdqwPkbhxq
-DnbjjvbdHELVibKK
-EPDKjvbdZQldiMeR
-DnbjjvbdpstGqrKt
-DoDKjvbdGFjRmiUR
-EPCkKvbdssRsZZdc
-DnbkKvbdlqxuZsDi
-DncKjvbdEXwlUTtM
-DnbjjvbdyzdnRhIh
-EPCjjvbdkCkkRGtg
-EOcLKvbdLrWlytpz
-EPCkKvbdCEQAvKNG
-DncLKvbdVwIxWDeH
-EObkKvbduMYXBTaX
-DoCkKvbdRyihTDWA
-DnbjjvbdkaMoNALA
-DnbjjvbdaMjartlg
-DoCkKvbdNVTSKmAX
-DoDLKvbddwystRez
-EPCjjvbdcImJjevx
-DoCkKvbdeAUQlwjG
-DoDKjvbdZxcjNblS
-DncLKvbdkIGlFenL
-DoCjjvbdfHjurNqH
-DoCkKvbdiBoDFXRR
-EPDLKvbdvBDyTPFI
-DnbkKvbdUxhUZkPO
-EObjjvbdqZOhHQdY
-EOcKjvbdSCDeLiZL
-DncKjvbdozmckYPA
-DncKjvbdgGLymgHA
-DncKjvbdILaznWpk
-EPCjjvbdqUTgSSKt
-DoCkKvbdrovOjCuf
-EOcLKvbdKfGIBaQu
-EPDKjvbdCIjajiFj
-EPCkKvbdmoyxujyC
-EObkKvbdySnJMrCH
-EOcLKvbdHDjujBij
-EObjjvbdrMyiyMHi
-DoCkKvbdiifHimXr
-DnbkKvbdbsCkTcia
-DnbkKvbdMfbpNPtk
-EOcLKvbddoErkUTr
-DncLKvbdqZOhGqDx
-DnbjjvbdDncKkXCd
-DoCjjvbdSCEElIxk
-EPCkKvbdbUbHXjsh
-DnbkKvbdCTAcUGWr
-EPDLKvbdZtIiZESn
-DnbjjvbdrDeJPnVa
-DoCkKvbdZisIQHCG
-DncLKvbdgFkzOHHA
-EPCkKvbdmfdxMmfy
-DncLKvbdMIbMRYAS
-EOcKjvbdaogGckzd
-EOcLKvbdLAkHMawq
-DncLKvbdxwiJbQZk
-DncLKvbdauBgYLUI
-DnbkKvbdnQZxvKyC
-EOcKjvbdFkEsChNV
-DoDLKvbdpstGrRjt
-EPDLKvbdlYrrSxgU
-DnbjjvbdZQmFIldq
-DoCjjvbdbhmKLFvx
-EObkKvbdsBellGjy
-DncLKvbduCcUwWOo
-EObkKvbdJuuGEEfi
-DoCkKvbdIwtCHkqQ
-EPCkKvbdaMkBruMg
-DncLKvbdEARiMyvw
-EObjjvbdmgExNOGy
-DoCjjvbdpfDdsuaI
-EPDLKvbdEzspdlCi
-EPDKjvbdqdFJQNua
-DnbkKvbdnBjWxOnV
-EPDLKvbdZisHogBf
-EPCkKvbdjcMKpftg
-DnbkKvbdauCGwjsh
-DoDKjvbdlYrrTZHU
-EOcLKvbdzjVPpDrt
-DoCkKvbdQdDApQdS
-DoDKjvbdehLWRmpg
-EPDLKvbduoTzpkPU
-DoCkKvbdliDspuRa
-DoDKjvbdEXxLsssl
-EObjjvbdZsiJYcrn
-DoCkKvbdaaWFGPpX
-DoCkKvbdrafNMHLZ
-DoCjjvbdmgEwlnHZ
-EPCkKvbdFkEsCgmV
-DncKjvbdqmZjYlHi
-DoCkKvbdfILWSORH
-DoDLKvbdnCKXYOnV
-DnbkKvbdHgGyyYYH
-DoDLKvbdEKHjVxKA
-EPDKjvbdbAueGPow
-DnbkKvbdFyUuBDwb
-EPDKjvbduCcUvvOo
-EObkKvbdauBfxKsh
-EObjjvbdZjTIPgBf
-EObkKvbdNGbolpVL
-EOcKjvbdeFOqbWbj
-DoCjjvbdvwMAvBVu
-DnbkKvbdzRPMhjXA
-DncKjvbdFkErcIMu
-EPCjjvbdhlFEOUcZ
-DoCkKvbdJbjCpicY
-EPCkKvbdZGwEAOri
-DnbkKvbdNQYQunHT
-DoCkKvbdkIHMFfOL
-EObkKvbdHELVjBij
-DoDLKvbdZQldhleR
-DoDLKvbdVTmTelVj
-DnbjjvbdJTZArlwl
-DnbkKvbdCDpAvKMf
-DoCjjvbdDxYLtUTl
-DoDLKvbdwkWcgzyf
-EPDLKvbdLBKgNCYR
-DoDLKvbdZMSEUNkm
-EOcLKvbdxUmEpxkn
-EOcKjvbdGLFTDHlu
-EOcLKvbdyYJKCPyk
-DoCjjvbdDnbjjvcE
-DoDLKvbdatbHXjtI
-EObjjvbdbiMjLGWx
-EPDKjvbdTYKlNzjx
-EOcKjvbduDDUvvPP
-EObkKvbdliETpuSB
-DnbjjvbdrWolDIxq
-EObjjvbdqZOggQcx
-EOcLKvbdyXiKBoyk
-DnbjjvbdqmZiyMIJ
-EPCjjvbdULuoAuoJ
-DoDLKvbdYzcGRivZ
-DnbjjvbdtkwwBTaX
-DnbjjvbdJbicQicY
-DoCkKvbdTukojTaR
-EPCkKvbdHbLydzAD
-EObjjvbdVTltGLvK
-EPCjjvbdUsmUFkuj
-EPDLKvbdTqROuVIN
-DncLKvbdYkrETnLm
-DoCkKvbdeFPSBwDK
-DnbjjvbdNGcPmPtk
-DnbjjvbdWHwuxHYz
-DoDLKvbdNUsRjmAX
-EOcKjvbdZjTHpHBf
-DncKjvbdWXIwvDeH
-EOcLKvbdrJAKEloF
-DoCjjvbdFeirOJUR
-EOcKjvbdWWhwvEEg
-DncKjvbdKeehBaQu
-DnbjjvbdZLrDsmlN
-EOcLKvbdZnnIeFZj
-DoCkKvbdjKGHjMwr
-EObkKvbdmIctQtqa
-DoCjjvbdkClKpfuH
-DnbjjvbdcTDKscia
-DnbjjvbdADSYKZiQ
-EObkKvbdygZMANFX
-EPCjjvbdaMkCTUlg
-DoDKjvbdzjVPodTU
-EPCkKvbdIxTagkpp
-EPCjjvbdZjSgpHBf
-EOcLKvbdiCOcEvpq
-EOcLKvbdsQWOibvG
-DoDKjvbdEuxoomJe
-DoDKjvbdmuVZkKSG
-DoCjjvbdSZjITDWA
-DoCkKvbdCJLBkJGK
-EPCkKvbdliDsqVSB
-DoCjjvbduaDxrneI
-EOcLKvbdtvNxJpsA
-EOcKjvbdEuyPoljF
-DnbjjvbdwWlAuaWV
-DncLKvbduMXvaTaX
-EObjjvbddxZstSFz
-EPDLKvbdmttykKSG
-EPCjjvbdfIKvRnRH
-DoDLKvbdjgfkeemk
-DoCkKvbdHELVjBjK
-EObjjvbdaRecIUGL
-DnbkKvbdmSYuZrci
-DoDLKvbdKfGHaaQu
-EOcLKvbdIwsahLpp
-EOcLKvbdEuyPomKF
-DoCkKvbdsQWPJcVf
-DnbjjvbdbPgHDkzd
-DoDKjvbdZMSETnMN
-DoDKjvbdJSyBTMwl
-EPCkKvbdSCDeMIxk
-DoDLKvbdtkwwBTaX
-DoCjjvbdtbcVWuoP
-EPCjjvbdozmdKxPA
-DoCjjvbdtkwwBUBX
-DoDLKvbdQdDBPpcr
-DoCjjvbdJbjCpjDY
-EPCjjvbdCTBDTfWr
-EPDKjvbdYNqAYUut
-DoDKjvbdURRPVUgm
-EOcLKvbdNPwqVmfs
-DoDKjvbdsCGMkgLZ
-DoDLKvbdZtIiYcsO
-EObjjvbdhficZWJu
-EPCjjvbdTqRPUuIN
-EPCjjvbdyOShXsIc
-EOcLKvbdliETqVRa
-DncKjvbdYqMdhmEq
-DoCkKvbdKfGHbBQu
-DnbkKvbdqBIeAXIE
-EPDLKvbdQZNAHTRj
-EObkKvbdRosgJecw
-EPCjjvbdKQzEnfOF
-DoDKjvbdzRPMiKXA
-DnbkKvbdGcjvJbJj
-DoCjjvbdbAvEeoow
-DncKjvbdFVyQPmKF
-EPDLKvbdRzKIScWA
-EPCkKvbdKkAhWAJy
-EPCkKvbdJqZdnenF
-DoCkKvbdVUMtGMWK
-DncKjvbdBiLBjiGK
-DnbkKvbdjvWnDbYX
-DnbkKvbdwuNEqYkn
-DoDKjvbdegjurORH
-EObjjvbdpeceTvAh
-DoCkKvbdAMgySwZx
-EPCkKvbdlZSqsZGt
-EPDLKvbdbrbkTdKB
-EPDKjvbdhzUekpnG
-DncLKvbddeOqbWbj
-EPCjjvbdsPunibvG
-EOcLKvbdVwIxVdEg
-DoCjjvbdkIHLefNk
-DnbkKvbdxmrhXrhc
-EPCkKvbdziuPocrt
-EOcLKvbdNUsSLNAX
-DncKjvbdhkddNtcZ
-DoCjjvbdMpYRWNgT
-EObjjvbddZxoxYqC
-EOcLKvbdNVTRjmAX
-EPDKjvbdZjTIQHCG
-DnbkKvbdHEKvJbKK
-EOcKjvbdiGibxvJu
-DnbjjvbdsCGNMGjy
-DoCjjvbdBhkBjhfK
-EPCkKvbdSCDdkhyL
-DnbjjvbdNPwpvNfs
-EOcLKvbdJTZBTNYM
-DncKjvbdqGEFTvBI
-EObkKvbddneSjtTr
-DncLKvbdqdFJPmua
-EPDKjvbdrbFmMGkZ
-DoCjjvbdhXZAzzAJ
-EOcKjvbdkxsSSxgU
-EPDKjvbdrEEhonVa
-DnbkKvbdYzcGSKVy
-DoCjjvbdzROmJJwA
-EPDLKvbdOEdUJJKd
-EPCjjvbdqquKmkAm
-EOcLKvbdZyEKODLr
-DnbkKvbdIsZAsMxM
-DnbjjvbdZjTHofaf
-DoCjjvbdrSUkOLAm
-EPCjjvbdBsAbsewS
-EObkKvbdUsltGLuj
-EPCkKvbdANHyTWyx
-EObkKvbdsBemMGjy
-EObjjvbdMoxRVmfs
-EPCkKvbdNGbolouL
-EPDLKvbdjKGHimXr
-DncKjvbdUMWPAuni
-EOcLKvbdOEdUIhkE
-EPCkKvbdjKGHimXr
-EPCkKvbdhuZdwSVC
-DoCjjvbdCIkBjiFj
-EPCkKvbdxZhGFxFS
-EObjjvbdOFDtJJKd
-DoCkKvbdfNGWgNKL
-EPDLKvbdcarmSATm
-DoDKjvbdkNCMZeHP
-DoDLKvbdkMakyeGo
-DnbjjvbdiHJcYvKV
-DnbjjvbdWWhxVcdg
-EPDKjvbdVUNTelVj
-DoDKjvbdZGvdAPTJ
-DoCjjvbdDncLLXCd
-EPDKjvbduDCuWuno
-DoCkKvbdPyNAHTSK
-DncKjvbdqwPlDIyR
-EOcKjvbdYzbfSJvZ
-DnbkKvbdRotGifDw
-DoDLKvbdRDcBQRDr
-DoDKjvbdEARiNZvw
-DncKjvbdJSxaTNYM
-EPDKjvbdVwJXvDeH
-EOcKjvbdQwOECkhD
-DoCjjvbdEPCkLWbd
-EPDKjvbdVBBpsRSZ
-EOcKjvbdddoSBwCj
-EOcKjvbdFkFScINV
-EObjjvbdpstGrSLU
-EPDLKvbdhaoDFXRR
-EPDKjvbdKfGICApu
-EObkKvbdBsAcTevr
-EObkKvbdhkeDmtby
-DoCkKvbdqYngfpdY
-EOcKjvbdsPvPKCvG
-DoDLKvbduVmwiqTA
-EOcKjvbdidkGtoAO
-EPCkKvbdyzeORgiI
-DoCkKvbdmJDsqUqa
-DncLKvbdiGibyVjV
-DncKjvbdhtzEwSVC
-EOcLKvbdZRMdiNFR
-EOcKjvbdrafMkgKy
-DoDKjvbdZGwEAOsJ
-EOcLKvbdjmCMZeHP
-DncLKvbdjKFgimYS
-EPCjjvbddZxpYZRC
-DncKjvbdjmBkzEgP
-EObkKvbdkIHLeemk
-EPDKjvbdjAQGaQGj
-DncLKvbdSPtHJfDw
-DoCkKvbdGKdsChNV
-EPCjjvbdrouoJbuf
-EPDKjvbdlhcsqUqa
-DoCjjvbdwXMBWAvV
-DnbkKvbdhkdcmtby
-EOcLKvbdFkEsDHmV
-EOcLKvbdCIkBjhej
-DoCkKvbdiLeDnVDZ
-DoDLKvbdDxXlTssl
-DnbjjvbdNrtVfduQ
-EPCkKvbdHDkWJajK
-EPCjjvbdTulQKUBR
-DoDKjvbdJYUBhLpp
-DncKjvbdiCOcFXRR
-DoCkKvbdxsNiMrBg
-EObkKvbdQlxByNtz
-EPCjjvbdBhkBjiFj
-EPCjjvbdNeDsiIjd
-DncLKvbdBsAcTfXS
-DncLKvbdDwwlUTsl
-EOcKjvbdUQqPVUgm
-DncKjvbdmttzKirG
-EPCjjvbdKWUfEFHJ
-EPCjjvbdGKdrcINV
-EPDLKvbdkxrrTYgU
-DoCkKvbdQdCaQQcr
-DnbkKvbdvAdYroFI
-EObkKvbdFxttaDwb
-DnbkKvbdQdDBPqES
-DncKjvbdkVwODbXw
-DoCkKvbdrounicVf
-EPCjjvbdBcoaVjMf
-DncKjvbdcImKKevx
-DoCjjvbdxLWdHzyf
-EOcLKvbdcbTNSATm
-EPDKjvbdRacdlJZL
-EPDLKvbdZQleIleR
-EPCkKvbdTfznLwWF
-EObkKvbdsCFmLgKy
-DoDKjvbdyqOlhiwA
-EOcKjvbdtcCtwVoP
-DnbjjvbdRWmdCkgc
-EOcKjvbdqUTfqrKt
-DnbkKvbdRyjHsDWA
-DoDLKvbdYqMdiNEq
-EOcKjvbdhbPCeXRR
-EOcKjvbdVrNwbFLc
-EObkKvbdZLqcsmkm
-DoDKjvbdRWmdDMID
-EPCjjvbdkWXNcbYX
-DncLKvbdZyDinClS
-EOcLKvbdqUTfqqjt
-DncLKvbdUtNTelWK
-EPDKjvbdkWWmdCXw
-DoDKjvbdezuxdhtX
-DoCkKvbdaSGCgtGL
-EPDKjvbdVwJYWDdg
-DoDLKvbdWSOYCFMD
-EObkKvbdxwiJaozL
-DoCjjvbdTpqOuVIN
-DoCkKvbdrzLpSaHn
-DnbkKvbdJutecdfi
-DnbkKvbdhgKDZVjV
-DncKjvbdCJKajiGK
-EPCkKvbdbrcLTcia
-DncKjvbdxxIibPzL
-DoDLKvbdNUsRkNAX
-DoCkKvbdZRMeJMdq
-DnbjjvbdxsOJMqbH
-DncKjvbdqAheAWhE
-DoCkKvbdZnnIddyj
-DoCjjvbdrpWOibuf
-DoCjjvbdDxXlUUTl
-EPDKjvbdZirgofbG
-DnbjjvbdDnbkKvbd
-EOcLKvbdoznDkXoA
-DnbjjvbdozmdKxPA
-DnbkKvbdfHkVqmqH
-DoDLKvbdkDMLRGtg
-EPDKjvbdDxXlUTtM
-DoDLKvbdZLrETmkm
-DoCjjvbdLAkGlbYR
-DncLKvbddndsLUUS
-DoCjjvbdaRfDIUFk
-DnbjjvbdjJfHjNXr
-DncLKvbdeFPRbXDK
-DoCkKvbdJYTbIMRQ
-DnbkKvbdptUGrRjt
-EOcKjvbdkMbLzEfo
-DoCjjvbdezuxeJUX
-DoCjjvbdZMRctOLm
-DoDLKvbdWWiXudEg
-DnbkKvbdiiehKNXr
-DoCkKvbdXrkaNUOx
-EPDLKvbdZjTIQGbG
-EObjjvbdeOeTLTtS
-EPDKjvbdBraCsewS
-EPDLKvbdLBKflaxR
-DncKjvbdRzJhScWA
-EPDLKvbdGKdrbhMu
-DoDKjvbdFeiqmiUR
-DnbjjvbdFWYooljF
-DnbkKvbdUWLoisaR
-EPDKjvbdfRaWzkbo
-EPDLKvbdKQzEnfNe
-DoDLKvbdnUtyjiqf
-DnbjjvbdyNrgxSiD
-EOcKjvbdjlakzFHP
-DoCkKvbdjvXODaxX
-DnbkKvbdLFfHaaRV
-EPCkKvbdwuMeRYlO
-EPDLKvbdtSqrxzEc
-DncKjvbddwytTqez
-EOcKjvbdZLqcsnMN
-DoCjjvbdkxsSTZHU
-EPDKjvbdiZtekqNf
-EObkKvbdnCKWwnmu
-EObjjvbdauBgYKsh
-EPDKjvbdrSVKmkBN
-EObkKvbdxrnImSBg
-DncKjvbdZnnJEeZj
-DoDKjvbdZjTIQHBf
-DncLKvbdmIctRVRa
-DoCjjvbdziuQQDsU
-EPDKjvbdZRNFJNEq
-EOcKjvbdTqRPUthN
-EPCkKvbdePFSjssr
-EPDLKvbdfIKuqmqH
-DoDKjvbddZyQYYpb
-DoDLKvbdWRmwaeMD
-DoDLKvbdOYOuzcmt
-DoDLKvbdxsNiNRbH
-EPCkKvbdNeEThiLE
-EPCkKvbdNPxQunHT
-EPCjjvbduCbtvuoP
-EOcLKvbdjgfkeemk
-EObjjvbdjlbLydfo
-DoDLKvbdxmsIXrhc
-DoCkKvbdlrZVZsDi
-DoDKjvbdEztRElCi
-EObjjvbdBsAbsfWr
-DoDLKvbdZHWdAOsJ
-DnbjjvbdSCDdkhxk
-EObjjvbdeFOqbWcK
-EPDLKvbdZtJJZESn
-EPCkKvbdKfFhBaQu
-DoCkKvbdMpYQvNfs
-EObjjvbdrpWOjCvG
-EPDLKvbdJSxaTMxM
-EPCjjvbdOSsvGduQ
-DoDLKvbdtumxKRTA
-EPDKjvbdBcpBWKMf
-DnbkKvbdtbbuWvPP
-DoDLKvbdKWUfDdfi
-EPDKjvbdOStVgFVQ
-EObkKvbdZnmheFZj
-DoDLKvbdQwODcMID
-DoDKjvbdVrNxBeMD
-DoCkKvbdaSFbgsek
-DoCjjvbdTvMQKTaR
-DoCkKvbdZsiIxdSn
-EObkKvbdakMFnnDA
-DoDLKvbdJutedFHJ
-EOcLKvbdhzVFlQnG
-EObjjvbdzjUpQDsU
-EPCkKvbdzoQQeCkx
-DncKjvbdZjShPgCG
-DnbjjvbdMgCpMpVL
-DnbkKvbdNGbpNPuL
-EObkKvbdKfFhBaRV
-DnbjjvbdKQzFPFnF
-EPDKjvbdCIkBkJGK
-EObkKvbdmajXXnnV
-DoCkKvbdNwnuzcnU
-EObjjvbdauCGwkTh
-DnbkKvbdbiNKKfXY
-DnbjjvbdQmYCYnUz
-DoDKjvbdiLddNtcZ
-EOcKjvbdeEoSBwDK
-DoDKjvbdcTCkUDia
-DnbkKvbdZRNEhmEq
-EPCkKvbdHfgZxxXg
-EObjjvbdbsDLUDjB
-EPDKjvbdhbPDFWqR
-DncLKvbdKNADyfuB
-EObkKvbdEztREkcJ
-DncLKvbdbLMFnnDA
-EObkKvbdZjShPgBf
-DncLKvbdbVCHXkTh
-DnbkKvbdqTtHSRkU
-EObkKvbdfSBWzlDP
-DnbkKvbdGKeTDIMu
-EOcLKvbdGcjvJbJj
-EPCkKvbdMowqWOHT
-DncKjvbdYpmFIleR
-EPDKjvbdZxcjNblS
-DncLKvbdNrtVgEuQ
-EOcKjvbdqrVKnLBN
-DnbkKvbdatbHXkUI
-DoCkKvbdEPDKkWbd
-EPDLKvbdmIdURVRa
-DoCkKvbdMoxRWNgT
-EObjjvbdLBKflbXq
-DoCkKvbdSwjkmzkY
-DoDKjvbdJbicQicY
-EObkKvbdNQYQumgT
-DoDKjvbdxxJKCPzL
-DncLKvbdnGdxNNgZ
-DoCkKvbddijSVtzn
-EPDKjvbdrJAJdmOe
-DnbjjvbdzoQQeDLx
-DoCjjvbdZRMeIldq
-DnbjjvbdkHgMGGOL
-DoCjjvbdaSGChTfL
-EOcLKvbdCJLCKiFj
-DoCkKvbdVhXvYHYz
-EPCjjvbdcSbjscia
-EOcKjvbdxZgeewdr
-EPDLKvbdYkqdUNlN
-DnbkKvbdREDApQdS
-DnbjjvbdmozZVkYb
-EPDKjvbdaRecITfL
-DncLKvbdZyEJmbkr
-EOcKjvbdZnnIdeZj
-DncLKvbdeXzTsrFz
-DoCjjvbdZRMdhmEq
-EOcLKvbdGGJqmhtR
-EPDKjvbdIidAJpHE
-DncKjvbdMRwNZtpz
-DncLKvbdnBiwXoOV
-DoDLKvbdqYnhGqEY
-EOcKjvbdWexytAOs
-EOcKjvbdiZuFlQnG
-EObkKvbdVAaqTRRy
-EPCkKvbdTAEhgaoE
-DoDKjvbdMoxQvNfs
-EPDKjvbddjJqvUzn
-EObkKvbdBiKajhfK
-EPDLKvbdZLqcsmlN
-DoCjjvbdgPazwDwh
-EPCkKvbdwkWcgzzG
-EPDKjvbdlYsSSyGt
-EObjjvbdZLrDsmkm
-DncLKvbdbsCkUDia
-EObkKvbdkxrrSyGt
-DnbkKvbdnBivxOnV
-DoDLKvbdZirhPgCG
-EObjjvbdfMevfmKL
-EPDKjvbdSQTgJecw
-DoDLKvbdUWMPitAq
-DoDKjvbdwtleRZMO
-EObjjvbdKRZdoGNe
-DoCjjvbdauBgYKsh
-DoDKjvbdXrlAlsnx
-DncKjvbdUMVnaVni
-DncKjvbdiHKDYvKV
-DnbkKvbdySnJNSCH
-EPCjjvbdfNGWgNKL
-EOcLKvbdnQZxujxb
-EObjjvbdVgwvXgYz
-EOcLKvbdjKGHimYS
-DnbkKvbdhanbeXQq
-DncLKvbdhzUfLpmf
-DoDLKvbdczZPxZRC
-EPDKjvbdRNYBxnUz
-EOcLKvbdlrZVZrdJ
-DncKjvbdtcDUwWOo
-EPCkKvbdQvmdDLhD
-EPCjjvbdfMfWfljL
-DoCjjvbdZyEKNbkr
-EOcKjvbdgPazvcxI
-DncKjvbdfNGXHMjL
-DncLKvbdEKHjWXjA
-EObkKvbdZjSgogCG
-EPCjjvbdxnSgxShc
-EPCjjvbdqrVKmkBN
-EPCjjvbdbBVdepQX
-DoCkKvbdrXQLbhxq
-DoCjjvbdbVBfxLTh
-EPCkKvbdHlBznWqL
-EPDKjvbdTAEhgaoE
-DnbjjvbdCfkfHAzc
-DnbkKvbdptTfqqjt
-EPDLKvbdWIXuwgYz
-EObjjvbdrJAJeNPF
-DncLKvbdKDKDRJcY
-DnbkKvbdrDeIpNvB
-DncLKvbdVwIwudFH
-DncKjvbdICMZdzAD
-EPCkKvbdsQVnjDVf
-EPDKjvbdiZuGMRNf
-DoDLKvbdIGfyyXwg
-EPDLKvbdYORAXtut
-DoCjjvbdhzVGMQnG
-EPDLKvbdQwNcbkgc
-EObjjvbdsBemLgLZ
-DoDLKvbdZtIiYdSn
-DoCjjvbdelevfljL
-DoCkKvbdcyxowxqC
-EPDLKvbdZMRdUNlN
-EOcLKvbddZyPwyRC
-EPCjjvbdZLrDsnLm
-EPCkKvbdgPazwEYI
-DoDKjvbdqFdEsvBI
-EOcKjvbdVviXvDdg
-EPCjjvbdCWzdIdov
-DncKjvbdrSVKnLBN
-EObkKvbdiLddNtcZ
-EPDLKvbdrDdiPmvB
-EPDKjvbdKDKDRKCx
-DoDKjvbdtSqsZZeD
-DoDLKvbdwuNFRYlO
-DoCjjvbduLwvaTaX
-EObjjvbdtkxXBUBX
-EOcLKvbdSQTgJfEX
-EObjjvbddneTKtUS
-DoDLKvbdAMhYsXZx
-EOcLKvbdczZPwxqC
-EPDLKvbdjbkjqGtg
-EOcLKvbdFkEsChMu
-EObjjvbdbsCkUDia
-EObkKvbdEzsqElDJ
-EPDLKvbdGZUuBEYC
-DoCkKvbdzROmJJwA
-EPDKjvbduMXwAsaX
-EPCjjvbdqwQMDJZR
-DoDKjvbdqUUHSRkU
-DoCkKvbdwtleQxkn
-DnbkKvbdQvnEClHc
-EPDKjvbdjvXNcaww
-DoCjjvbdjggMFenL
-EPDLKvbdJYUBhLpp
-DnbkKvbdkNCLyeGo
-DoCjjvbdDoCkLWcE
-EOcKjvbdYqMeJNFR
-EPCjjvbdRDcApQdS
-EObjjvbdjblKpgVH
-EPDKjvbdqqtjnKaN
-DoDLKvbdwtmFRYlO
-DoCjjvbdnHEwmNgZ
-DncLKvbdaMjasVNH
-DncKjvbdnUtzLKSG
-DoDLKvbdkySrSyGt
-EPCjjvbdyNsIXriD
-DoCkKvbdRadFMIyL
-EOcKjvbdqvokbhxq
-EPCjjvbdYkrEUOLm
-EPDKjvbdrpWPKCvG
-DncKjvbdxUldpyLn
-EObjjvbdrbFmMHKy
-DoCjjvbdZHWdAPTJ
-DncKjvbdEPDLKwDE
-DnbjjvbdZHWdAPTJ
-DoDLKvbdNrsvHFUp
-DncLKvbdCTBDUFvr
-EPDLKvbduDDUvuno
-DoDLKvbddwystSFz
-DnbkKvbdmbJvwoNu
-EPCjjvbdcbTNSAUN
-DnbjjvbdnVUzKjRf
-EOcLKvbdYlRdUOMN
-DoCjjvbdTAFIgand
-DnbkKvbdpeceUVaI
-DoDLKvbdlZSrTYft
-EPCjjvbddePRbXDK
-EOcLKvbdJqZdnfNe
-EPCkKvbdRaceLhyL
-EPDKjvbdLAkGlaxR
-EPCjjvbdqGDdsvAh
-DnbjjvbdxZgefYEr
-EObkKvbdKWVGEFGi
-EPCjjvbdSQUHKFdX
-EPDKjvbdDxYLsssl
-EPCjjvbdfHjvSNqH
-EPCkKvbdQwODbkhD
-EOcKjvbdZnmiFEyj
-EPCkKvbdqwQMChyR
-EOcLKvbdZyDimcLr
-EObjjvbdjAQGaQGj
-EPCkKvbdZtJJYdTO
-EObjjvbdjFKgUoAO
-DnbkKvbdcScLUEKB
-EPDKjvbdjcMLRGuH
-EObjjvbdqlzKZLgi
-EOcKjvbdFfJrNiUR
-EObkKvbdKaKgNBxR
-EOcKjvbdHDjujBij
-EObkKvbdFejSOJUR
-DncLKvbdMIalRYAS
-EOcKjvbdVTlsekvK
-DoCjjvbdUQqOtthN
-DnbjjvbdVYgtZkOn
-DnbkKvbdrovOicVf
-DncKjvbdKfGIBaQu
-DnbjjvbdjuvnDaxX
-EPDLKvbdHakzEzAD
-EPDLKvbdyzdnRhIh
-DoCjjvbdZGvdAPTJ
-DoDLKvbdqvolChyR
-DncLKvbdjlbLyeHP
-EPCkKvbdmIdTptrB
-EPCkKvbdQcbaPqES
-DoDLKvbdddoSBwCj
-DnbjjvbdjvWnECXw
-DnbjjvbdZisHofbG
-EOcKjvbdZQldhldq
-DnbkKvbdfekymfgA
-DnbjjvbdLBKgMbYR
-EPCjjvbdEARiMzWw
-EObjjvbdtSrTYzEc
-EPDKjvbdZoOIddyj
-DnbkKvbdcSbjtEKB
-EObjjvbddndsKssr
-DoCjjvbdxnSgxShc
-EPCjjvbdOTUVfdtp
-DoCkKvbdUtMselWK
-DnbjjvbdJpydoGNe
-DoCkKvbdGQASwGey
-DnbjjvbdnGdxMnGy
-EPDKjvbdHDkVibKK
-DoCjjvbdtbbuXWOo
-EPDKjvbdKWVGEEgJ
-EObkKvbdGLEsCgmV
-DoCkKvbdbrbjtEKB
-EPDLKvbdRzJgrcWA
-EPCkKvbdaRecITfL
-EObjjvbdrbGMlHKy
-DnbkKvbdZdwfzgiC
-EPDKjvbdVwJXudFH
-DoCjjvbdiZtekqOG
-EObkKvbdqrUkOKaN
-EObkKvbdySnImRbH
-EObjjvbddoFTKstS
-EOcKjvbdyOTHxTJD
-DncKjvbdFVxoolie
-DoCkKvbdFejRnIsq
-EPDLKvbdptUGrRkU
-EOcKjvbdajlGOnDA
-EPDKjvbdrRtkOKaN
-EOcKjvbdzoQQeDLx
-EPCjjvbdrafMlGkZ
-EPCjjvbdmpZyWKyC
-DoCkKvbddBrlrAUN
-DnbkKvbdMgDPlpVL
-DnbjjvbdUxhTzKoO
-DoCkKvbdSCDdlIyL
-EPDKjvbdmbJvxPOV
-EPCkKvbdNGcQMpUk
-EPCjjvbdVqmxCFLc
-DoDKjvbdrDdhonWB
-EOcLKvbdYTLaNToY
-DoCkKvbdkIGlFemk
-EPDKjvbdNrsvHFVQ
-EPDLKvbdrzLoraHn
-EObkKvbdraelkgLZ
-DoDLKvbdBdQAujMf
-DncKjvbdwzIGGYFS
-EOcKjvbdZeXfzhIb
-DoDKjvbdbAueGPpX
-DoCjjvbdZtJJYcrn
-DoDKjvbdyqPNJKXA
-DoCkKvbdTAFIhCPE
-DoDLKvbdjblLQgVH
-DoCjjvbdZtJJZDsO
-EOcLKvbdrNZixkhJ
-DoCjjvbdzoPpdblY
-DnbkKvbdqcdhpNvB
-DncKjvbdYpldhleR
-DoCjjvbdmRyUysEJ
-DoCjjvbdJXtBgkqQ
-EOcKjvbdVwJYWDeH
-DoDLKvbdZLqdUOLm
-EPDKjvbdEXwlUUTl
-EObkKvbdoznDkYPA
-EPCkKvbdEASJNZvw
-EPCjjvbdFjdsCglu
-DoCkKvbdTlWPBWOi
-DnbjjvbdcTCjsdKB
-EObkKvbdkySrTYft
-EPCkKvbdLrXMytpz
-DncKjvbdZQmEhleR
-EOcLKvbdHkaznWpk
-DnbkKvbdHfgZyXxH
-EObkKvbdpecdtWAh
-DnbkKvbdRadElJYk
-EPCjjvbdTXkMNzjx
-DoCjjvbdmSYtzTEJ
-EPCkKvbdZsiJZDsO
-DncKjvbddoErkTtS
-DoCkKvbdZRMdiMeR
-EObkKvbdTfzmkvvF
-DncKjvbdpxnhHQcx
-EPDLKvbdaMjbStlg
-DoCjjvbdkHfkefOL
-DoCjjvbdqqtkOLAm
-DnbjjvbdyzeNqgiI
-EOcKjvbdiLeDnUby
-DncKjvbdyYIjCPyk
-EOcKjvbdpfEFUVaI
-EPCjjvbdZirgpHBf
-DnbkKvbdKWUecdgJ
-EOcLKvbdiHKCxvJu
-EPDKjvbdcTCkUEKB
-EOcLKvbdaMkBsVNH
-EPDLKvbdJutfEFGi
-EPCkKvbdFaOqZJzm
-EObjjvbdhaoCdvqR
-EPCkKvbddZxpXxqC
-DnbjjvbdZxcinDLr
-DoDLKvbdpssfqrKt
-DoCjjvbdqTsgRrLU
-EPDLKvbdEYXlUTtM
-EObjjvbduVmwjQsA
-EOcLKvbdNPxQunHT
-DnbjjvbdBhjajiGK
-DoCkKvbdUGznMXVe
-EPDKjvbdVwIwvEFH
-EObkKvbdRMwayNtz
-DoDLKvbdQZNAGrrK
-EObjjvbdKWUedFGi
-DoDLKvbdaNKartlg
-DncKjvbduWOXipsA
-EObjjvbduVmxKRTA
-DoDKjvbdygZMAMdw
-DoDLKvbdqTsfrRkU
-DoCjjvbdEvYpQMjF
-EObkKvbdNPxQunGs
-EObkKvbdsZlPsAgn
-DnbkKvbdZnnIddzK
-EPCkKvbdNQXqWOHT
-DnbkKvbdGLFSbhMu
-DoDKjvbdrzMPraIO
-DnbkKvbdZirgofaf
-EPDKjvbdijFhJlxS
-DncKjvbdWRmxBeLc
-DnbkKvbduDDUvuoP
-DoDKjvbdiZuGMQmf
-EObkKvbdelfXGljL
-EPDLKvbdfNFvfljL
-DncKjvbdGKdrcINV
-EObjjvbdFfJqnIsq
-EOcLKvbdILaznWqL
-DncLKvbdJutedFHJ
-EOcLKvbdIwtBhLpp
-EPDLKvbdsrrSyZdc
-EPDKjvbdczZQXxpb
-DncLKvbdDoCjjvcE
-EPCjjvbdpxoIHREY
-DoCkKvbdxxJJbPzL
-EPCkKvbdVZIUZkPO
-EPDLKvbdULuoBWPJ
-EPCkKvbdfMfWfmJk
-DnbjjvbdZtIiZETO
-DoCjjvbdiMEcnUby
-DoCkKvbdcyyPxZQb
-DoCkKvbdZirgofaf
-EObkKvbdozmdLYPA
-DoDKjvbdYkrEUNkm
-DoCkKvbdLqwMzVQz
-EObjjvbdLFfICBRV
-EObjjvbdjJehKNYS
-DoCjjvbdEJgiuwjA
-EPCkKvbdyqPNIiwA
-EPDKjvbdNdcsiIjd
-EPCjjvbdauBgXjsh
-DnbkKvbdyzeORgiI
-EPCkKvbdsCGNLgLZ
-EObkKvbdtbbtwVno
-EObjjvbdwuMdqZLn
-EObjjvbdSQTfiedX
-EPCjjvbdmttyjjSG
-DncLKvbdnHFYMnGy
-DncKjvbdxmsIXrhc
-EPDKjvbdQYmAGsRj
-EObjjvbdfoazvdYI
-DoDLKvbdhaoDEvpq
-EObjjvbdDihKVwjA
-DoCjjvbdZMSDtNlN
-DnbjjvbdhlFDnVDZ
-EPCjjvbdiCPCdwRR
-DncLKvbdULuoBVoJ
-DoDLKvbdyYJKBpZk
-DoDLKvbdRbDdlIyL
-EOcKjvbdYSlAlsoY
-DoCkKvbdySmhlqbH
-EOcKjvbduWNxKRTA
-DnbkKvbdFjeTDIMu
-DoDLKvbdzaAPGgCM
-EPCkKvbdBhkCLJGK
-DnbkKvbdYpmFJNFR
-EPCjjvbdQccBQQdS
-EOcKjvbdqGDdtVaI
-EOcLKvbdILazmvqL
-EPDLKvbdajkennDA
-DoDKjvbdxVMdqZLn
-EPDKjvbdNPxQunGs
-EObjjvbdhytfMROG
-EPDKjvbdEXxLtTtM
-EPDKjvbdZnnIdeZj
-DoDKjvbdGKeTChNV
-DncLKvbdjmCMZeGo
-DnbkKvbdQwNdClHc
-DncKjvbdXrlBMtOx
-DoCkKvbdzaAOgHBl
-DncLKvbdcIlijewY
-EObjjvbdrbFllHKy
-EOcKjvbdmbJwXnmu
-EObkKvbdssSSxydc
-DoDKjvbdSQTgKGEX
-DnbjjvbdUyHtZkPO
-EPCjjvbdFyUuAdYC
-DoCkKvbdqFcdsvBI
-EOcLKvbdqwQLbhyR
-DoCkKvbdbsCkUEKB
-EPCjjvbdIjEAKQHE
-DnbkKvbdaNKbTUmH
-EObkKvbdnCKWxPOV
-EOcLKvbdZxcinClS
-EObjjvbdhlFDnVDZ
-DncLKvbdpyPHfpdY
-EOcKjvbdTlVoAuoJ
-EOcKjvbdmbKXXoOV
-DoCkKvbdxsOImSBg
-DncKjvbdZHXEAPTJ
-DoDLKvbdDjIKVwjA
-DoDLKvbdnCJvwoNu
-EPCjjvbdZeYGzghb
-EPDKjvbdHffzYxXg
-EObjjvbdirzhrkJz
-DoCjjvbdZnnJFFZj
-EPDKjvbdeATqMwif
-DoDKjvbdbVCHXjsh
-DoCjjvbdGckVjCKK
-EOcLKvbdyYJJbPzL
-DoCjjvbdiCPDFWpq
-EOcLKvbdIwtCILqQ
-DoDLKvbdKQzFOfOF
-EOcKjvbdNPwqWNgT
-EObjjvbdZLqcsmkm
-EPDLKvbdnPyxvKxb
-DoDLKvbdKjaHvAKZ
-EObjjvbdjKFgjNYS
-DnbkKvbdLAkGmCXq
-DoDLKvbdeEoSBwCj
-DnbjjvbdHlBznXRL
-DnbjjvbdKfGHbBRV
-DnbkKvbdZQldiMdq
-EOcLKvbdnBivwnnV
-DncKjvbdsQVoKDWG
-EObkKvbdypnlhiwA
-EObkKvbdrykpTAgn
-DoCjjvbdaMkBsUmH
-EPDLKvbdRDcBPqES
-DoCjjvbdpxngfpdY
-EOcKjvbdEztRFLbi
-EOcLKvbdcbTNSAUN
-DoCkKvbdjcLjpfuH
-EPCkKvbdjSzhsKiz
-EPCkKvbdoAKztIDn
-EPCjjvbdMgDQNPuL
-DoDLKvbdKNAEZgVB
-EPCjjvbdZsiJZDsO
-EOcLKvbdkCkkQfuH
-DoCjjvbdnGeXmNfy
-DnbjjvbdrpVoJbuf
-DoCkKvbduCbuWuoP
-EObjjvbdSwkMNzkY
-DoCkKvbdrNZiyMHi
-DnbjjvbduDCtvuoP
-DoDLKvbdMuSqjmAX
-EObkKvbdsQVnicVf
-EPCjjvbdmfeYNNgZ
-DncLKvbdmIdURUqa
-EPCkKvbdGBPQyJzm
-EPCjjvbdZRNFImEq
-DncKjvbdNddUJJLE
-EObkKvbdaSFbgsek
-DncKjvbdDoCkKwDE
-DoCjjvbdtkxWaUBX
-DncLKvbdfNGXHMjL
-EPCkKvbdqTtHSSKt
-DnbkKvbdxmrhXsJD
-DnbjjvbdmttykKSG
-EObjjvbdqcdhomua
-DoCkKvbdVTlsfMVj
-DnbkKvbdRECaPpcr
-DnbkKvbdijFhKNYS
-EObkKvbdIwsbIMRQ
-EPDLKvbdJbibqJbx
-EPDKjvbdxxJKCPyk
-EOcKjvbdjuvnECYX
-DnbkKvbdKRZePFme
-DnbkKvbdMpYRVnGs
-EOcKjvbdfMevgNKL
-DoCkKvbdmfeXmOHZ
-DncLKvbdFpATXGey
-DoDKjvbdJXtCIMQp
-EObjjvbdZshiZDsO
-EPDLKvbdaRfDHsfL
-DncKjvbdMIakqYAS
-EObjjvbdSLZGUfjs
-DoDKjvbdBcoaWJmG
-DoDKjvbdEuxpPlie
-EObjjvbdJcJbqKCx
-DoCjjvbdxwhiapZk
-DnbkKvbdsBemLfkZ
-DoDLKvbdHgGyxwxH
-EOcKjvbdQdDApRDr
-EPDLKvbdKWUfDeHJ
-DnbjjvbdjvXODbYX
-DoDLKvbdHELWJbKK
-DncLKvbdgFkynHHA
-EPCkKvbdPxmAHSqj
-DoDLKvbdYkqdTnLm
-EPCkKvbdJYUCILpp
-EOcKjvbdxwhjBpZk
-DoCjjvbdiMFENtcZ
-DoCjjvbdnCJvwoOV
-DoDKjvbdSKxetgKs
-EOcKjvbdWRmxCFMD
-EOcLKvbdpedFTvBI
-EObkKvbdbAvEfPow
-EObkKvbdZnmiEeZj
-DnbkKvbdtTSSyZeD
-EPCkKvbdPxmAGsRj
-EPCkKvbdVTmUGLvK
-EObkKvbdJmADyfta
-EOcKjvbdwWlBVaWV
-DoDLKvbdjcMKqGtg
-EOcLKvbdGGJrNiTq
-DnbkKvbdgPazvdYI
-EPCkKvbdGLEsDHmV
-DnbjjvbdqceIomua
-DncLKvbdjbkjpgUg
-DoCjjvbdSxLLmzkY
-EPDLKvbdjKGHilxS
-EPDKjvbdmbJvwoNu
-EPDKjvbdjmBkyeHP
-EPDLKvbdzROliJwA
-DnbjjvbdUaBprprZ
-DoDKjvbdtbbtwWPP
-DnbjjvbdURQoVVHm
-DoCjjvbdjbkjqGuH
-DoCjjvbdRbEFLhyL
-DncKjvbdBcpAujMf
-DoCkKvbdPxmAGrqj
-EPDLKvbdZRMeImFR
-EOcLKvbdcScKscia
-EObjjvbdeXytTrFz
-EPCjjvbdKfGICBQu
-DncKjvbdijGIKMwr
-EObjjvbdZLqctOLm
-EObkKvbdSLZFuGjs
-DnbjjvbdZMRcsnMN
-EPCkKvbdWSOYBeMD
-EObjjvbdRacdlJYk
-DnbjjvbdFyVUaEXb
-EObjjvbdRbEFLiYk
-EObjjvbdZjTIQGaf
-EPCkKvbdNsTugEtp
-DoCkKvbdEASIlyvw
-DoCjjvbdsrrSxzFD
-DoDLKvbdQwOEDMID
-EPDKjvbdaaVeGQPw
-DoCjjvbdFejRnItR
-EObkKvbdRacdlIyL
-DnbjjvbdGGJqnIsq
-DoDLKvbdGYtuBDxC
-DncKjvbdbLMGPODA
-EObjjvbdqYoIGpcx
-DncKjvbdrykosAgn
-EPCjjvbdJbjDQjCx
-EObjjvbdkySqsYft
-EPDKjvbdxwhjBpZk
-DncKjvbdauBfwkTh
-EPCkKvbdtSrSxydc
-DoDKjvbdMRvmZuQz
-DncLKvbdnUtyjiqf
-DoDKjvbdSLYetgKs
-DoDLKvbdJbjCqJcY
-EPDLKvbdShyiqAAl
-EPDLKvbdSQUHJfDw
-EOcLKvbdijFhJmYS
-EPDLKvbdvwMBWAvV
-EObjjvbdeXytUSFz
-EObjjvbdWXJXuceH
-EPCkKvbdrDeIomvB
-DncKjvbdczZQXyRC
-DnbjjvbdQlxCZOUz
-EPCjjvbdQccApRDr
-DoCkKvbdqiAJdloF
-DoCjjvbdDwwktTtM
-EPCjjvbdRpUGjGEX
-DnbkKvbdWfYytAPT
-EPCjjvbdUMVoBVni
-EObkKvbdxnShYTIc
-EObjjvbdVAaqSprZ
-DncLKvbdKVtfDdgJ
-DoCjjvbdliEUQtqa
-DnbjjvbdiGjCyWKV
-DnbjjvbdqrVLOLBN
-EObkKvbdUaCRSqSZ
-EObkKvbdTkvPAuni
-DoCjjvbdIGgZyXwg
-DoDLKvbdssRsYzEc
-DnbjjvbdZLqdTmkm
-EPCjjvbdUtNTfLvK
-DncKjvbdfMewGmJk
-EOcLKvbdCTBDTfWr
-EPDKjvbdFpASwGey
-EPCjjvbdZLrETmkm
-EPDLKvbdyXhjCQZk
-DnbkKvbdeATqMxJf
-DoCjjvbdjJfHilwr
-EPDKjvbdzitopESt
-EPDKjvbdEuxopMjF
-DoCkKvbdvBEYroFI
-DnbkKvbdrNZiyMIJ
-EPCjjvbdxVMdpyMO
-DnbkKvbdQlxCZOUz
-DnbkKvbdqmZiyLhJ
-DncLKvbdXnRAXuWU
-EObkKvbdRadElJYk
-DncKjvbdLiBkqYAS
-DnbjjvbdmRyUysDi
-DoDKjvbdKCicQjDY
-EOcLKvbdRkZGVGjs
-DoDKjvbdtSrSyZdc
-EOcKjvbdRyjISbvA
-EPCjjvbdHffyyYYH
-EOcKjvbdaogHDkzd
-EPCjjvbdidkGuPAO
-EOcKjvbdCDpAujMf
-DoCkKvbduVnXjQsA
-DnbjjvbdTulQJtAq
-DncKjvbdqTsgRrLU
-DoCkKvbdzdynzdyp
-EObkKvbdemGXHNKL
-EOcKjvbdJXtCHlRQ
-EPDKjvbdegkWRnQg
-DoCjjvbdyXiKCPyk
-EPDLKvbdlZTRsZHU
-DoCjjvbdfNFvgNKL
-DnbjjvbdbVBgYLTh
-DncKjvbdcJMikFvx
-EPDLKvbdUMVnaVoJ
-DoCkKvbdgQBzvcxI
-DoCjjvbdZtIhxdSn
-EPCjjvbdRWnEDMID
-EObkKvbdjlakydfo
-DncLKvbdrpWOicVf
-EOcKjvbdhgKDYuiu
-DoDKjvbdmIdTqUqa
-EPCjjvbdwtleQxkn
-EObkKvbdcJNKKfWx
-DncLKvbdNsUWGdtp
-DoDKjvbdWSOXbEkc
-EPCkKvbdpyOhHREY
-DoDKjvbdkyTSTYft
-EPCjjvbdFjdrbgmV
-DncLKvbdrounjDWG
-DoDKjvbdVTmTfLvK
-EPDLKvbdSCDeLiYk
-DoCkKvbdrXPlDIxq
-DncLKvbdKVuGDeHJ
-DnbjjvbdrWokcIxq
-EObjjvbdKVuGEEfi
-EPDLKvbdrbGMlGjy
-EPDKjvbdlqxtzSci
-EOcLKvbdwygeeweS
-EObjjvbdjKGIKNYS
-EObkKvbdVrOXbElD
-DnbjjvbdrMzKZLgi
-EPCkKvbdMpXqWNfs
-EPDLKvbdrSUkOLAm
-EPDKjvbdZisIPfbG
-EPDLKvbdRDbaQRES
-DncKjvbdVTmUGLvK
-EOcKjvbdYzcGRjWZ
-EObjjvbdMuSrLNAX
-DncKjvbdjgflGFnL
-DncLKvbdWIXvXfxz
-DoDLKvbdNHComPtk
-EOcLKvbdSBceLhyL
-DoCkKvbdZRMeImFR
-EPDLKvbdiifIKMwr
-DoCkKvbdvBDxsOeI
-EPDLKvbdxmsHxShc
-EOcKjvbdcyyPxZRC
-DoCkKvbdsBfNMHKy
-DoDLKvbdaRebhTfL
-DncLKvbdypoNJKXA
-EObkKvbdzRPNJKXA
-DnbkKvbdTvLoitBR
-EOcKjvbdWHwuxGxz
-EObjjvbdZHWdAPTJ
-DnbjjvbdySnJMqag
-EPCkKvbdtTRsYzFD
-EPDLKvbdhytelQnG
-EPCkKvbdTppntuHm
-DnbjjvbdZeYGzhIb
-EPCjjvbdIwsaglQp
-DoCkKvbdpstGrRkU
-EObjjvbdCJLBjiFj
-EOcLKvbdePErjstS
-EPDKjvbdpxnhGqDx
-DnbjjvbdZyEKOClS
-DoCjjvbdpyOhHREY
-DncLKvbdNGcPmPuL
-DoDLKvbdQwNccLgc
-EPDKjvbdmbJvxPNu
-DnbkKvbdQwOEDMHc
-DoDKjvbdXrlAltOx
-EPCkKvbdGQASvgGZ
-EOcLKvbdmttykKSG
-EOcLKvbdGLFSbgmV
-DncLKvbduCbuWvOo
-EPDKjvbdSQTfiecw
-DoCkKvbdYkqctNkm
-DoDLKvbdlZSqsZHU
-DoDLKvbdqGEEtVaI
-EObjjvbdhytekpmf
-DoDKjvbdmuUzKiqf
-EObjjvbdrMyiyLhJ
-DoDLKvbdEARhlzWw
-EObjjvbdaRfCgsek
-EPDKjvbdaNKaruNH
-EOcLKvbdJqZeOenF
-DnbjjvbdTfzmlXVe
-DoCjjvbdzQoNIjXA
-EObkKvbdMpYQvNfs
-DncLKvbdVrOYCElD
-DoCjjvbdijGIJlwr
-DoDLKvbdrXQMDIyR
-EPDLKvbdEYYMUTtM
-DncKjvbdkHgMFenL
-DnbjjvbdqdFIpOWB
-EObkKvbdqFceTvAh
-EObjjvbdyOSgxSiD
-EOcKjvbdDnbkKvcE
-DoDLKvbdYqMeImFR
-EObkKvbdwtleRZMO
-EPCkKvbdrWolCiYq
-EObjjvbdrXPkcJYq
-DoCkKvbdtlXvaUBX
-EOcLKvbdeYZssrFz
-DoDLKvbdnGeYMnHZ
-EObkKvbdYTLaMtOx
-DoDLKvbdJcJcRKDY
-EPDKjvbdeKJrVtzn
-DoCkKvbdrSUkNjaN
-DncKjvbdeATqNXjG
-EObkKvbdqlzJyLhJ
-EObjjvbdDjIJvXjA
-EObjjvbdzGyMAMdw
-DoDLKvbdFfJrNiTq
-EOcLKvbdBhkCKiGK
-EObjjvbdpssgSRjt
-DncKjvbdKaLGlbXq
-EOcLKvbdlYrqrxgU
-EPCjjvbdVqmxBeLc
-EPDLKvbdZQmFJNFR
-DoCkKvbdkCkkQfuH
-DncKjvbdauCGwjsh
-DoCjjvbdEASIlywX
-DncKjvbdLAjgNBxR
-DncKjvbdCDpBVimG
-EOcLKvbdqlzJxkhJ
-EPDLKvbdtvNxKRTA
-DnbkKvbdGLFScINV
-DoCkKvbdQvmdCkhD
-EPDKjvbdFjdrbhNV
-EPCkKvbdZLrETnLm
-EPDLKvbdTvLoisaR
-EPDLKvbdsrrTZZdc
-EPCkKvbdZMRcsmlN
-DncLKvbdxnTHxTIc
-EOcKjvbdzROliJwA
-EOcKjvbdsQVnjDVf
-EObkKvbdqGDdsvBI
-DncKjvbdwtleQxkn
-EObjjvbdTqRPUuHm
-DnbjjvbdVwIwvEFH
-EPCjjvbdZshhxcsO
-DoCkKvbdKCibqJbx
-EOcKjvbdUVlQKTaR
-EObkKvbdVTmUFlWK
-EOcLKvbdmIctRVRa
-DoDKjvbdPIAYZAYa
-DoCkKvbdjvWnDbXw
-DnbjjvbdtvNwjRTA
-EObjjvbdNHComQUk
-EOcKjvbdySnImRbH
-DoCjjvbdDjIKVxKA
-DncLKvbdKefHbApu
-EObjjvbdehLWRmpg
-EOcLKvbdJTZAsMwl
-DoDKjvbdZirgpHCG
-EObkKvbdozmcjxPA
-EObkKvbdsZkosAgn
-EPCjjvbdSxKlNzjx
-DoCjjvbdfILVrNpg
-EPCjjvbdGGKRnJTq
-DnbjjvbdpssgSSLU
-DoDKjvbdrDdiPmvB
-EPCkKvbdZtJJYcsO
-DoDLKvbdNdctIhkE
-EPCjjvbdcImJkFvx
-EOcLKvbdGLErbhNV
-DoCkKvbdnQZxukYb
-EPCkKvbdWSNxBeLc
-EPCkKvbdsPvOjDWG
-EOcLKvbdeFOqavbj
-EPCjjvbdjAQHApHK
-EPDKjvbdwXMBVaVu
-DncLKvbdMowqWNfs
-DoCkKvbdRbEFMJYk
-DoCkKvbdrNZjZLhJ
-DoCjjvbduDCtwWPP
-EObjjvbdNeEUJIjd
-DnbkKvbdlYsRsYgU
-DoCjjvbdUxgsyjnn
-EObkKvbdbLMGPODA
-DoCkKvbddneTKtUS
-EOcKjvbdvvkaWAuu
-EPDKjvbdVUNUFkuj
-EObjjvbdKDKDQjCx
-EPDKjvbdnUuZjiqf
-DoCkKvbdsCFmMGkZ
-DncKjvbdrpVnjDWG
-DnbjjvbdiZtfMQmf
-DoCkKvbdwWkaVaVu
-DoCjjvbdSCDeLiZL
-DncKjvbdEYYLtTsl
-EPDLKvbdOSsufeVQ
-EOcLKvbdWSOXadlD
-EPDLKvbdpaJFAXHd
-DncKjvbdSCDdkhyL
-DoCjjvbdIMBzmvqL
-DnbkKvbdVUMsfLvK
-DoCkKvbdlhctQuSB
-DncKjvbdJuuGEFGi
-EPCjjvbdJSyAsMwl
-EOcKjvbdUtMtGMVj
-EPCkKvbdHDkWKCKK
-DncLKvbdySnImRag
-EPCjjvbdwMvAMcdm
-DnbkKvbdelevfmJk
-EPDKjvbdYORAYUvU
-EPCkKvbdVwIxWDeH
-EObjjvbdtvOXipsA
-DncLKvbdhlEdOUcZ
-EOcLKvbdTlVoAuoJ
-EPCkKvbdNQXpunHT
-EOcLKvbdWXJXvDdg
-DnbkKvbdZoOJFEzK
-EObkKvbdmbKWwoOV
-DnbjjvbdiHKDYvKV
-DncKjvbdfSBWzlDP
-DoCkKvbdLBKflawq
-EObkKvbdUsmUFkvK
-EObjjvbdLqwNZtpz
-DoCkKvbdsBfNLfjy
-DncLKvbdjvWmcbYX
-EObkKvbdaMkBruMg
-EPCkKvbdHkazmvqL
-DnbjjvbdRyjHrbvA
-EPCkKvbdNQXpvOHT
-EObjjvbdOYPVzcnU
-DoCjjvbdaSGCgtFk
-DoDKjvbdxmsHxSiD
-EObjjvbdZirgogCG
-EOcLKvbdmuVZkKSG
-DncLKvbdUyHszKnn
-DnbkKvbdxmsHxTJD
-EPCkKvbdVrOYBdkc
-EOcLKvbdhkdcmuDZ
-DncKjvbdwuMdpyLn
-EObkKvbdxVMdpxlO
-EPDKjvbdmbKWwoOV
-DoCjjvbdhkeDmtby
-DncLKvbdLFehCBQu
-DoCkKvbdYSkaNUOx
-DnbkKvbdmaivxPNu
-EPDKjvbdfNFvgNKL
-EPDKjvbdhlEdOUcZ
-EPDLKvbdTukpKUAq
-DncKjvbdUVlQKTaR
-DnbkKvbdYgWdAPSi
-DoDKjvbdIwsbHkpp
-EOcKjvbdlZTSTYgU
-DoCkKvbdNHColpVL
-EPCjjvbdxrmhmRag
-EObkKvbdUxgsyjnn
-DoCjjvbdsQVoJbvG
-DoCkKvbdBdQBVjMf
-EObkKvbdIHHZxxXg
-EOcKjvbdJuuFdEgJ
-DoDLKvbdwyhGGXeS
-DnbkKvbdSKyFuGkT
-DoDKjvbdiGibxvKV
-DncKjvbdnBjXXoNu
-DnbkKvbdFpATWffZ
-EPCjjvbduDCtvvOo
-EObjjvbdIsZArlxM
-DncKjvbdEvYopMjF
-EObjjvbdwuMdqYkn
-DoCjjvbdwyhFfYEr
-EPCjjvbdqUTfrSLU
-EOcLKvbdzGxlANEw
-EPCjjvbdEOcKjwCd
-EPCkKvbdOSsvGeUp
-DncKjvbdhlEcnUcZ
-EPCkKvbdUVkoitAq
-DnbjjvbdOAJTTjSA
-DncKjvbdqmZiyLhJ
-EObjjvbdpstGqrLU
-EPDLKvbdFxuVAcwb
-DoCkKvbdauBgYKsh
-DnbjjvbdZMRcsmkm
-EOcLKvbdqrVLNkBN
-DoDKjvbdNQYRWNgT
-DoCjjvbdCTBCtFvr
-DncKjvbdZyEKNcMS
-EPCkKvbdVviYVdFH
-DoDKjvbdePErjtUS
-EObkKvbdwtmFRZLn
-DncKjvbdpedEsvAh
-EPCkKvbdzoQRFClY
-DoDKjvbdIxTbIMQp
-DoDLKvbdxsOImSCH
-EPCjjvbdYfwEAOri
-EOcKjvbdnPyyWLZC
-EOcKjvbdhlFEOVCy
-DoCjjvbdwyhFfXdr
-DnbkKvbdZQmEhleR
-DnbjjvbdbAudepPw
-DnbjjvbdMpXqVmgT
-DncLKvbdNeEUIhjd
-EObkKvbdMfbomQUk
-DoCkKvbdqvpMDJYq
-DoDLKvbdfekzNfgA
-EOcLKvbderAvzlCo
-EOcLKvbdiZtelQnG
-EPDLKvbdRXNdClHc
-EPDKjvbdNrsufeUp
-DncKjvbdZQldiMeR
-EObkKvbdiLdcmtby
-DncLKvbdZQmEhleR
-DncLKvbdZRNEiMdq
-DncLKvbdWRmwadlD
-EPDLKvbdGLEsDHlu
-DncLKvbdZjTIPgCG
-EObjjvbdxnTIXsIc
-EPCjjvbdliETptqa
-EOcKjvbdlrZUyrci
-DoDKjvbdbKlFnnDA
-DnbjjvbdwXLaWBWV
-DoCkKvbduaEZSoFI
-EPCjjvbdRyjHrbvA
-EPCjjvbdLhakpxAS
-DoCkKvbdmaiwXoNu
-EOcKjvbdyNrhYShc
-EObjjvbdsCFllGjy
-DnbkKvbdZshhxdTO
-DoDKjvbdZjShPfaf
-EOcKjvbdmajWwnmu
-EObjjvbdJvUfEFHJ
-EPCkKvbdOEcsiIkE
-EPCkKvbdkNBlZeGo
-DoCjjvbdVviXudFH
-DnbkKvbdjJfHjMxS
-DoDLKvbdGBPRZJzm
-EOcKjvbdiCObdvqR
-DnbjjvbdVwJYWDeH
-DncKjvbdGAoQxizm
-EObjjvbdxmsIYSiD
-DncLKvbdqqtkOLAm
-EObjjvbdvvlAvBWV
-DncKjvbdvAdZTPFI
-EOcKjvbdjAQHAogK
-EObkKvbdpxoIHRDx
-EPCkKvbdffLynGgA
-EPDLKvbdTvLpKUAq
-EOcKjvbdmttzKjSG
-DoCkKvbdqwQMChyR
-DoDKjvbdrzMPsAgn
-DoDLKvbdyYJKCPyk
-DoCkKvbdRbEEkhxk
-EPCkKvbdBdQAuilf
-EPDLKvbdRaceMIyL
-EOcKjvbdraelkfjy
-EOcLKvbdEASIlzWw
-DnbkKvbdOSsvGeUp
-DnbjjvbdmuVZkJrG
-DnbkKvbdVwIwvDeH
-DoDKjvbdwWlAvBVu
-DncKjvbdSKyFuGjs
-DoCkKvbdOXnuzcmt
-DncKjvbdrXPlDJZR
-EPDLKvbdsBfNMGjy
-EPDLKvbdiifHilwr
-DnbkKvbdjvWmcbYX
-DoDLKvbdZnmhddyj
-EPCkKvbdemFvfmKL
-EPDLKvbdNxPVzcnU
-DnbjjvbdRkYfUgLT
-EPCkKvbdZRMdhldq
-EObjjvbdYqMdhmFR
-DncLKvbdJvVGDeGi
-EPDKjvbdUtMsfLuj
-DoDLKvbdZyEJnClS
-DnbkKvbdjcMKqGtg
-EPCjjvbdDnbjkXDE
-DnbjjvbdLGGICAqV
-EPDKjvbdWIXvYGxz
-EOcLKvbdBiLCKhfK
-DnbkKvbddwzUURez
-EOcLKvbdZQldiMdq
-DncLKvbdKVtfEFGi
-DoCkKvbdvAcxsPEh
-DncLKvbdjvWmcbXw
-EObkKvbdqiAJeNOe
-EOcLKvbdUMWPBWPJ
-EPCjjvbdOFDshhjd
-EOcLKvbdVrNxBeMD
-EPDKjvbdiGicZWKV
-EObkKvbdtTRrxzFD
-DoCjjvbdjJfHilxS
-DoCjjvbdelfXGmKL
-EPCjjvbdIrxaTMwl
-EOcLKvbdRECaPpcr
-DnbkKvbdiLeDmtby
-EPDLKvbdGcjvKCJj
-EOcKjvbdWWiXuceH
-DoCkKvbdpstHRrLU
-EPDLKvbdkHgLeemk
-EPCkKvbdzGxlANEw
-EObkKvbdjKGHjMwr
-EPCkKvbdiUzEvquC
-EOcLKvbdwXMBWBVu
-EObkKvbdeKKRvUzn
-DncLKvbdSBceLhxk
-DoDLKvbdJbibqJbx
-DncKjvbdeAUQlxJf
-EPDKjvbdbUafwkUI
-DoCkKvbdxnTIXriD
-EPDLKvbdRacdlJYk
-EOcLKvbdmgFXlnGy
-EOcKjvbdHELWJaij
-EPDLKvbdLhbMQxAS
-DnbkKvbdhbPDFXRR
-EOcKjvbdqwQMDIxq
-DncKjvbdeOdrkTsr
-EObjjvbdyOSgwriD
-EPCkKvbdjmCLyeHP
-DnbjjvbdZisHpGbG
-EOcKjvbdIHGzZXwg
-DncLKvbdwWkaWAvV
-DoDKjvbdffLzOHHA
-EPCjjvbdqZPIHREY
-DoCkKvbdDjHivYKA
-DoDLKvbdYNqAYVWU
-EPCkKvbdzjUpPcrt
-DncLKvbdlqyVZrdJ
-DncLKvbdDoDLLXDE
-DoCjjvbdcSbjtDia
-DoDKjvbdDxXlUTsl
-DncLKvbdJYTahLpp
-EObkKvbdNQXqVnHT
-EObjjvbdijGIJlxS
-EObjjvbdOStVfdtp
-EPCkKvbderBWzlCo
-EObjjvbdKQzEnenF
-EPCjjvbdmtuZkKRf
-EPCkKvbdEJhJuxKA
-EPCjjvbdgGLymfgA
-EObjjvbdRbDeLhxk
-EOcKjvbdrSUkNkAm
-DoDLKvbdEOcLLXDE
-EObjjvbdBhjbKiFj
-DoDLKvbdBdQAuimG
-DnbjjvbdDwwkstTl
-DoDLKvbdVwJYVdEg
-EOcKjvbdACqwizJQ
-EObjjvbdZsiIyETO
-EObkKvbdGLFSbhMu
-EOcLKvbdFkFTChNV
-DnbjjvbdVBCRSprZ
-DoCjjvbdssRsYydc
-DoCkKvbdUMWOaWOi
-DoDKjvbdYSlBMsnx
-EObkKvbdNsTvHFVQ
-EPDKjvbdZisIPfaf
-EOcLKvbdpssfqqjt
-EPCkKvbdNHCpMpVL
-EPDKjvbdczZPwxpb
-EPCjjvbdnBivxPOV
-DoDKjvbdUtNTelVj
-EPDKjvbdjhHMFfNk
-EObjjvbdEuyPolie
-EPDLKvbdKQydneme
-EPCkKvbdQvnECkgc
-EPDLKvbdatbGxLTh
-DoDLKvbdNPxQvOGs
-DoDLKvbdySnImSCH
-EObkKvbdvBEZTOeI
-DoCjjvbdatagXkUI
-DnbjjvbdmbKXXnnV
-EOcLKvbdmbKXXoNu
-EPCkKvbdNsUWGduQ
-DncLKvbdpssgSRjt
-EPDLKvbdiUzFXSUb
-EObkKvbdyzeORgiI
-EOcLKvbdKDKDQibx
-DoCjjvbdmJDtQuSB
-DncLKvbdaNKaruMg
-DnbkKvbdOEctJJKd
-EObjjvbdkVvnECXw
-EObkKvbdKaLHMbXq
-DoCjjvbdYzcFqiuy
-DoCkKvbdvwLaWAvV
-EPDLKvbdnBiwXoNu
-EOcLKvbdLBKgNBwq
-EPCkKvbdCJLBjiFj
-EObjjvbdptUGqrLU
-DoCkKvbdWXJYWEFH
-EOcLKvbdNeEThiLE
-EPCjjvbdtAHQhAAr
-EOcKjvbdUGzmlXVe
-DnbkKvbdrylPsBIO
-EPCjjvbdICLzEzAD
-EPDKjvbdrpVoKCuf
-EPCjjvbdRkZFuGjs
-Dnbjjvbdznopdbkx
-DoDLKvbdmgFYNNfy
-EObjjvbdptUHRrKt
-DoCkKvbdhfjDZWJu
-DncLKvbdLGFgbBRV
-EPCjjvbdZnnIeEyj
-DoDKjvbdmtuZjirG
-EPCkKvbdmbJvwoOV
-DncLKvbdJpydoFme
-EPDKjvbdFyUtaEXb
-DnbkKvbdqFcdtWAh
-DnbjjvbdWRnXaeMD
-EOcKjvbdCIkBkJGK
-EOcKjvbdJTZBSlxM
-DnbjjvbdziuPocsU
-DnbjjvbdhzUelQmf
-EPCjjvbdUaBqSprZ
-DncLKvbdxZgefXdr
-EObjjvbdKVuFdEgJ
-EPCjjvbdAMgyTWzY
-DnbjjvbdiHJbxuiu
-DoDLKvbdUtNTekuj
-EPCjjvbdUQpnttgm
-DoDLKvbdVAbRTRSZ
-DncKjvbdkxsSTYgU
-DnbkKvbdMfbomQUk
-DoCjjvbdTAEiHbOd
-DoCjjvbdczZPxYpb
-DnbkKvbdUVkojUBR
-DncKjvbdddnqavbj
-DoDLKvbdxwhiapZk
-DoDKjvbdZirhPfaf
-DoDKjvbdTukoitAq
-DoCjjvbdrJAKFMne
-EObkKvbdZQmEhmFR
-DoCjjvbdHgHZyXxH
-DncLKvbdNHCpNPuL
-DoCkKvbdfIKvRmpg
-DoCjjvbdNsUWHEtp
-DoCjjvbdpfDdtWAh
-DoDLKvbdBhkCKiGK
-EObjjvbdtSqsYydc
-EPDLKvbdQccBPqES
-EOcLKvbduMXvaUAw
-EOcLKvbdZMRctNkm
-EObjjvbdRadFMIxk
-DncLKvbdjhGlFfOL
-DoCjjvbdhtzEvqtb
-DnbjjvbdUtNUGMWK
-EPCjjvbdaaWEfQQX
-DncKjvbdunszpkOt
-DoDKjvbdEJgjWYKA
-DoCkKvbdQYmAGsRj
-DoCjjvbdmozYujyC
-DnbkKvbduVnYKRTA
-DnbkKvbdZxcjNblS
-EPDKjvbdzRPNIiwA
-EObkKvbdzitopESt
-EObjjvbdfILVrNpg
-DoCjjvbdNGcPmPuL
-DnbjjvbdEYXlUUTl
-DnbjjvbdraellHKy
-DoDKjvbdZQmEhmFR
-DoCkKvbdZnnIdeZj
-DnbjjvbdjcMKpgVH
-EObkKvbdTfznLvue
-EOcKjvbdFkErcIMu
-DncKjvbdGdKvKBjK
-DoCjjvbdVvhwvEFH
-EPCkKvbdmJEUQuSB
-DncKjvbdIsZBSlxM
-DnbkKvbdmbJvxPNu
-DoDKjvbdTqRPVUhN
-DoDLKvbdwygefXdr
-DnbjjvbdLGGHbBRV
-DncLKvbddijSVtzn
-EObkKvbdZnnJFFZj
-EOcKjvbdCTBCsfXS
-DoDLKvbdmttzKjSG
-EOcKjvbdyNsIXsIc
-EOcKjvbdbVBgXjtI
-EOcLKvbdGFjRnJUR
-DnbkKvbdYTMBMtOx
-EPCkKvbdNGcQMouL
-DoDKjvbdJcKDQibx
-DoDLKvbdrpWOicWG
-EOcKjvbdRaceMIyL
-EPDLKvbdWWiYWDeH
-EPDLKvbdczZQXxqC
-DoDKjvbdLBKgMaxR
-DnbjjvbdZjShQHBf
-DoCkKvbdKaLGlbXq
-DnbkKvbdGdKujCJj
-EObkKvbdIBkydzAD
-DnbkKvbdqUTgSRkU
-EOcLKvbdBiKbKhfK
-DoDKjvbdVwIwvEEg
-EPDKjvbdIjEAKQHE
-DoCkKvbdEPCkLWcE
-DoDLKvbdrDeJQNua
-EOcLKvbdNddUIhjd
-EPCkKvbdYNqAXtvU
-EObkKvbdUaCRSqRy
-EPCjjvbdqqtjmjaN
-EPDLKvbdhbOcFWpq
-DoDKjvbdULvPBVni
-DoDKjvbdGGJrOJTq
-DoCkKvbdqceIpNvB
-EOcKjvbddePSCXCj
-EPCjjvbdVUNTekuj
-DnbjjvbdLGGHbApu
-DoCkKvbdcTDLTcia
-DnbkKvbdNsUWGeVQ
-EObjjvbdZLqcsmlN
-EObkKvbdxrnJMrCH
-DnbjjvbdqvolChxq
-EPCjjvbdaNKbSuNH
-DnbkKvbdlYrrTYft
-EPCjjvbdwtldpyMO
-DnbkKvbdNddThiKd
-EPCkKvbdjJfIJlwr
-EPCjjvbdJpzEoFme
-DnbkKvbdiMEcmuDZ
-EOcKjvbdkVvmdBww
-EOcLKvbdAMgxrwZx
-EObjjvbdatbGwjtI
-EOcKjvbdTAEhhCOd
-DnbjjvbdfNFwHNJk
-EObjjvbdVBBqSpqy
-EPCjjvbduaEZSndh
-EPDLKvbdpstGqqkU
-DnbkKvbdIwtCHlQp
-DncKjvbdrbGNMGkZ
-EOcKjvbdILaznWqL
-DoCjjvbdTXjkmzkY
-DoCjjvbdIGfyyXxH
-EOcKjvbdjKFhKNXr
-EPDKjvbdRDcApRES
-EObjjvbdmfdxNNfy
-EObjjvbdDihKWYKA
-DoCjjvbdzaAOffal
-EPDLKvbdQccBQQcr
-EPCjjvbdTlWPAvOi
-DnbjjvbdqUTfrSLU
-EObjjvbdVAbRTRRy
-DoCkKvbdnCKWxPOV
-EOcKjvbdFjdrbhNV
-DnbjjvbdrzLpTAhO
-DoCjjvbdDxYMUUUM
-DnbjjvbdmoyxujyC
-DnbjjvbdUVkoitAq
-EObjjvbdrEEhpOWB
-DncKjvbdRjyGVGjs
-DoCkKvbdJJdAKPgE
-DoDKjvbdKDJbqKCx
-EPDLKvbdcTDLUDia
-DoCkKvbdePEsKssr
-EPCjjvbdJbjCqJbx
-DoDLKvbddBrmSATm
-EOcLKvbdlhcsqVRa
-EOcLKvbdKfGICBRV
-EPDLKvbdrovPJbvG
-DoCjjvbdbAvFGQQX
-EPDLKvbdlZTSSxft
-DnbjjvbdLqvmZuQz
-DncLKvbdZshiYdSn
-EOcLKvbduMXvaTaX
-EObjjvbdZtJJYcrn
-EOcLKvbdczZPwxpb
-EPDKjvbdatafwjtI
-EObkKvbdsQVnicWG
-DnbjjvbdrWokcIyR
-DncLKvbdJuteceGi
-EOcLKvbdADRwiyiQ
-EPDKjvbdCIkBjiFj
-EPDKjvbdrNZjYkgi
-DnbkKvbdSLYeuHLT
-DoDKjvbdkNBkzEfo
-DnbkKvbdcyxowyQb
-EPDKjvbdYkrETnMN
-DoDKjvbdwWlAvAvV
-EPCkKvbdczZPxZQb
-EPCkKvbdKCibpjCx
-EOcKjvbdhytfLqOG
-DnbjjvbdxmsHwriD
-EPDKjvbdmfeYMmgZ
-DoCkKvbdNQXpvNfs
-DncLKvbdirziSkJz
-EOcKjvbdHffzYxYH
-EOcKjvbdWXIxWDdg
-DncLKvbdVvhwuceH
-DoDLKvbdFxtuBDxC
-DncLKvbdJcKCqJbx
-DoCkKvbdxLWcgzyf
-DnbjjvbdCJLBjiGK
-EPCjjvbdcasMrATm
-DoDLKvbdLFfICAqV
-EPDKjvbdqmZjZMHi
-DncKjvbdczZPwxqC
-EObkKvbdrWpMDJYq
-EPCjjvbdLFehCBQu
-EPCkKvbdRzJgsDWA
-DoDKjvbdIsZArlxM
-DncLKvbdqFcdsuaI
-DncLKvbdULvPBVni
-EOcLKvbdWXJXuceH
-EPDLKvbdaNLCTVMg
-EObkKvbdUxhUZjnn
-DncLKvbdeATplxKG
-DoCjjvbdmSYtzSci
-EOcLKvbdkMbLzEfo
-EPCjjvbdrpVoJcWG
-EPCjjvbdXrlAlsoY
-DoDLKvbdUxhTzKnn
-EPCjjvbdOEdUJJLE
-EObjjvbdKDJcRKCx
-EPDKjvbdcyxpXxqC
-DnbkKvbdZxdKODMS
-DncLKvbdcImJjfWx
-DnbjjvbdpfEFTuaI
-DnbkKvbdZoNheEyj
-EOcKjvbdjFKfuPAO
-DnbkKvbdFVyQQNKF
-DnbkKvbdDjHiuwjA
-EPCkKvbdMgDPlotk
-EPDKjvbdxnShXsIc
-DoDLKvbdOTUVfduQ
-DncKjvbdFejRnIsq
-DncKjvbdSQUHJfEX
-DncLKvbdRXOEDMHc
-DoCkKvbdsZkosAgn
-DoDKjvbdUsmUGLuj
-EPDKjvbdiifIJmYS
-DoDLKvbdZQmEhmFR
-EObjjvbdeUAUASlv
-DoDLKvbdUsltFlVj
-DoCjjvbdSiZjRABM
-EOcLKvbdegkVrORH
-DoDKjvbdYlRdTnLm
-DncKjvbdzitopESt
-DnbkKvbdhbPDEwQq
-DncKjvbdSKxetgLT
-DncKjvbdZQmEiNFR
-EPDLKvbdUyITzLPO
-DnbjjvbdznpQdblY
-EObkKvbdbLMFoODA
-EPDLKvbdBhjbLJFj
-DoDKjvbdNwoVzdOU
-DncKjvbdvBDxsPEh
-DnbkKvbdSBceLiZL
-EPCkKvbdOhAXyAZB
-EObjjvbdZisIQGbG
-EOcLKvbdAMgxrvyx
-EPDKjvbdCDpAvKMf
-DoDKjvbdxVMdpxlO
-EOcKjvbdJbicRJbx
-DoCkKvbdTppnuVIN
-EObjjvbdZjTIPfbG
-DoCkKvbdpyOhHQcx
-DoCjjvbdfHjvSOQg
-DoCjjvbdzoPpdcMY
-EPDKjvbdmfeYNNfy
-EPCjjvbdXGYzUAPT
-DoDLKvbdypnmJKXA
-DnbkKvbdBsAcUFwS
-DoDLKvbdQYmAGsRj
-EObjjvbdUxhTyjnn
-DoCkKvbdrouoKCvG
-DoDLKvbdhtydwSUb
-EPCkKvbddwytUSFz
-EOcKjvbdrbFmLgLZ
-EObkKvbdbPffckzd
-EObjjvbdDxXlTtUM
-DnbkKvbdqGEFTvAh
-EPCjjvbdDoCkKwDE
-EOcLKvbdVviYWDeH
-EPCjjvbdWSOYCFLc
-DncKjvbdmbKWxPNu
-DoCkKvbdZshhxdTO
-DoDKjvbdwtldqYkn
-DoDLKvbdYSlBMsoY
-EPDKjvbdRkZFuHKs
-DnbkKvbdeYZstRez
-DoCjjvbdrNZixlIJ
-DoCjjvbdmgFXlmgZ
-EPCkKvbdYlRcsmlN
-DoCjjvbdOFETiJKd
-EPDLKvbdBhkCLJFj
-EPCjjvbdmuVZkJrG
-DnbkKvbdFjeTChMu
-DoCjjvbdJTZBSlwl
-DnbkKvbdozmdLYPA
-EObjjvbdtbbtvuoP
-DncKjvbdqUTfrSKt
-DncKjvbdyTOImSBg
-DnbjjvbdcTCkTdKB
-EOcKjvbdKaKgNCXq
-EPDKjvbdZoOIeEyj
-DoDKjvbdYqMeIleR
-DncKjvbdnPzZWLZC
-EPDLKvbdZirhPfbG
-DnbkKvbdGQATXGey
-EOcKjvbdZsiJYcsO
-DnbkKvbdrWpMDJYq
-DoCkKvbdMuTSLNAX
-EObjjvbdpxnhHRDx
-EOcKjvbdzitpQESt
-EPCjjvbdhuZeXSUb
-DoCjjvbdNeDtJIkE
-DoCkKvbdCEQBWKMf
-EPCkKvbdHEKvKCJj
-EPCjjvbdatbHYLTh
-EObkKvbdLGGICBRV
-DncKjvbdRjxeuGjs
-DoDKjvbdnHFYNOHZ
-EObkKvbdIryAsNYM
-EObjjvbdmfdwlnGy
-EOcLKvbdNeDsiIkE
-DnbjjvbdJTYaSlxM
-DoCkKvbdRadEkiYk
-DncLKvbdjKFgjNYS
-EObkKvbdZjShQGaf
-EOcKjvbdKfFgaaQu
-DoDKjvbdhgJbyVjV
-DoCkKvbdwuNFRZMO
-DncLKvbdfekzNfgA
-DncKjvbduCcVWuno
-EPDLKvbdVrNxBdkc
-DnbkKvbdRkYeuHLT
-DoDLKvbdwuNEpxlO
-DoCjjvbdQccAoqDr
-EOcKjvbdUGzmkvvF
-DncKjvbdEJhKWYKA
-EOcLKvbdssSSxyeD
-DoCjjvbdVviXvEEg
-DnbjjvbdEuxopNKF
-EObkKvbdLAkGlbXq
-DoCkKvbdZsiJZESn
-DoCkKvbdhkeEOUby
-DnbkKvbdbhlikGXY
-EObkKvbdLBLGmCYR
-EPCjjvbdxUleQyLn
-DncLKvbdrbGNMGjy
-DoCkKvbdddoSBwDK
-EPDLKvbdkyTRsYgU
-EPDKjvbdehLVqmqH
-EPDLKvbdrbFmMHKy
-DncLKvbdmbJvwoOV
-EOcLKvbdVUNUFkvK
-EPDLKvbdrpWPJbvG
-DncKjvbdGAnpxizm
-EOcKjvbdyzeNqghh
-DoDLKvbdhbPDFWpq
-DoDLKvbdfVzxQJzs
-DoDLKvbdUMWPBVoJ
-EOcLKvbdRpTfjFdX
-EPCkKvbdpfDeUWBI
-EObjjvbdmuUyjirG
-EObjjvbdtbbtwWOo
-EObkKvbdrylPsAgn
-EOcLKvbdmSYtysEJ
-DncKjvbdSCDeMJYk
-DoCjjvbdTppoUthN
-EPDKjvbdVTmUFkuj
-EObjjvbdIsZAsNXl
-EOcKjvbdSBcdlJYk
-DnbkKvbdZQleIleR
-DnbjjvbdddoSBvcK
-EOcLKvbdNHComPuL
-DncKjvbdiCPCdvqR
-EOcKjvbdliDspuSB
-EObkKvbdzoPpeCkx
-DnbjjvbdcJMijevx
-DoDKjvbddZxpYZQb
-DoDKjvbdkySrSxft
-DoDKjvbdyXhiapZk
-EPCkKvbdOAIrsirA
-EObkKvbdUaBqSqSZ
-EPCkKvbdZtJIyESn
-DnbkKvbdTvLoitAq
-EPCjjvbdyzeNrIJI
-EOcKjvbdiCPDEwRR
-EPCkKvbdnCJvwoNu
-EPCkKvbdIGfzZYXg
-DoCkKvbdkySqrxft
-DoCjjvbdZdxGzgiC
-DncKjvbdzitpPcsU
-DncLKvbdbVCHXjsh
-EPCkKvbdlhcsqVSB
-EPCjjvbdGYtuAcxC
-EOcLKvbdjAQGaQHK
-EObjjvbdjlakzFGo
-EOcLKvbdvwMAvAuu
-EPCjjvbdTqQoVUhN
-EPCkKvbdeEnrBwCj
-DoCkKvbdsCGMkgKy
-DnbjjvbdhkeDnVDZ
-EPCjjvbdOFDshiLE
-DnbjjvbdDwwlUTsl
-EPCkKvbdKWUedEgJ
-EPDLKvbdsQVnicWG
-EPCkKvbdjgflFfOL
-EObkKvbdQYmAHTSK
-EObkKvbdSPsgJecw
-EObjjvbdjAQGaPgK
-DoDLKvbdDxXlUUUM
-DoCjjvbdegjuqnQg
-DnbkKvbddwzTsqez
-DncKjvbdxxJJbPyk
-EOcKjvbdGKeTChMu
-DoCkKvbdeFPSCWcK
-EObkKvbddeOrBwDK
-EPCkKvbdaNLBsUmH
-DoDLKvbdRpTgJedX
-EPCkKvbdkySrSxgU
-EPCkKvbdVYhTzKoO
-EPCjjvbdxxIjCPyk
-EPDLKvbdVrOXadkc
-EOcLKvbdEOcKjwDE
-DncLKvbdmfeYMnGy
-EPCkKvbdVAaprprZ
-EPCjjvbdFWYpQMjF
-DoCkKvbdqrUjmkAm
-DoCjjvbdQvmdDLhD
-EPDLKvbdeATqNYKG
-DnbkKvbdLGGHaaQu
-EObjjvbdezvZEhtX
-DnbkKvbdjuwNdBww
-DncKjvbdJTZAsMwl
-EPDKjvbdkxrrTYgU
-EPDKjvbdbAudfQQX
-DoCkKvbdVUNUGMVj
-EPDLKvbdaNLBsUlg
-EPDLKvbdDwxLtUUM
-EPCjjvbdMgColpUk
-EPDLKvbdaogGdLzd
-EPDKjvbdzGxlANFX
-EPCkKvbdUQqOuUgm
-DoDKjvbdEPDKkXCd
-EPDKjvbdbsCkTcia
-EObjjvbdTAEhhBnd
-EPCkKvbdhzVFkpmf
-DnbkKvbdaSFcHtGL
-DoCjjvbdGBOpxizm
-DncLKvbdGYttaEYC
-DoDKjvbdqYoHfpdY
-EOcKjvbdrouoKCuf
-EOcKjvbdiCPDFWqR
-DnbjjvbdVAaprqRy
-EPCjjvbdePFSjtUS
-DnbkKvbdLGGICBRV
-EPDLKvbdkMalZeHP
-DoDLKvbdJutfEFHJ
-DoDKjvbdVBCRSqSZ
-EObjjvbdvvlBWBWV
-EOcLKvbdFVxpPmJe
-DoDLKvbdKfGHaaRV
-DnbjjvbdBvzdIdpW
-DncKjvbdNsUWHFUp
-EPDLKvbdrSVLNjaN
-EPDKjvbdgGMZnGgA
-DnbkKvbdSBceMIyL
-EOcLKvbdSBdFLiYk
-EOcLKvbdRyigrcWA
-EPDKjvbdaMkBruNH
-DncKjvbdUaCRSpqy
-DnbjjvbdIMBzmvpk
-DnbkKvbdbVCGxKtI
-DncLKvbdliDtQuSB
-EObkKvbdHDkVjBjK
-DncKjvbdmSYtyrci
-DnbkKvbdxVMdpxlO
-EPCjjvbdRpTfjGDw
-EPCkKvbdhancEvpq
-EPDLKvbdNsTvHEuQ
-DoDKjvbdfekymfgA
-EObkKvbdUWLojUBR
-EPCjjvbdJXtBgkpp
-DoCjjvbdEPCkLXCd
-EPCjjvbdZxcjNcLr
-DoCjjvbdZsiJYcrn
-EPCkKvbdZtIiZDrn
-EObkKvbduLxWaUBX
-EObkKvbdZdxGzghb
-EOcKjvbdkClLRHVH
-EOcLKvbdFjdsDINV
-DncKjvbdNeEUIiKd
-EPCkKvbdYpmFJNFR
-EPDKjvbdlhcsptqa
-DoDLKvbdnCKWwoOV
-EObkKvbdDnbkLXCd
-EObkKvbdQwOECkhD
-EOcKjvbdUaCRSpqy
-EPCjjvbdBcoaVjNG
-DnbjjvbdxmrhXsJD
-EObjjvbdcImKKewY
-DnbkKvbdpyOgfpdY
-DnbjjvbdpyOggRDx
-EObjjvbdEOcKjwDE
-DnbkKvbduCcUwVoP
-EOcKjvbdhgKCxuiu
-DoDKjvbdiZtelQmf
-DoDKjvbdnBjXYOnV
-EPDLKvbdczZPwxpb
-EPCjjvbdADRwizJQ
-EObjjvbdfVzwpJzs
-DnbjjvbdxxIiapZk
-EPCjjvbdjcLkQfuH
-EPCjjvbdcyyQYYqC
-DoCkKvbdEuyPpNJe
-DncLKvbdcJNJkGWx
-DoDKjvbdZoOIdeZj
-DoCjjvbdWHxVwgYz
-DnbjjvbdeEoRbWbj
-DncKjvbdZMSDsnLm
-EOcLKvbdbiNKLFvx
-DnbkKvbdjcLjqHVH
-DnbjjvbdEYXktTtM
-EPCjjvbdCSaCsfWr
-EOcLKvbdBdQAuimG
-EObkKvbdqdFIpOWB
-DncLKvbdelevgNKL
-EObkKvbdZMRdUNkm
-EPCkKvbdrDdiQOVa
-DoDLKvbdCWzdJFQW
-EObjjvbdxUleQyMO
-DncKjvbdBsAcTfXS
-EOcKjvbdRMxBxmtz
-EOcKjvbdSKyFuGkT
-EPCkKvbdEuxooljF
-DncLKvbdYgWdAPSi
-DoCkKvbdiHJcYvKV
-EPCkKvbdZQldiNFR
-DncKjvbdjAPgAofj
-EObjjvbdkVvmdBxX
-DoDLKvbdsBfMlHLZ
-DoDLKvbduWNxKQsA
-EObjjvbdOTTugEtp
-DoCjjvbdIxUBgkqQ
-EOcKjvbdqFceUWAh
-DnbjjvbdTkunaVoJ
-EPDKjvbdiZtfLqOG
-DoCjjvbdcImJkGXY
-DncLKvbdpstGrSLU
-DncLKvbdRpTfjGDw
-DnbkKvbdznpREblY
-DnbjjvbdqdEhomvB
-DncLKvbdIwtBhMRQ
-DoDKjvbdhtzFWqtb
-EOcKjvbdiBncEwQq
-EPDKjvbdZQleJMdq
-EOcLKvbdLAkGlaxR
-DoCkKvbdZsiIyDsO
-EObkKvbdeOdsKssr
-DnbjjvbdJcKCpjDY
-EPDLKvbdSBdElIyL
-EPCkKvbdyOTHwrhc
-EPDLKvbdGLEsDIMu
-EPCjjvbdmJETqVRa
-DncKjvbdKDJbqJbx
-EOcKjvbdbsCkTdKB
-EOcKjvbduDCuXVno
-EOcKjvbdrXPlDIxq
-EOcKjvbdqlyixkhJ
-EObjjvbdRkYfUgLT
-EPDLKvbdLAkGmCXq
-DnbjjvbdHgGzYxXg
-DncKjvbdpstHSSKt
-DoCkKvbdqvolCiYq
-DoCkKvbdmgFYNOHZ
-DnbkKvbdqGDeTvBI
-DoDLKvbdyzeNrHhh
-DnbkKvbdwzHefXeS
-DoDKjvbdbiMjLGXY
-DnbkKvbdTulQKTaR
-DnbjjvbdsPunicVf
-DncKjvbdqvpLcIyR
-DncLKvbdOFEThhkE
-EOcKjvbdZshhxdSn
-DncKjvbdpyPHfpdY
-DoDLKvbdNGcPmQUk
-DoCkKvbdVgwvXfxz
-DoCjjvbdCgLegAzc
-DnbjjvbdauCGxLTh
-DoDKjvbdqFceTvBI
-DoCjjvbduMYXAsaX
-EPCkKvbdrSVKmkAm
-EObkKvbdOYOuzcnU
-DncKjvbdYkqctNlN
-DncKjvbdSZjHrcWA
-DoCjjvbdrEFJQNua
-EPCjjvbdRosfjFcw
-EObkKvbdZoNiFEyj
-EPDKjvbdVgwvXfxz
-DoDLKvbdhbPCdvqR
-DncKjvbdqvokcIyR
-DnbjjvbdpssfqqkU
-DncLKvbdzoPpdbkx
-DnbjjvbduaDySoFI
-EOcKjvbdEASImZwX
-DncKjvbdbrcKtDjB
-DoCjjvbdQccBQQdS
-DoCkKvbdDigjVwjA
-DnbkKvbdbVBfwkUI
-EOcKjvbdIsYaSlxM
-DoDLKvbdKVtedEgJ
-EPCjjvbdIryArlxM
-DncKjvbdpeceTuaI
-EObkKvbdZshiYdSn
-DncLKvbdZtIhyESn
-DnbjjvbdOYOuzcnU
-DoDKjvbdUxhTyjoO
-EObjjvbdTppoVVHm
-DncKjvbdrWolCiYq
-DoDLKvbdNVSrKmAX
-EObkKvbdiGicZWKV
-DoDKjvbduVmwipsA
-EPCjjvbdNPwqVnHT
-EObjjvbdelewGmJk
-EOcLKvbdgGLzNgHA
-DoDKjvbdcJNJjfWx
-DoCkKvbdyOTHwriD
-EObjjvbdEzspeLcJ
-DnbjjvbdjhHLeenL
-DncKjvbdOStWHFVQ
-EOcLKvbdsZlPsBHn
-EPDLKvbdtcCuWuno
-DnbkKvbdULunaVni
-EPDKjvbdJqZdnfNe
-EOcKjvbdqwPkcIxq
-EObjjvbdrJAJeNOe
-DnbjjvbdRECaPpdS
-EPCjjvbdpfEEsvBI
-EPDLKvbdIsZArmYM
-EPDLKvbdJYUCILpp
-EOcLKvbdYlSDtNlN
-EPCjjvbdJYTbHkpp
-EPDKjvbdYzbfSJvZ
-EPCjjvbdRaceMJYk
-EObjjvbdZisHofaf
-DnbkKvbdRbEElIyL
-EOcLKvbdijFhKNXr
-EOcKjvbdRXNdDMID
-DncLKvbdbiNKLGXY
-DoDLKvbdlZSrSyHU
-EObkKvbdqZPIHRDx
-DoDKjvbdnPzYujxb
-EObkKvbdnHEwlmfy
-EObkKvbdCWzdIePv
-EObkKvbdqlyiyLgi
-EPCjjvbdkySqryHU
-EObkKvbdcImKKevx
-DncKjvbdEASJMzWw
-DncKjvbdRkYfUfkT
-EPCjjvbdqYoIGpcx
-DncKjvbdGckWKBjK
-EPCjjvbdYTLaNUOx
-EPDKjvbdwtleRZMO
-EObkKvbdGFiqnJUR
-DncLKvbdlhdURVRa
-EObjjvbdqlzJxkhJ
-DncLKvbdFaPQyJzm
-EPCkKvbdpssgRrLU
-EObjjvbdiCOcFXRR
-DncKjvbdqTtGqrLU
-EPCjjvbdsCFlkgLZ
-EOcKjvbduWOXiqTA
-EOcKjvbdkClKqGuH
-EPCjjvbdMowpvOGs
-EPCkKvbdxrmhmRag
-DoCjjvbdiUzFXRuC
-EOcLKvbdUMWPAvOi
-DoDLKvbdmfdwlmgZ
-EPCjjvbdehKurNpg
-EOcLKvbdBsAcTevr
-EPCjjvbdZjTIPgBf
-EObjjvbdPIAXyAZB
-EPCjjvbdCDoaVjNG
-DncKjvbdrpVnicVf
-DoDKjvbdlZTSSxgU
-DncKjvbdGZVVAdYC
-EPDLKvbdsCGMkfjy
-EPCjjvbdSPsfjFdX
-DoCjjvbdJXsbIMQp
-DncKjvbdzeZnzdyp
-DnbkKvbdlYsRsYft
-DncKjvbdbiMjLFwY
-EPDKjvbdyOShYSiD
-DoCkKvbdOTTufduQ
-EPDLKvbdVwJYVcdg
-DoCkKvbdGFiqnJTq
-EOcLKvbdUslselWK
-EObjjvbdkxsSSyHU
-EOcLKvbdxsNhmSBg
-DnbjjvbdqqtkOLAm
-DnbjjvbdeFPRawDK
-DnbkKvbdLZQirzuG
-EPCkKvbdFWYpPlie
-EObkKvbdrWpMCiYq
-EOcKjvbdiiehKNXr
-EPDKjvbdEvYopNJe
-EPCkKvbdxrmhmSCH
-DoCkKvbdptUHSRkU
-EOcKjvbdKCjDRJcY
-DoDLKvbdrMzKYkgi
-DoCjjvbdZLrDtNkm
-DoCkKvbdqYnggQcx
-DnbkKvbdrovOibvG
-DncKjvbdADRwizIp
-EOcLKvbdZisHpHCG
-EPCjjvbdZRNFImFR
-EPDKjvbdVwIxVceH
-EOcKjvbdrDeJQNua
-EPCkKvbdIxTaglQp
-DncKjvbdGFiqmiUR
-EPCjjvbdVwJXvEEg
-DnbkKvbdwuMeRZMO
-EPCkKvbdZRNFImFR
-EPCkKvbdnHEwlmgZ
-EPDKjvbdLYqKSzuG
-DoDKjvbdZsiJYdTO
-DoDLKvbdShyjRAAl
-DoDKjvbdRadFLiYk
-DnbkKvbdjbkjpgUg
-EObkKvbdUaBpsRRy
-EOcKjvbdehKuqnRH
-EObkKvbdDwxMUTsl
-EOcKjvbdptUHSSKt
-EPDKjvbdHEKuibJj
-EOcKjvbdxxIjBpZk
-EObkKvbdelewGmJk
-DncLKvbdTvLpKUAq
-EPCjjvbdGLErbhNV
-DncLKvbdfHjvRmqH
-DnbjjvbdkMakyeHP
-EPDKjvbdJcKCpjDY
-DoCkKvbdRECaPpcr
-EOcLKvbdmgFYMmgZ
-EObjjvbdZRMdiMeR
-DoCjjvbdYzcFqivZ
-DoCkKvbdeOeTKtTr
-EPCkKvbdXFxytAPT
-DncLKvbdZnnJEdzK
-DncLKvbdhtyeWrUb
-EOcKjvbdEJgivXjA
-EPDLKvbdssSTYyeD
-EPDLKvbdLBLGmCXq
-DnbkKvbdKeegbApu
-DoDLKvbdJYUBhLqQ
-EPDKjvbdwNWANDdm
-DoCjjvbdKfGIBaRV
-DoCjjvbdbhljLFwY
-DncLKvbdmgFXmNgZ
-DoDKjvbdZRMeJNFR
-DoCkKvbdWeyZtAOs
-DoCkKvbdbiNKLFvx
-EPDKjvbdUsmTfMVj
-EPCkKvbdijFgjMwr
-DnbkKvbdbsCjtDia
-DnbjjvbdZQleJNFR
-DoDLKvbdNQXqWNfs
-EOcLKvbdULunaVoJ
-DncLKvbdrEEhpOVa
-DncLKvbdRyigsCvA
-DoCkKvbdVwJYWEEg
-DncLKvbdjKGIKMwr
-EObkKvbdrEFIpNvB
-DoCjjvbdGLEsDINV
-EOcLKvbdJSyArlxM
-EPCjjvbdTJZiqABM
-DncLKvbdCTAbsewS
-DnbjjvbdZjTIPfaf
-EPCjjvbdbPfgELzd
-DnbjjvbdLBLHMbXq
-EPCjjvbdqiAKFMoF
-DnbkKvbdIBlZdzAD
-EPDLKvbdyTNiNRag
-DoDLKvbdZjSgogCG
-EPCjjvbdjAPgAofj
-EPCjjvbdxmrgxTJD
-EObjjvbdSPsgKGEX
-EObkKvbdRWnDblHc
-DnbjjvbdZQmFImFR
-DoCjjvbdjuwODaww
-EOcLKvbdVviXvEFH
-EPCjjvbdcImJkGXY
-EPDKjvbdVAbQrqSZ
-DoCjjvbdWWiXudFH
-EPDKjvbdapGfdLzd
-EObkKvbdQwOEDMID
-EPCjjvbdKDKCqKCx
-DncKjvbdJvUfEEgJ
-EObkKvbdDoDLKvcE
-EOcKjvbdqwPkbhyR
-EObjjvbdyTOJNSCH
-EObkKvbdZsiIxdTO
-DoCjjvbdaSFbhTfL
-EOcKjvbdUslsekvK
-DoDKjvbdehLWSORH
-EPCkKvbdBsBDTfWr
-DoCkKvbdMfbpNQVL
-DoCkKvbdezvZFJUX
-EObjjvbdJYUBhMRQ
-DncKjvbdlhcsptqa
-DoCkKvbdiZtfMQnG
-EObkKvbdZRMdhleR
-EPDLKvbdkySrSxgU
-DoCkKvbdYlSDsmkm
-DnbkKvbdkNBkzEfo
-EPDLKvbdyYJKCPzL
-EOcKjvbdqwPkbiZR
-DncLKvbdqdFJQOWB
-DoDKjvbdFyUtaDxC
-DnbjjvbdZyDinDMS
-EOcKjvbdqrVKnKaN
-DoCjjvbdMgDPlotk
-EPCjjvbdUVlPitBR
-DoDLKvbdbsCkTcjB
-EPCjjvbdnGdwlnGy
-DnbkKvbdapGfdLzd
-EPDKjvbddndsKtTr
-DncLKvbdsrrTZZeD
-EObkKvbdqdFJQOWB
-DncKjvbdRadFLhxk
-DnbkKvbdfILWSORH
-DnbkKvbdqZOggQcx
-EPDKjvbdCDpAujMf
-EObjjvbdxsOImSBg
-DoDKjvbdrSUjmjaN
-EObkKvbdrMyjYkhJ
-EObkKvbdANHySvzY
-EObkKvbdgGLynGgA
-DoDLKvbdNdcshiKd
-EObjjvbdePErkTtS
-EPCkKvbdSCEFLhxk
-DoDKjvbdIxUBhLqQ
-EPCkKvbdVvhxWDdg
-EOcLKvbdKfGHbBQu
-DoCjjvbdajlFoNcA
-DoCkKvbdQdDAopdS
-DoDKjvbdSBceMJZL
-DoDKjvbdOStWGdtp
-DoCjjvbdGdLWKBij
-DnbkKvbdvOszpjnt
-DncLKvbdUVlPjTaR
-DoDLKvbdliDsptrB
-EOcKjvbdZisHpHCG
-DoDKjvbdkVwODaxX
-DoDLKvbdfVzwpJzs
-DnbkKvbdDjIKWYKA
-EObkKvbdrJAJdmPF
-EObjjvbdeATpmYJf
-DnbkKvbdQmYByOUz
-EPDLKvbdxmrhXsJD
-EPDLKvbdCJLBjiGK
-DoCkKvbdYpmFJMeR
-DoDKjvbdXnRAXuWU
-DoDKjvbdiMFDmtby
-DnbkKvbddZyQYZQb
-DncLKvbdZtIiYdSn
-EObjjvbdwMvANDdm
-EPDLKvbdIwsbHkqQ
-DncKjvbdURQntthN
-EObkKvbdTqROttgm
-EPCjjvbdTkvOaVni
-EOcLKvbdfNFwHNKL
-EObkKvbdjgflFfOL
-EObjjvbdUQqOuUhN
-DncLKvbdegjurNqH
-EPDLKvbdxUmEqZMO
-DoDKjvbdGcjvKBjK
-DoDKjvbdVTltFkuj
-DnbkKvbdLYqKSztf
-DoDKjvbdUyHtZkOn
-EPDLKvbdvAcyTOdh
-DncKjvbdqFcdsvAh
-DncLKvbdrbFmMHKy
-EOcKjvbdYlRdTnLm
-DoCjjvbdEASJMzXX
-EObkKvbdMoxQvNfs
-EOcKjvbdiHJcYujV
-DnbjjvbdvAcyTPEh
-DoDLKvbdGQASwGfZ
-EObkKvbdMoxRVnHT
-EObkKvbdhgJcYvJu
-DnbjjvbduWOXipsA
-DoDLKvbdQcbaQQdS
-EObkKvbdUsltFkvK
-EPDKjvbdKyQirzuG
-EPCjjvbdmJDtQuSB
-EObkKvbdXrkaMsoY
-EOcKjvbdrEFIpOVa
-EPDKjvbdVqmwadkc
-EOcKjvbdqYoIGqDx
-EObkKvbdtbbtwWOo
-EPCkKvbdSKxfUfkT
-EPCkKvbdmJDsqUrB
-DncKjvbdhaoCeWpq
-EObjjvbdFxuVAdYC
-EPCkKvbdqFcdsvBI
-EPDLKvbdOTUWGeVQ
-EPCkKvbdlhdUQtrB
-DoDKjvbdCJLCLJGK
-EPDKjvbdMgCpMotk
-DnbjjvbdrbFlkgLZ
-DoDKjvbdqBJFAWhE
-EPCjjvbdpyPHfqDx
-EOcKjvbdTlVoBVni
-EPCjjvbdrRtkNkBN
-EPCkKvbdWWhwuceH
-EPDKjvbdcImKKewY
-EOcKjvbdYSlBNToY
-EObkKvbdZRMeIldq
-EPDLKvbdMoxRWNgT
-EObjjvbdMIbMQxAS
-EPCjjvbdQdDBQQdS
-EObkKvbddZyPwxqC
-EOcLKvbdACrXiyiQ
-EPDLKvbdcSbkUEJa
-DncLKvbdTkunaWPJ
-DnbjjvbdvBEYrndh
-EObjjvbdmIctQuRa
-DncKjvbdiUydvqtb
-DoCjjvbdhkdcnUby
-EOcKjvbdePFTLTsr
-EOcLKvbdiHJbxujV
-EObjjvbdZsiJZESn
-EOcKjvbdpxoHfqEY
-EPDKjvbdFyUuBDwb
-DoDLKvbdBiLBkJGK
-EPCkKvbdliDtQuRa
-DoDKjvbdhbOcEwQq
-DncLKvbdRosgJfDw
-EObjjvbdrzMQSaIO
-EObkKvbdUsmTfMVj
-EOcKjvbdWXIxWEFH
-EPCjjvbdcTCjtDjB
-EObkKvbdbBVeGQPw
-EOcLKvbdaSGDHtFk
-DoDLKvbdqFdFUVaI
-EPCkKvbdxxIjBozL
-DncLKvbdNddUIiLE
-EObjjvbduMYWaUAw
-EPCkKvbdWWiXvDdg
-EObjjvbdJXsbILqQ
-DnbkKvbdDnbjjwCd
-DnbkKvbdxUldqZMO
-DoCjjvbdKyRKSztf
-DncLKvbdLFehBaQu
-EPDLKvbdjvXNdBww
-EOcLKvbduaEZTPFI
-DoCkKvbdfMevfmKL
-EPCkKvbdpxoIGqEY
-EPCkKvbdKWUecdgJ
-EObkKvbdmbJwYOmu
-EPCkKvbdIsZArmYM
-DnbjjvbdxLXDgzyf
-DncLKvbdEvYopMjF
-DncLKvbdmJETqVRa
-DnbkKvbdrouoKDWG
-EPDLKvbdbVCGwkTh
-DoDKjvbdZirhPgCG
-EPDKjvbdTvMQKUAq
-DnbkKvbdLrWlzVQz
-EOcLKvbdrEEiPmua
-DnbjjvbdczZQXyRC
-DncKjvbdnUtzKjSG
-EPCjjvbdkNCLzFHP
-DncKjvbdZyEKNbkr
-EObkKvbdJuuFdEgJ
-DncLKvbduCbuXWPP
-EPCjjvbdyNrhXriD
-DnbkKvbdIxTaglQp
-EPCjjvbdJvVFceHJ
-EPCkKvbdVBBprqSZ
-EOcKjvbdkxrqsYgU
-EPCjjvbdGLFSbhMu
-EObjjvbdnPzZWLYb
-EObkKvbdjblLRGuH
-DoDLKvbduaDyTPFI
-EPCjjvbdiifIJmXr
-EObkKvbdYkqctOMN
-EPCkKvbdelfXHMjL
-EPDLKvbdeFOrCWbj
-EObjjvbdeUAUATNW
-EPCjjvbdWRmxBeMD
-DoCjjvbdZxcinDMS
-EOcLKvbdWRmwbElD
-DoDLKvbdpssfrSLU
-DncLKvbdQccApRES
-DoDKjvbdGdKujBij
-DoDKjvbdZLqdTmlN
-DoCjjvbdbiNKLGXY
-DoCjjvbdVZITzKoO
-DoCkKvbdsPuoKCvG
-EPDKjvbdNGbomQVL
-DnbkKvbdkIHMGFnL
-EPDKjvbdvPTzpjoU
-EOcKjvbdczZPxZQb
-DncKjvbdliEURUrB
-DnbkKvbdGZUtaDxC
-EPCjjvbdrMyjZLhJ
-EPCjjvbdTulPjTaR
-DoCkKvbdZeYGzhJC
-DncLKvbdwygefYEr
-DnbjjvbdehLVrOQg
-DnbjjvbdZxcjNblS
-DoCjjvbdSLYetgKs
-EPCkKvbdVAbQrpqy
-EPCjjvbdtTSTZZdc
-DnbkKvbdSCEFMIyL
-DoDKjvbdrDeJPmvB
-EOcLKvbduDDVXVno
-DoDLKvbdZdxGzhIb
-EObkKvbdhgJbxujV
-DncLKvbdlYsRsZHU
-DoDLKvbdhzUelQmf
-EObkKvbdWWhwvDeH
-EPCjjvbdjgfkfFmk
-EObkKvbdzaAPHGal
-DoDLKvbdEPDLLXDE
-DoCjjvbdTukpKTaR
-EOcKjvbdhaoCeWpq
-EPDKjvbdwjvdHzzG
-EPDLKvbdJTZBTNYM
-DoDLKvbdRECaPqDr
-DncKjvbdjhGkfGNk
-EObkKvbdjhGkfFmk
-DncLKvbdqlyixkhJ
-EObkKvbdjEkHUoAO
-EPCkKvbdcasMrAUN
-EObjjvbdhzUfLqOG
-DoCkKvbdEvYopNKF
-EPCjjvbdjuwODaxX
-DncLKvbddiirWUzn
-EObkKvbdOStVfduQ
-DnbjjvbdypnmIjXA
-DnbjjvbdRWnEClHc
-EOcLKvbdbhljLFvx
-EPDLKvbdJXsaglRQ
-EObkKvbdhzUfLqOG
-EObkKvbdnPyxujyC
-DoDKjvbdBiKajiFj
-DoDKjvbdZjTHpHBf
-EPCjjvbdaSFcITek
-EObjjvbdYzcFqiuy
-DncLKvbdqdFIpNvB
-DoDKjvbdLYqJrzuG
-DoDLKvbdVwJXucdg
-DnbjjvbdhbObdvqR
-DoCkKvbdCEQBWJlf
-DoDLKvbdSCDdlJYk
-EPDLKvbdZyEJnCkr
-DoDKjvbdvAcyTOeI
-DoDKjvbdkIHLfFmk
-EPCjjvbduaEYroFI
-DnbkKvbdjblKpgUg
-EOcKjvbdwygefYFS
-EOcKjvbdliDsqUqa
-DnbjjvbdjcMLRGtg
-EObkKvbdRbEElJYk
-EPCkKvbdqrUkNjaN
-EOcLKvbdRotGifDw
-DnbkKvbdUsmUGLuj
-DoCjjvbdeKJqvUzn
-EPDKjvbdQwNdClHc
-EOcLKvbdcScLTcjB
-DoCjjvbdvBDxroEh
-DoDLKvbdIxUBglQp
-EPDLKvbdfVzxQJzs
-DncLKvbdqlzKYlIJ
-DoDKjvbdaNLCSuMg
-EOcKjvbdwjwDgzyf
-EPDKjvbdIxTaglRQ
-DoDKjvbdVTltGLuj
-DoCkKvbdiMFENuDZ
-EOcLKvbdZyEJnDMS
-DnbkKvbdiBoCeXRR
-EPCkKvbdbiMijewY
-EOcKjvbdmttzLJqf
-DncKjvbdYTLaMtOx
-EPCjjvbdfIKuqmqH
-DoCjjvbdBdQBVjNG
-EObkKvbdieLGuPAO
-EPDLKvbdsZlQSaIO
-DnbkKvbdEztQeMDJ
-EPCjjvbdIjEAJpHE
-EOcLKvbdfILWRmpg
-EPCjjvbdZyDinDLr
-DncKjvbdLGGIBaRV
-DncLKvbdmozZWLZC
-DoCkKvbdlZSrSxft
-EOcLKvbdFjdrcINV
-EOcKjvbdQvnDblHc
-DoCkKvbdqUUHRqkU
-EPDKjvbdnBjWwnmu
-DoCjjvbdZxcjNbkr
-DncKjvbdZisIQHCG
-DoCkKvbdJcJcRJbx
-EPDLKvbdlhdUQtqa
-DnbkKvbdrzLpSaHn
-DoDKjvbdziuPpDrt
-EPDKjvbdEYXlTtUM
-EObkKvbdqdFIpOVa
-DncKjvbdpxnhHQdY
-DnbkKvbdLhakqYAS
-EPCkKvbdrRtkNkBN
-EObkKvbdqrVKmjaN
-EOcKjvbdxUldqZMO
-EOcKjvbdrbFllHKy
-DoCkKvbdySmhlrBg
-EPCkKvbdkxrqsYgU
-EPCkKvbdZLqcsnMN
-DncKjvbdFpATXHFy
-EPDLKvbdZRMdiMeR
-EPDLKvbdRNXbYmtz
-DoCkKvbdpyPIGqEY
-DoDLKvbdKaKfmCYR
-EPDLKvbdrylPsBIO
-EObjjvbdUQqOuVHm
-EPCkKvbdezvZFItX
-EOcKjvbdZirhQHCG
-DoDKjvbdePFSjssr
-EOcKjvbdCTAcTfXS
-EOcKjvbdkxsRsYft
-EPDLKvbdQwODcMHc
-DoDKjvbdwuNFRZMO
-EPCjjvbdEuyPomKF
-DoCkKvbdpxnhGpcx
-DncKjvbdiVZeWrUb
-EOcKjvbdrEEiPmvB
-EOcLKvbdZxdJnDLr
-EObjjvbdUtNUFkvK
-DoDLKvbdZQmFIldq
-EObjjvbdnCJvwnmu
-EPCkKvbdRWmccLgc
-DnbkKvbdnUtykJqf
-DnbkKvbdVBBqSpqy
-EPCkKvbdZoOIddyj
-DnbkKvbdZQldiNFR
-DncLKvbdmRyVZsDi
-DoCjjvbdcasMrATm
-EOcLKvbdtbbtvuno
-DoDLKvbdZtJJYdSn
-DnbkKvbdGKeTDHlu
-DoCkKvbdZjTHpGbG
-EOcKjvbdHDjvKCKK
-EObjjvbdddnqbXCj
-EObkKvbdlZTSTYgU
-EPCjjvbdqqtjmkBN
-EObjjvbdtAGqIAAr
-EObkKvbdrRtjmjaN
-DnbjjvbdMRwMytpz
-EPCkKvbdsQWPJbuf
-DoDKjvbdqFceUWBI
-DoCkKvbdnBjWxPNu
-DoDLKvbdiUzFXRuC
-EObkKvbdQccBPqES
-DnbjjvbdOFDtIiLE
-EPDKjvbdYlRcsnMN
-DncKjvbdFfJrNhsq
-DoCkKvbdsCFmMHKy
-EPDLKvbdYkrETnMN
-DoCjjvbdYNqAXuWU
-EPDKjvbdrovPKDWG
-DoDLKvbdbKlGOmcA
-DoCkKvbdOStWHFVQ
-EObjjvbdhbObeXQq
-EPCjjvbdeEnrBwDK
-DoDLKvbdrbFmMGkZ
-DncKjvbdxZhGGYFS
-EPDKjvbdbrbkTdKB
-EPDKjvbdraellGkZ
-EPCkKvbdssSTZZeD
-EPDKjvbdDjHiuxKA
-DoCjjvbdzoPqFDMY
-EPCjjvbdlAlnmALA
-DoDKjvbdmtuZjjRf
-DoDKjvbdFpASvfey
-DoCkKvbdjlakyeGo
-DoDKjvbdxnSgxTIc
-EPCjjvbdxZhFfXeS
-EPCkKvbdqcdiPnVa
-EOcLKvbdmfeYMnHZ
-DoDLKvbduCbuWvOo
-DoDKjvbdmIcsqUqa
-EPDKjvbdzoQQdblY
-DoDLKvbdRNXayOUz
-DnbjjvbdrJAKFNOe
-DnbjjvbdZLrEUOMN
-EOcKjvbdwygeexEr
-EPCkKvbdbVBfwjtI
-EObkKvbdKDKDRJbx
-DoCkKvbdGckWKBij
-EOcKjvbdzjVQPdSt
-EPDLKvbdqlzKYkhJ
-DnbjjvbdajkennDA
-DoDLKvbdRzJgsCvA
-EObjjvbdehKuqmqH
-DncKjvbdajlFnnDA
-DnbjjvbdjEkHUoAO
-DoCjjvbdFVyPomKF
-DoCkKvbdJcJbpjCx
-DnbkKvbdRaceLiZL
-EPDKjvbdeEnrBwDK
-DoDLKvbdxKvdHzyf
-DoCkKvbdSPtHKFcw
-EObkKvbdjhHMGGOL
-EOcLKvbdGGJqnItR
-DoCjjvbdnGdxNNgZ
-DoDKjvbdbKkfOmcA
-DnbjjvbdelewHNKL
-EPCkKvbdcSbjsdJa
-EPCkKvbdTAEhgbOd
-DncLKvbdUslselVj
-DnbjjvbdVrOYBeMD
-EObjjvbdEzspeMDJ
-EPCjjvbdcTDLTcjB
-EPDLKvbdsPvPJbuf
-EOcKjvbdqGEFUWBI
-EPDKjvbdVgxWYGxz
-EOcLKvbdSPtGjGDw
-EObkKvbdGckVibJj
-DoDLKvbdeEoSCWcK
-EPCkKvbdQvmdClID
-DncLKvbdhytelROG
-EPCkKvbdeXzTtSFz
-EPCkKvbdrXQMDIxq
-EObkKvbdtlXvaUAw
-DnbkKvbdiMFDmtcZ
-EPDLKvbdJqZeOfNe
-EPDLKvbdmIdUQtrB
-DoDKjvbdVTltGLvK
-DncLKvbdZRNEhleR
-EPDKjvbdjlakydfo
-DnbjjvbdFpASvfey
-EPCkKvbdkySrTYft
-EOcLKvbdVUMtGMVj
-EPDLKvbdmRyUysDi
-EPCkKvbdGKeScHlu
-EObjjvbdczZPwyRC
-EPDLKvbdVYhUZkOn
-DncLKvbdJbibqKDY
-EPDLKvbdfekzNfgA
-EObkKvbdKQydoGOF
-EObkKvbdVgwvXfxz
-DncLKvbdQdDApQcr
-DncLKvbdGFjRnJUR
-DncKjvbdjgflFemk
-DoDKjvbdlhctRVSB
-DncLKvbdZLqctOLm
-DncKjvbdfSAvzlCo
-EPDKjvbdZRMeIleR
-EObjjvbdZRMeJMdq
-EOcKjvbdMuTSKmAX
-DncKjvbdqYngfpdY
-DnbkKvbdxrmiMqbH
-EObjjvbdbPgGckzd
-DoCkKvbdpstGqqkU
-DncLKvbdmJDsqVSB
-EPDLKvbdtunYKQsA
-EObkKvbdDnbkKwCd
-EPDLKvbdEXwkstUM
-DoDKjvbdrRtkNkBN
-DncLKvbdIwtCIMQp
-EPDLKvbdZQmEhmEq
-DnbkKvbdxmrhYTIc
-DoCjjvbdCSaDUGWr
-EPCkKvbdatagXkUI
-DncLKvbdEPDKkWcE
-DncKjvbdZjShPgBf
-EPDKjvbdHDkVjCJj
-DoCjjvbdsrrTYzEc
-EObjjvbdhlEcnUby
-DnbjjvbdemFvfmKL
-EObkKvbdlhcsqUqa
-DoCkKvbdZtIiYdTO
-EObkKvbdEXwlTssl
-DoDKjvbdhaoCdvqR
-EObkKvbdliEURUrB
-DoDLKvbdEYXkstTl
-DncKjvbdFkEsDINV
-DoDKjvbdFkErcHmV
-DoDLKvbdKCjCpjDY
-EPCjjvbdjJegjMxS
-DnbkKvbdnCKWwnmu
-DnbjjvbdqwQLbiYq
-DoDLKvbdSZigsDWA
-EObjjvbduVnYKRTA
-EOcKjvbdTlWOaVoJ
-DnbjjvbdSCDeMJYk
-DnbkKvbdQvmdClID
-EPCkKvbdziuQPdTU
-EOcLKvbdhficZWJu
-EOcKjvbdZLqdTmkm
-DoDKjvbdcImKKevx
-EOcLKvbdGFirOJUR
-EObkKvbdREDApRES
-DoDKjvbdHELWKBij
-EOcKjvbdrSVLNkBN
-EOcKjvbdBdQBWJlf
-DoCjjvbdFpATXHGZ
-DnbjjvbdqZOhGpdY
-EPDLKvbdCSaDUGWr
-DoDLKvbdrpWPJcWG
-DnbjjvbdZsiJYdTO
-EPDKjvbdJvVGEFGi
-EPCkKvbdmIctRVSB
-DncKjvbdBiLCKhfK
-DoCkKvbdZisIQGbG
-DoCjjvbduWNwjQsA
-EOcLKvbdiHKCyVjV
-EPCjjvbdlZSrTZGt
-EObjjvbdNPxRWNgT
-DncKjvbdeAURNXif
-DncLKvbdOStWGeVQ
-DoCjjvbdJvUeceGi
-DoDKjvbdXsMBMsnx
-EPDKjvbdGLFSbhMu
-EPDLKvbdEvZPolie
-EOcKjvbdrRtjnLBN
-EPDKjvbdyOTHxTJD
-EPDKjvbdmajWwnmu
-EPCjjvbdrNZjZLhJ
-DncKjvbdajlFoODA
-DoDKjvbdrEFIpOVa
-DnbkKvbdpedEtWBI
-DncKjvbdqwQMChyR
-DnbjjvbdnCKWwnnV
-DoCjjvbdNUsRkNAX
-EOcLKvbdULvPBWPJ
-DncLKvbdjlalZdfo
-EPDKjvbdjJfHjNYS
-DoDKjvbdPxmAHTSK
-DnbkKvbdmIctQtqa
-EObjjvbdnHFXmNfy
-EPCkKvbdqlzJyLhJ
-DnbjjvbdVqnYCElD
-EPDKjvbdqTsgRqkU
-EPCjjvbdADSYKZhp
-EPDLKvbdEvZPoljF
-DoCkKvbdLFfICBRV
-EOcLKvbdZRNFJNFR
-EPDKjvbdpedFUWBI
-EPDKjvbdVwJYVceH
-DoCjjvbdGYtuBDwb
-DoCjjvbdVYgtZjoO
-DncKjvbdQccApQcr
-EOcLKvbdWWiYWDdg
-DncKjvbdyTOJNSBg
-DnbjjvbdbAueFpQX
-DnbkKvbdiUydwSUb
-DoDKjvbdKVtfDeHJ
-DoDKjvbdEObjkXCd
-EOcKjvbdqlyjYlHi
-EOcKjvbdfRaWzlCo
-EObjjvbdRWmcblID
-DoDLKvbdCDpAvKMf
-DncLKvbdmuVZjjSG
-EPDLKvbdkaMnmALA
-EPCkKvbdcSbkTdKB
-DnbjjvbdZtJIyESn
-EPCkKvbdQvmccMHc
-DncLKvbdfHjvRmpg
-DoCjjvbdVvhwvEEg
-EPCjjvbdXrkaNTnx
-DnbkKvbdGFirNiUR
-EObkKvbdZLrDsnLm
-EObkKvbdySnJNRbH
-DncKjvbdaMkBsUmH
-EPCkKvbdqGEFUWBI
-EObjjvbdmajXYOnV
-DnbkKvbdHELWKBjK
-EPDKjvbdWSOYCFLc
-DncLKvbdehKurNqH
-EPDLKvbdSZjIScWA
-DncKjvbdZQldiNEq
-DncLKvbdVwIwvEEg
-DnbjjvbdauCGxKsh
-DnbkKvbdKefHbApu
-DoCkKvbdssSTYyeD
-DnbjjvbdSPsgJfEX
-DoCkKvbdeKKRvUzn
-DoDLKvbdiMEcnVCy
-DoDLKvbdoAKzsgcn
-DoDKjvbdDoDKjvbd
-DncKjvbdFWYopMie
-EPDLKvbdRNXaxmtz
-EOcLKvbdKefHaaRV
-EPDKjvbderAvzkbo
-EObjjvbdzoQREcMY
-DnbkKvbdijFgjMwr
-EObjjvbdhbObdvqR
-EPCkKvbdySmiMqbH
-EObkKvbdyzeOSIIh
-DnbkKvbdjcLkRHUg
-DoDLKvbdJpydoGNe
-DoDKjvbdwXMBWBWV
-EObkKvbdsBfMkgKy
-DnbkKvbdYkqdTnMN
-EPCjjvbdEPDLLWbd
-EObkKvbdDwxLtUUM
-DncKjvbdNrtVgFUp
-EPDKjvbdZQleJNFR
-EPDKjvbdJKEAKPfd
-DnbjjvbdhgKCxvJu
-EObkKvbdLAkHMbXq
-EPDKjvbdhancEvqR
-DoCjjvbdNsUWHEuQ
-DnbkKvbdZjTHofaf
-EPCjjvbdrDdiQOVa
-EPDKjvbdkMbLzEgP
-EPCkKvbdZoOJFEyj
-EPCkKvbdADRxJyhp
-EObjjvbdaSGCgsfL
-DnbjjvbdJbjDQibx
-EPCjjvbdpfEEtWBI
-EOcLKvbdZxdJmblS
-EPCkKvbdRpTgKGEX
-DoCjjvbdzRPNIiwA
-EObkKvbdzoPpeClY
-EObjjvbdeFOrBwDK
-DoCkKvbdOTTvHEtp
-DnbjjvbdGQATWgFy
-EPCjjvbdEvZQQNJe
-EObkKvbdjvWnECYX
-DoDLKvbdyTOIlqag
-DnbkKvbdEASJNZvw
-EOcKjvbdsZkosBHn
-DoDLKvbdtSqsYyeD
-DncKjvbdqlyixkgi
-EPCjjvbdTppnuVHm
-DncKjvbdatbHYKsh
-DoCkKvbduVmwjQsA
-EPCkKvbdvAcxsOeI
-EObkKvbdRjyFuHLT
-EObjjvbdTukoitAq
-EOcLKvbdkySqrxft
-EObjjvbdQccBPpdS
-DoDKjvbdffLzNfgA
-DoDKjvbdiCOcEvqR
-DncKjvbdIBkzEzAD
-EObjjvbdVZHsyjoO
-EOcLKvbdZoNheEzK
-DnbkKvbdsZkpTAhO
-DnbjjvbdqFdEtVaI
-DnbkKvbdIGfzZXwg
-EPDLKvbdlrZVZsEJ
-EObjjvbdBcpAvJmG
-DnbjjvbdtSqsYzFD
-EPDLKvbdJJdAJogE
-DncKjvbdxVMdpyMO
-EPCjjvbdQwOEDLhD
-DoCjjvbdmgFXmNgZ
-DoDLKvbdjEkGuPAO
-EPCjjvbdACrXjZiQ
-DoCjjvbdZMRdTmlN
-DncLKvbdiLeDnVDZ
-EObjjvbdVAaprpqy
-DoDLKvbdRjyFuGjs
-DnbjjvbdVAbQrprZ
-EObkKvbdSZjHrcWA
-EPDKjvbdVrOYBeMD
-EPDLKvbdDwxMUTsl
-EPDKjvbdRadElIxk
-DnbjjvbdmozZWKyC
-DoDLKvbdptTgRrKt
-EPCjjvbdatagXkUI
-DncLKvbdZLqcsnMN
-DoDLKvbdfNFwGmJk
-EObkKvbdqTsfrSKt
-DncLKvbdZjTHpGbG
-DoCjjvbduWNwipsA
-EPDKjvbdauCGwkTh
-DncLKvbdKVuGEFGi
-EObjjvbdZirhPfaf
-DoDKjvbdxKvcgzyf
-DnbkKvbdxsNhlrCH
-DoCkKvbdBsBDUGWr
-DncKjvbdfMfXHNJk
-DnbjjvbdOSsugFVQ
-DncKjvbdZisIPfaf
-DnbjjvbdZHXEAOsJ
-DnbjjvbdLZRJrzuG
-EObkKvbdwuNFQxlO
-DncKjvbddxZtURez
-EPCkKvbdxrmiNSCH
-DoDKjvbdiUydwSVC
-EObjjvbdiifIJlwr
-DncLKvbdssSSxyeD
-EPDKjvbdOEcsiJLE
-EOcKjvbdySnIlrBg
-EPCkKvbddZyQYZRC
-DnbjjvbdWXJXudEg
-DoDLKvbdKaLHNCXq
-DoDKjvbdGGKRmiTq
-DnbkKvbdlrYtyrdJ
-EPDKjvbdhtzEvrVC
-EObkKvbddZyQYYqC
-DoDLKvbdhaoCdwRR
-EPCkKvbdxLWdHzyf
-DoDKjvbdySmhmRbH
-DnbkKvbdZLqcsmlN
-EObjjvbdZtJIxdTO
-DoDKjvbdDwwksssl
-EPDKjvbdFyVVAdXb
-DoCkKvbdUtNUFkvK
-EPDLKvbdxmsIXsIc
-EPDLKvbdUsmUFkuj
-EOcKjvbdGKdsDHlu
-EOcKjvbdACqwjZiQ
-EPDKjvbdFpASwHGZ
-DoCkKvbdGZUtaDxC
-DncKjvbdmSZVZsEJ
-DoCjjvbdJbicRKCx
-DncLKvbdTvMQJsaR
-DoCjjvbdNeDtJJKd
-EPCjjvbdnPzYvKxb
-DoDLKvbdyTNhlrCH
-EPDKjvbdRosgJecw
-EObkKvbdTAEiICOd
-EOcKjvbdapHHDkzd
-DoCkKvbdjlakzFGo
-DncLKvbdrpWPJbuf
-DnbjjvbdNQXqVnHT
-EOcLKvbdkNCLzFHP
-EObjjvbdTukpKTaR
-EOcLKvbdEuxpPlie
-EPCkKvbdJuuFdFHJ
-EPDKjvbdGGJqmiTq
-DnbjjvbdOAIrtJrA
-DnbjjvbdelfWgNKL
-EObkKvbdhbOcEwRR
-DncLKvbdqiAKFNPF
-DncKjvbdVqnYCFMD
-DoDLKvbdWHxWXgYz
-EOcLKvbdNVTSKmAX
-EPDKjvbduaDySndh
-DnbkKvbdiifIJlxS
-EPDKjvbdeATpmYJf
-DncLKvbduCcVWuoP
-EPCjjvbdhficYvJu
-DncKjvbdehLVqnQg
-EPCkKvbdrDeJPmua
-DoCjjvbdTfzmlWue
-DncKjvbdZoNiFEyj
-DoDLKvbdxmsHxSiD
-EObkKvbdVwJYVdFH
-EPCjjvbduMXwBUBX
-DnbkKvbdTqROuVIN
-EPCjjvbdGKeTCglu
-EPDLKvbdcyyPwxpb
-EPDLKvbdQmXayOUz
-EPDLKvbdZyDinCkr
-EPDLKvbdZoNheEyj
-DncLKvbdmfdxMnGy
-DnbkKvbdkClLRGuH
-DncLKvbdJXsbIMQp
-DnbjjvbdjJegilxS
-DoCkKvbdnPyxukZC
-EPDKjvbdZMRcsnLm
-DoCkKvbdHffzYxYH
-DnbkKvbdbsDLTcjB
-DoDLKvbdSwjlNzjx
-DncKjvbdkaMnmALA
-DncLKvbdqmZjZLhJ
-DoDKjvbdqrUkNkBN
-DncLKvbdmfeXmOGy
-EPCjjvbdZMRdTmlN
-DnbkKvbdypnlhjXA
-EPDLKvbdyOTHxTJD
-EObjjvbdMRwMzVQz
-EPCjjvbdSCDeMIxk
-EObjjvbdOXnuzdOU
-EPDKjvbdOStWHFVQ
-DoDLKvbdrzLpTAgn
-DnbkKvbdULuoAvPJ
-EPDKjvbdZxdKODMS
-EOcKjvbdbAvEfPpX
-DncKjvbdyOSgwriD
-EPDLKvbdrJAJdmPF
-EPDLKvbdauCGxKtI
-DncLKvbdqrVLOLAm
-EPDKjvbdkHgLfFmk
-DncKjvbdUaCRSqSZ
-DnbkKvbdbQGgELzd
-EOcKjvbdcJMijfXY
-EPCkKvbdeOeTLUTr
-EOcKjvbdQmYByNtz
-EPDLKvbdFxuVBDwb
-EOcKjvbdGGJrNiUR
-DoDKjvbddndsLTtS
-EOcLKvbddZyPxYqC
-EPCkKvbdSKxfVHLT
-EOcKjvbdSCDdkiYk
-DnbjjvbdtvNwjQsA
-EOcKjvbdJXsbILqQ
-EObjjvbdjcLkRHVH
-EObjjvbdkCkkQgUg
-DoCjjvbdTqQnttgm
-EPCkKvbdEuyPoljF
-DoCkKvbdTqQnuUgm
-DoDLKvbdLrWlzVQz
-EPCjjvbdRjyGVGkT
-DoDLKvbdHEKvKBjK
-DoCjjvbdnCJvxOnV
-EObkKvbdptUGrRkU
-EPDKjvbdQwNcblID
-DoCjjvbdIidAKPgE
-DoCjjvbdTYLMNzkY
-DnbjjvbdEztRFMCi
-EObkKvbdBhkCLJGK
-EPDLKvbdZisHpGbG
-EPDLKvbddePRbXDK
-EObkKvbdUQpntuIN
-EObjjvbdEPCjjvcE
-DncKjvbdbiNJjewY
-EPDLKvbdVrOYCElD
-EPCkKvbdSBdElIyL
-DoDLKvbdzjVQQETU
-DoCjjvbdCDpAvKNG
-EObkKvbdNHComPuL
-EOcKjvbdGdKvJaij
-DnbkKvbdqmZjYkgi
-DncKjvbdQvnEClID
-DncLKvbdWWiXudFH
-DoDLKvbdCEQBWJlf
-DncKjvbdMpXqWOGs
-EPDKjvbdVBCRSqRy
-EPDLKvbdqUTgSRjt
-EOcLKvbdJXtCHkqQ
-EObkKvbdBiLBkJFj
-EOcLKvbdVvhwvEEg
-EOcKjvbdCTBCsewS
-EOcKjvbdyNsHwriD
-DoDKjvbdwzHfFxEr
-DnbjjvbdypoMiJwA
-DoCjjvbdJbicQjCx
-EOcLKvbdVUMsekuj
-EOcKjvbdCEQBWJlf
-EObjjvbdIjEAKQGd
-DoCjjvbdDjIJvXjA
-DoDLKvbdFyUuAdYC
-DncLKvbdRotGiedX
-DoCjjvbdBhkBjhej
-EOcKjvbdBhkCKhfK
-EPCkKvbdLFfHbBRV
-DoCkKvbdNUrrLNAX
-EOcKjvbdZoOIeEzK
-EPCjjvbdkMbMZeHP
-DoCjjvbdkVwNdBxX
-EPCkKvbdNddThiKd
-DnbjjvbdjcLkQftg
-DnbkKvbdFkErcHmV
-DnbjjvbdqGEEtWAh
-DncKjvbdmSYuZsEJ
-DoCjjvbdUsmTfMWK
-DoCkKvbdVUMtFkvK
-EOcKjvbdKfGICBRV
-DnbkKvbdMSWlzUpz
-EOcLKvbdVBBprpqy
-EPCjjvbdnHEwmNgZ
-DoCkKvbdeEoRawDK
-DnbkKvbdpssgSSLU
-DncKjvbdOSsugFUp
-DnbkKvbdwzHfGYFS
-DoCjjvbdTAEiHbPE
-EObkKvbdKaLGmCXq
-DnbkKvbdCWzciFQW
-DncLKvbdnVVZjiqf
-EPCjjvbdOStWHEtp
-DoDKjvbdkIGkfFmk
-DoDKjvbdZjTIPfbG
-EOcKjvbdXsMAlsnx
-DnbjjvbdILazmwRL
-EOcKjvbdrDdiPmvB
-EPDKjvbdiUzEwRuC
-EOcKjvbdqAheAXHd
-EPCjjvbdRyigsCvA
-DoCjjvbdpyOggQcx
-EPCkKvbdZyDjNblS
-DncLKvbdFejSNiTq
-EPDKjvbdzRPNIjXA
-DncLKvbdaMkBsVMg
-EObkKvbdLYqJrzuG
-DncKjvbdsBfNMHLZ
-EPDKjvbdjgflFfOL
-DoDKjvbdCTAcUGWr
-DnbjjvbdSLZGVGkT
-DoCkKvbdZQmEhldq
-EPDKjvbdUsmTfMWK
-DoCjjvbdKefICBRV
-EPCjjvbdZMSDsnMN
-EObkKvbdwzIGGXdr
-EObjjvbdrRtjnLAm
-EPDKjvbdXrlAmTnx
-EPCjjvbdZtJJZETO
-DnbjjvbdieLGtoAO
-DnbkKvbdnCJvxPOV
-EPDKjvbdjKFgjNYS
-DoCkKvbdlhcspuRa
-EPDKjvbdbAvEfQPw
-EOcLKvbdiGjDYuiu
-DncKjvbdnQZxvLZC
-DoDLKvbdaogHDkzd
-DnbjjvbdMfcQMouL
-DncKjvbdKaKgMbYR
-DncKjvbdrbGNMHKy
-DoCkKvbddoFSjtUS
-EPDLKvbdNddTiIjd
-EPDKjvbdhgKDZViu
-EPDLKvbdkMbLzEfo
-DoDKjvbdjmCMZdfo
-DoDKjvbdSCDeLhyL
-DoCkKvbdQwODcMID
-DnbkKvbdgGLymgHA
-EPDKjvbdWIYVwfxz
-DnbkKvbdZLqdUNkm
-DoCkKvbdYlSETmkm
-DnbkKvbdLqvlyuQz
-DnbkKvbdZRMdiMdq
-EOcLKvbddePSCXCj
-EPDLKvbdRacdkiYk
-DnbjjvbdZisIQGbG
-EObjjvbdrpVnibvG
-DncLKvbdIxUCHlRQ
-EPCkKvbdhuZeXRtb
-DnbjjvbdQwODblID
-DoDKjvbdezuyEhsw
-DncKjvbdiLddNtcZ
-EPCkKvbdiLeENtby
-DnbjjvbdxKvcgzzG
-EPDLKvbdRXNdClID
-DncLKvbdEKHjVwjA
-EOcLKvbdzoPqFCkx
-DoDLKvbdliEURUqa
-DoCjjvbdyOTIYTJD
-DncLKvbdIHGyyXwg
-EPCjjvbdShyjRABM
-DoCkKvbdnPyyWLYb
-EObjjvbdsPvPJcVf
-EPDKjvbdTXjlNzjx
-DoDKjvbddneTLUUS
-EOcKjvbdmuUyjiqf
-DncKjvbdZoOIddzK
-DoCjjvbdpyOhGqEY
-DoCkKvbdwjwDgzyf
-DnbkKvbdxZgeexEr
-EOcLKvbdHDjvKCKK
-DoCkKvbdpxnhHQdY
-DoDLKvbdLrWlzUpz
-EPDKjvbdatbHXkTh
-DoDLKvbdZyDinDLr
-EPCjjvbdGGJqnJTq
-DoDKjvbddneTLTsr
-DncLKvbdyzdmqhJI
-EObkKvbdRjxfVGkT
-EPDKjvbdOAJTTirA
-EPCjjvbdZoNiFEzK
-DnbjjvbdOhAXyAYa
-DnbjjvbdACqwizIp
-DoDLKvbdcImJjevx
-EPDLKvbdxmrhYTIc
-DoDLKvbdjcLkRGuH
-EPCkKvbdxVNEpxlO
-EPCkKvbdKCibqJbx
-DoCkKvbdjJfIKMxS
-DoDLKvbdVYhUZjoO
-EPDLKvbdrJAKEmPF
-EOcLKvbdRDbaQRDr
-DoCkKvbduWOXiqTA
-DoCjjvbdZyDjNcLr
-EObjjvbdbBWEeoow
-EPDLKvbdUQpnttgm
-EOcKjvbdlBNOmALA
-DnbjjvbdSPsfiecw
-DnbjjvbdwzIGGYFS
-EOcKjvbdLGFgaaRV
-EOcKjvbdrXQLcJYq
-DnbkKvbdmbKXYPOV
-DoCkKvbdZisHogCG
-EPCkKvbdFVyPpMjF
-EOcKjvbdYkrDsmkm
-DoDKjvbdxUmEqYlO
-EPDKjvbdKNAEZgUa
-DoDLKvbdqZPIGpcx
-DoCjjvbdMgComPtk
-EObjjvbdUyHszKoO
-DoCkKvbdeEnqavcK
-EPDKjvbdqYoIGqEY
-DoDLKvbdCDoaWJmG
-EPDLKvbdlZSrTZHU
-EPCkKvbdZxcinDMS
-DoCkKvbdgFkzNfgA
-EOcKjvbdYNqAXtvU
-EObjjvbdwygefYEr
-EPCkKvbdbBVdfQQX
-DnbkKvbdqrVLOLAm
-EOcKjvbdFjeTDINV
-DnbjjvbdnHFYMnGy
-EPCjjvbdrbFllHKy
-EPCjjvbdZLrDtOMN
-EPDLKvbdcJNKKfWx
-DoCjjvbdraemMHLZ
-DoDKjvbdeJjSWUzn
-EPCkKvbdZnmiEdyj
-DnbjjvbdwtleQxlO
-DnbkKvbdDwwlUTtM
-DoDKjvbdrWpMDJZR
-EOcKjvbdegkVrORH
-EPCkKvbdiCOcFWqR
-DnbkKvbdBsBDTevr
-DoCjjvbdjcLjpfuH
-DnbjjvbdZxdKODLr
-DoCjjvbdqceIpOVa
-DoDLKvbdVvhxVceH
-EObkKvbdsrqryZdc
-DnbkKvbdMSWlytpz
-DoDLKvbdqTsfqrKt
-EPCjjvbdjKGIKNYS
-EOcLKvbdiGibxvKV
-EPCjjvbdKDKCpibx
-EPDKjvbdQdDBPqDr
-DncKjvbdozmdLYPA
-DoCkKvbdTvLojUAq
-DnbkKvbdbhmKLFwY
-EPDKjvbdCIjbLIej
-DncKjvbdkHfkeenL
-DoDKjvbdtAGqIABS
-EPCjjvbdRosfjFdX
-EOcKjvbdraemLgLZ
-DnbkKvbdxmrgxTIc
-DoCkKvbdOAJStJrA
-EPCjjvbdqYngfpdY
-EPDLKvbdBvzdJEov
-DoDKjvbdrDeIpOWB
-EObjjvbdqUTfrSKt
-EOcKjvbdxnShXsIc
-DoDKjvbdEzsqFLcJ
-EObjjvbdDxYMUUUM
-EOcKjvbdjKFhKNYS
-EOcKjvbdjgflGFmk
-DoCkKvbdGGKRnItR
-EPCkKvbdREDApRDr
-EOcLKvbdNQYRWOHT
-EPCjjvbdxmrgwriD
-DncLKvbdbsCjsdJa
-EOcKjvbdypoNIiwA
-DncKjvbdZoOJFEyj
-DoCjjvbdrbGMkgKy
-EPDKjvbdyTNiNSBg
-DoCjjvbdczZPwyQb
-DoDKjvbdWfZZtAOs
-EPDKjvbdznoqFClY
-DncKjvbdTlVoBVoJ
-EPCkKvbdIxUBhMRQ
-DoCkKvbdZQmEiNEq
-DoDKjvbdnVUykKRf
-DnbjjvbdUtMtFlWK
-EObjjvbdOTUVfeUp
-DoCjjvbdZMSEUOMN
-DoCjjvbdwjwDgzzG
-DoDKjvbdYqNEiNFR
-DoDLKvbdqiAKEmOe
-EPDLKvbdfNGXHNJk
-DnbjjvbdCEQBVjMf
-EObkKvbdqUUGrRjt
-DnbkKvbdjmCLyeHP
-DnbjjvbdcJMikFwY
-EPCjjvbdjuwNdBxX
-DoCkKvbdeqaWzkbo
-DncKjvbdTkvOaVoJ
-DoDKjvbdZoOIeEzK
-DoDLKvbdKDKDRKDY
-DncLKvbdqwQMDJYq
-EObkKvbdKeegbBRV
-EPDKjvbdegjuqnRH
-DoDKjvbdxwhjBpZk
-EObjjvbdziuQPdSt
-EPCjjvbdZyEKOCkr
-EPCjjvbdRWmdCkhD
-EOcLKvbdQcbaQRES
-DncLKvbdIrxaTNYM
-DnbjjvbdGFiqmiTq
-DoCjjvbdZeXfzghb
-DoCjjvbdSLZFuGkT
-EPDKjvbdIryBSmYM
-EOcLKvbdRyjHsCvA
-EPDKjvbdzoPqFCkx
-EPDLKvbdFeirOIsq
-EObkKvbdLiBkpxAS
-DoCjjvbdmuUyjirG
-EOcKjvbdpfDeTuaI
-DncLKvbdtSqsYyeD
-EOcLKvbdAMhYrwZx
-EOcKjvbdJSyAsNYM
-DncLKvbddneTLTsr
-EPDLKvbdANIYsWyx
-EObkKvbdRXODblHc
-DoCkKvbdYzcGRjWZ
-DoDLKvbdkHgLfFnL
-DoCkKvbdpyPIGqDx
-EObkKvbdwuNEpxkn
-DoDLKvbdJSxaTNYM
-DoDLKvbdRNXbZOUz
-DnbjjvbdNHDPlpUk
-EObjjvbdKQzFPFnF
-EOcKjvbdwkWdHzzG
-EObkKvbdiCPCdvpq
-EPCkKvbdwzHfFwdr
-DoDLKvbdwuMeQxkn
-DoDLKvbdmoyxujyC
-DncLKvbdyYJKBoyk
-EOcKjvbdhgJbxujV
-EOcKjvbdvAcySndh
-EPCjjvbdOYPVzcmt
-DncKjvbderBWzlCo
-DncLKvbdEuxoolie
-DoDLKvbdUsmTelVj
-DoCkKvbdcImKKfXY
-EPCkKvbdKDJcRJcY
-DoDLKvbdfILWSOQg
-DoDLKvbdtcDVWuno
-DoDKjvbdegjvSNpg
-DncKjvbdjvXOEBxX
-DncKjvbdvOszpjoU
-EOcLKvbdkIGkfFnL
-EPDKjvbdZxcinCkr
-EOcKjvbdNxPVzcnU
-DnbkKvbdNrsvHEtp
-DnbjjvbdwygefXeS
-EObkKvbdnHEwmOGy
-EObkKvbdZRNFIleR
-DoCjjvbdNHColotk
-EPDKjvbdTkuoBVni
-EObkKvbdkHgLfGNk
-DoCkKvbdVvhxWEEg
-EOcLKvbdtbcVWvOo
-DoDKjvbdULvOaWOi
-EObkKvbdNdcsiJLE
-DoDLKvbdOYPVzdNt
-DoCkKvbdNeDsiJLE
-EOcLKvbdXGYytAOs
-EOcKjvbdcIljLGWx
-DoDKjvbdIMBzmwQk
-EPDKjvbdbrcKscjB
-DoCjjvbdqdEhpOWB
-DnbjjvbdzoPqFClY
-DnbjjvbdKDKCqJcY
-EPDLKvbdZRNEhldq
-DncLKvbddZyQXyRC
-DncLKvbdRzKHrcWA
-EObkKvbdTAFIgbPE
-EObjjvbdwtmFRYkn
-DoDLKvbdCTAbtFwS
-EObjjvbdJzpFwdAN
-DoCjjvbdCTAbsevr
-EObjjvbdyzdmrIIh
-DnbkKvbdANIZTXZx
-EPCkKvbdVwJXvDeH
-DncKjvbdmfdwlnHZ
-DoCjjvbdZirhPfaf
-EPCkKvbdiHJcYvJu
-DnbjjvbdRMxCYmtz
-EPDLKvbdZHWdAPSi
-DnbjjvbdWSNxBdkc
-DoDKjvbdNxPVzdNt
-EObjjvbddePRawDK
-DncKjvbdaSGCgtGL
-DncKjvbddoFSjstS
-DnbjjvbdOFETiJLE
-DoDLKvbdeAUQmYJf
-EObjjvbdZshiZESn
-EPCjjvbdVwIwvEFH
-DnbkKvbdKDKDQjDY
-EPDLKvbdRbEFMJZL
-DoDKjvbdiZuGLpnG
-DoCjjvbdqGEEtWAh
-DnbjjvbdnBiwYPNu
-DnbjjvbdtlXwBTaX
-DoCjjvbdqYoHfqEY
-EPCkKvbdIsZArmXl
-DoDLKvbdmfeYNNgZ
-DoCkKvbdrafNLgKy
-DnbkKvbdYfwEAOsJ
-DoDLKvbdrEFIonWB
-EPCjjvbdRXODcMID
-EPCjjvbdZisIPfbG
-DncKjvbdoAKzshEO
-EOcLKvbdNQXqVmfs
-DnbkKvbddoEsKssr
-EPDKjvbdNeETiJLE
-EPCkKvbdVgwvXfxz
-EOcKjvbdIsZBTNXl
-EObkKvbdFeirOJUR
-EPCjjvbdVAbRSpqy
-DnbjjvbdeXyssqez
-EPDLKvbdZGwEAOri
-DoCkKvbdVAaqSqRy
-DoDLKvbdiVZeWrVC
-EPDKjvbdGYuUaDwb
-DncLKvbdLrXMyuQz
-EPDKjvbdGZUtaEXb
-EOcLKvbdzoQRFDLx
-EPCkKvbdTAFJICOd
-EPDKjvbdNPxRVmfs
-DoCjjvbdauBfxKsh
-DncLKvbdMIbLpxAS
-DoCkKvbdmgEwmNfy
-DoDLKvbdhanbdvqR
-DoCkKvbdSLYfUfjs
-DoCjjvbdTvMQJsaR
-DnbkKvbdlhcspuRa
-DnbjjvbdJSyBSlxM
-EPCjjvbdSLZFuHLT
-DoCkKvbdYTLaNUPY
-EObjjvbdFeiqnJUR
-EPDKjvbdYlRctNkm
-EOcKjvbdHDjvJaij
-DnbkKvbdnCJvwnnV
-DoCjjvbdNHDPlouL
-DncLKvbdWXIxWDdg
-DoCkKvbdJSyAsMwl
-EObkKvbdxmrhXriD
-DnbkKvbdJzpGYEAN
-EOcLKvbdddnqawDK
-EOcLKvbdhyuFkpnG
-DnbkKvbdtAHQhABS
-DoCjjvbdjhGlFemk
-DncLKvbdjJehJmXr
-EPDLKvbdHffyyXwg
-DoCkKvbdRbEFLiZL
-DoCjjvbddePSBwCj
-EPDKjvbdeOeTKtUS
-DnbjjvbdrDeIomvB
-DnbjjvbdVZIUZjoO
-EPDKjvbdxmsIYTIc
-EPCjjvbdDnbkLXDE
-DnbkKvbdYlSDtNlN
-EObkKvbdeFPSBvbj
-EPCkKvbdkDMKpgUg
-DoCkKvbdbKlGPODA
-EObjjvbdGdLVjCKK
-EPCkKvbdkCkjqGuH
-EOcLKvbdqYngfpcx
-EPDLKvbdeKJqvUzn
-DoCkKvbdkIHMGGOL
-DncKjvbdDoDKkXDE
-EPCkKvbdsCGNMHLZ
-EOcKjvbdyzeNqhJI
-DnbjjvbdqwQLbhxq
-EObjjvbdaaWEepPw
-EObjjvbdDxXktUTl
-DnbjjvbddwzTtRez
-DnbjjvbdKQyeOfNe
-EPDKjvbdbBVdepPw
-DncLKvbdfSAvzkbo
-DoDKjvbdqYoIHQcx
-DoCkKvbdeEnrBwCj
-DncKjvbdehLVqnRH
-EPDLKvbdhfjDYuiu
-EPCkKvbdvmWANEEm
-EPCkKvbdZRNEiNFR
-EOcLKvbdCSaCtGXS
-DoDKjvbdbhljKevx
-DoDKjvbdbBVdepQX
-DncLKvbdqTsfrSKt
-EPDKjvbdjEjgVPAO
-DoCjjvbdFeiqmiTq
-EObjjvbdcImJkGXY
-EObjjvbdJbjCqJcY
-DnbkKvbdjcLjpftg
-EPDLKvbdWXJYWEEg
-DoDKjvbdznpREbkx
-EObjjvbdfILVqmqH
-DnbkKvbdxwiKCQZk
-EPDLKvbdOEdUJIjd
-DnbkKvbdsCFmLgKy
-DncKjvbdijFhKMxS
-EPCjjvbdzitpQDrt
-EPCkKvbdZQleImEq
-DoDKjvbdZxdKNcLr
-DncKjvbdGdLVjCKK
-EOcKjvbdhzUfLpnG
-DncLKvbdwzHfGYEr
-EObjjvbdEObjjvcE
-EOcLKvbdfHkVqmpg
-DnbjjvbdXnRAXuVt
-EOcLKvbdeFOrBwDK
-EPCjjvbdzitoocsU
-EPDKjvbdZxdJmblS
-EObjjvbdFjeScHlu
-DoDKjvbdjhGkfFmk
-EOcLKvbduDDVXWPP
-EPDLKvbdJYUCHkpp
-EPCkKvbdkClKpgVH
-EObkKvbdJcKCqJbx
-DncKjvbdEXwlUTsl
-EObkKvbdxwiJbPzL
-DncLKvbdHDjujCKK
-DnbkKvbdEuyQQMie
-EPCkKvbdUaBpsRSZ
-EPCkKvbddoFTKstS
-EPCjjvbduaEYsOeI
-DoDLKvbdcTDKscjB
-DncLKvbdNdcshiKd
-DnbjjvbdWSOYCEkc
-EOcKjvbdZnmiEdzK
-EPDKjvbdUQpnttgm
-DoCjjvbdnGdwmOGy
-DoCkKvbdZyDjNblS
-EOcKjvbdShyjRAAl
-DncKjvbdTkvOaWPJ
-DoDKjvbdOEcsiJKd
-DncKjvbdbVBfxKtI
-EPCkKvbdrafNLfjy
-DoDKjvbduaEZTOeI
-DncLKvbdGGKSNhtR
-EPCjjvbdnBjWxOmu
-EObkKvbdKefICBRV
-DncKjvbdZoNheFZj
-DnbkKvbdEOcKkWbd
-EPDKjvbdNGcPmQUk
-EObkKvbdaMjbStlg
-DnbkKvbdJYTbIMRQ
-DncLKvbdJXsahLpp
-DncKjvbddeOrBvbj
-DoDLKvbdJSyAsMwl
-EPCkKvbdZdwfzhJC
-DoCjjvbduDDVWuno
-DnbjjvbdEztQdkbi
-EOcLKvbdUyHsykOn
-EObjjvbdDjHivYKA
-DoDLKvbdnUtzLKSG
-DncLKvbdSLZFuGkT
-DoDKjvbdlYrrTZGt
-EOcLKvbdqUUGqrKt
-EPDLKvbdEPCjjvcE
-EPDKjvbddxZtTrFz
-EObkKvbdlYrqrxgU
-DoCjjvbdauCGwjtI
-DnbjjvbdQZNAHTRj
-DoDKjvbdMoxRVmfs
-DncLKvbdOTTvGeUp
-DncKjvbdcJNKKewY
-DoDKjvbdmuVZjjSG
-EPDKjvbdUWLpKUAq
-EOcLKvbdSLZGVGjs
-EObjjvbdCIjakJGK
-EPDLKvbdZnmhddyj
-EOcKjvbdLBKgMaxR
-EOcLKvbdDjHjVwjA
-DnbkKvbdYlRcsnLm
-DoCjjvbdrRuKnKaN
-EPCkKvbdptUHSSLU
-DncLKvbdYpmEiNFR
-EObkKvbdMIalQxAS
-DnbjjvbdJuteceHJ
-DncLKvbdFWYpPlie
-EPCkKvbdmgFYMmgZ
-DoCjjvbdmbJvxOnV
-DncKjvbdIGfzZYXg
-EPDLKvbdqTtGqrLU
-EPCjjvbdWRmwbElD
-EPDLKvbdGLErcIMu
-EPDLKvbdwygefYEr
-EPDKjvbdrSUkOLBN
-DoCkKvbdNQYQumfs
-DoCkKvbdRjyGVGjs
-EPDKjvbdmajXXoOV
-DncKjvbdIGgZxwwg
-DnbkKvbdxwiJapZk
-DoDKjvbdYqMdhleR
-EOcLKvbdZtJIxdSn
-EPDLKvbdTIzKRABM
-EPDKjvbdCEPaWJlf
-EOcLKvbdjgflFfOL
-EPCjjvbdZjShQGbG
-DoDLKvbdHDjvJbKK
-EOcLKvbdBiKbLIfK
-DncLKvbdiHJbxujV
-EObkKvbdKeehBaQu
-EPDLKvbdYSlBMsnx
-EObkKvbdmJDsptrB
-DoDKjvbdTkuoAvPJ
-EPDKjvbdZyEJnDLr
-EPCkKvbdZoNhddyj
-EPDKjvbdVZHsykOn
-DnbkKvbdjJegjNYS
-DoDLKvbdtcCtwVno
-EOcKjvbdkIHLefOL
-EOcKjvbdYkqdTnLm
-DnbkKvbdiZuGMQmf
-DoCjjvbdZLrDsnLm
-DoCjjvbdDwwktTsl
-EObjjvbdRzKHrbvA
-DoDKjvbdQlwaxnUz
-EObkKvbdyTOImRag
-EPCjjvbdQmYByOUz
-EObjjvbdbrbkUDjB
-DoDLKvbdGYtuAcwb
-DncLKvbdePFSjssr
-DoDKjvbdRbDdlIxk
-DoDKjvbdwzIGGXeS
-EPCjjvbdOTUVgEuQ
-EPCkKvbdemGWfmJk
-EOcLKvbdZQmEhmEq
-DoCjjvbdZRMeJNFR
-DoCjjvbdvBEZSoEh
-DncLKvbdhlFDnVDZ
-DoCjjvbdJJdAKPfd
-EObjjvbdyYJKCQZk
-EObjjvbdRzKITCvA
-EPCjjvbdUMVnaWPJ
-DoCjjvbdNddThhjd
-EOcKjvbdNPwpvOHT
-DnbjjvbdZisHpHCG
-EObkKvbdGLFScINV
-EOcLKvbdbsDLTdJa
-EObjjvbdbhlijfWx
-DoDLKvbdVZHszLPO
-EObjjvbdZnnJFEyj
-DoDKjvbdeOeSkTtS
-DoDLKvbdkCkjpgUg
-EPCjjvbdFejRnJUR
-DoCjjvbdZsiIyDrn
-DoDLKvbdtunYJqTA
-DnbkKvbdoznELXoA
-DoCjjvbdZtIiYcsO
-EOcLKvbdGGKSOJUR
-DoCjjvbdUMWPAuni
-DnbkKvbdEPDKkWbd
-EPCkKvbdUxhTzLPO
-DoDKjvbdGdKvKBij
-DncKjvbdmSZUzSci
-EPCjjvbdZjShQGaf
-DncLKvbdWRmxCElD
-EPDLKvbdqvpMDIyR
-DncKjvbdCJKakIfK
-EPDKjvbdHELWJbKK
-DoDKjvbdjlbLzFGo
-EPCjjvbdTkvPBWOi
-DoCkKvbdJvVGEFGi
-EOcLKvbdUyHszLPO
-EObjjvbdVBBpsQqy
-DnbkKvbdZdxGzhIb
-DnbjjvbdsPvOicVf
-DoDKjvbdtcCtwWPP
-EOcLKvbdwtmFRYkn
-EPDKjvbdegjvSNqH
-DoDKjvbdIxUBglQp
-EOcLKvbdBcpAvKNG
-DnbjjvbdwXMAvAvV
-DnbkKvbddoEsLUUS
-DncKjvbdCIkCKiGK
-DoDKjvbdlZTSTYft
-EPCjjvbddoEsKtTr
-EObjjvbdFfJrOJTq
-EPDLKvbdliDsqVSB
-DncLKvbdbUagXjtI
-EObkKvbdIsYaSlxM
-EPCjjvbdHkaznXRL
-DnbkKvbdxUmFQyMO
-DoCjjvbdWWiXvDdg
-EPCjjvbdSQUHKFcw
-EPDLKvbdjKGIJlwr
-EOcKjvbdXFxytAOs
-DncKjvbdmbKWwoNu
-EObjjvbdiZuFkpmf
-DoCjjvbdFyVVBDwb
-DnbjjvbdeqaWzlDP
-EPCjjvbdRyjHsDWA
-DnbkKvbdqlzJyMHi
-DnbkKvbdZRNFImFR
-DoCkKvbdYfwEAPSi
-DoCjjvbdOAIrsjSA
-EPCkKvbdaNLCTVMg
-DnbjjvbdqceIomvB
-DnbjjvbdsCFlkgLZ
-DoDLKvbdmIdURUqa
-EOcKjvbdZshhxcrn
-DoDKjvbdZjTIPgCG
-DncKjvbdemGWfmJk
-DnbjjvbdACqxKZiQ
-EObkKvbdkVvnEBxX
-DncLKvbdUtNTfMWK
-EPDLKvbduaDxsPFI
-EObkKvbdgQBzvcxI
-EObkKvbdSZihTDWA
-EOcLKvbdqYnggREY
-EPDKjvbdqiAJdmPF
-EOcLKvbdiGjDZVjV
-EOcLKvbdGZVVAdXb
-DoDKjvbdhfjCxuiu
-DnbkKvbduMYXBTaX
-DoCkKvbdjSziTKiz
-DoDKjvbdqlzKZMIJ
-DnbjjvbdkVwOEBxX
-DoCjjvbddtAUASmW
-DoDLKvbdzjVQQESt
-EOcLKvbdkySrSyHU
-DncLKvbdNGbolotk
-DnbjjvbddeOrBwCj
-DoDLKvbdiLdcmuDZ
-DoDKjvbdSPsfjFdX
-DoCkKvbdbUafxKtI
-DnbkKvbdcJNJkFvx
-EObjjvbdFejSNiUR
-EPDKjvbdQmYCYmtz
-DncKjvbdfVzwpJzs
-EPDKjvbdWRmwbEkc
-DncLKvbdFkEsDIMu
-DoCjjvbdQccBPqES
-EObkKvbdKCibpjCx
-EOcKjvbdLBLHNBwq
-DoCkKvbdUMWOaVoJ
-DoCjjvbdrbFmMGjy
-EOcLKvbdJvVFdEgJ
-EPCkKvbdjhHMGFnL
-DncKjvbdNxOuzcmt
-EPDKjvbdEXxLstUM
-DoDKjvbdwygfGXeS
-EObkKvbdyTNiMrBg
-DncKjvbdlZSrSxgU
-EPDKjvbdJXtCHlQp
-EPCkKvbddndsLTsr
-EObjjvbdNdcshhkE
-DncLKvbdSCDeLhyL
-DncLKvbdNsTvHEuQ
-EOcKjvbdACqxKZiQ
-DoCjjvbdptTgRqjt
-EPDKjvbdOEdTiJLE
-DoDKjvbdrpVoKCvG
-DnbjjvbdFjeSbhNV
-EPCjjvbdNGbolouL
-EPDLKvbdrEFIonVa
-DnbkKvbdOFDsiIjd
-DoCkKvbdTqQoUuIN
-EPDKjvbdeOdsKtTr
-DncKjvbdyNrhXsIc
-EPDKjvbdnQZxujyC
-EPCkKvbdYqMdhmFR
-DncLKvbddeOrBvbj
-DoCjjvbdLGFgbApu
-DoCjjvbdemFwHMik
-DoCkKvbdRXOEClHc
-DoCkKvbdZQmEiNFR
-EPCjjvbdEASIlzXX
-DnbkKvbdrWokbiZR
-EObkKvbdHELWKBij
-DnbkKvbdbUagXkUI
-EOcKjvbdbsDLUDia
-EOcLKvbdUWLojUAq
-DnbjjvbdQvmccMID
-DoDKjvbdZxcjODMS
-EPDKjvbdTulPjUBR
-DncLKvbdjSzhsKiz
-EOcKjvbdTAFJICOd
-DnbkKvbdKNADzHVB
-DoCjjvbdliDtRVSB
-EObjjvbdWXIxVceH
-EPCjjvbdfHkWRnQg
-EObkKvbdjAQGaPgK
-EObkKvbdkClLRGuH
-DncLKvbdZnnIdeZj
-EObjjvbdlYsRsYgU
-DoDLKvbdpyPHgQcx
-DnbjjvbdnPyyWKyC
-EObjjvbdQwNcblID
-DnbjjvbdCJKajhfK
-EPDKjvbdiHKCyWKV
-EObjjvbdeEoRavbj
-EOcKjvbdmaivwnnV
-EOcKjvbdwNWANDeN
-EPDKjvbdTAFIhCPE
-DoCjjvbdZQleJMeR
-EPDKjvbdmtuZjiqf
-DnbkKvbdEPCkLXCd
-EObkKvbdqGEEsvBI
-EOcKjvbdmIdTqVSB
-EObjjvbdJTZBSlwl
-EPCjjvbdqlzKZMIJ
-EPDKjvbduCbtwWOo
-EPDLKvbdnPzYukYb
-EPDKjvbdeFPSBvbj
-EPDLKvbdHEKvKCJj
-EPDKjvbdVUNUGLuj
-EOcLKvbdJuuGEEgJ
-EOcKjvbdzQnmJKXA
-EOcLKvbdrbGMkfjy
-DnbjjvbdUsltFkuj
-DnbkKvbdDxYMUUUM
-DnbjjvbdUQpoUuHm
-EPDKjvbdRbDdlJZL
-DncLKvbdmgFXlmfy
-EPCjjvbdJbibqJcY
-DoCjjvbdEPDLLWcE
-DoDLKvbdMJCMRYAS
-DoCkKvbdQZNAGsSK
-EObjjvbdiCPDFXQq
-EOcLKvbdVwJXvEEg
-DoDLKvbdsrqsYzFD
-DncLKvbdjuvnDbXw
-EPDKjvbdhgKCyWKV
-DoDLKvbdNdctIiKd
-EObkKvbduaEYrneI
-DoCkKvbdNVSrKmAX
-DncKjvbdXnRAXtvU
-DoDKjvbdhkddNtcZ
-DoCkKvbdiBnbdwQq
-DnbkKvbdLBLGlawq
-DoDKjvbdygZMANEw
-DnbkKvbdZsiIxcsO
-EObjjvbdiBoDEwRR
-DoCjjvbdHbLzEzAD
-EPCkKvbdjbkkQgVH
-EOcLKvbdsBemLgLZ
-EOcLKvbdptUGrRkU
-EPCjjvbdznpQdbkx
-DoDKjvbdGYtuAdXb
-EOcKjvbdzjUpQETU
-EOcLKvbdypoNIjXA
-DnbkKvbdSQUHJfDw
-EPCkKvbdbsCjtEKB
-DoDLKvbdajlFoODA
-DoDKjvbdelevfmKL
-DnbkKvbdCTAbsfWr
-DoDKjvbdjhGlGGNk
-DoCkKvbddCTMrATm
-EPDLKvbdaMjbSuMg
-DoCkKvbdKaLHNCYR
-DncLKvbdGGKSNiTq
-DoCjjvbdLZRJrztf
-EPDLKvbdjlakyeGo
-EObkKvbdwuMdpyLn
-DnbkKvbdegjuqnQg
-EPDKjvbdtTSTYydc
-EObkKvbdZyDjOClS
-DnbkKvbdqGEEtWAh
-EOcLKvbdKQydoFnF
-EPDLKvbdqUTgSSKt
-DnbjjvbdMJCMQxAS
-EPCkKvbdiMFDnUby
-EOcKjvbdfpBzwEXh
-DoCkKvbdSBceMIxk
-EObjjvbdfMevgMik
-EPCjjvbdjAQHAofj
-EPCjjvbdZLrETnMN
-EObkKvbdDoDLLXCd
-DncLKvbdSZjHsDWA
-DnbjjvbdOStVgFVQ
-EObkKvbdbhlijfXY
-DnbkKvbdjEjftoAO
-DoCjjvbdeEnrCXDK
-EOcLKvbdZyEKNcMS
-EPDKjvbdWSNwadkc
-EPCjjvbdkDLjqHUg
-DoCkKvbdSCEFLiYk
-DncKjvbdtkwwBTaX
-EPDKjvbdCTAbsevr
-DncLKvbdmfdwlnGy
-DncLKvbdTukpJtBR
-DoCjjvbdlYrrTZGt
-EOcKjvbdnCKWwoOV
-DncKjvbdMgColpVL
-EPDLKvbddwytURez
-DoCkKvbdakLenmcA
-EPCkKvbdQvmdCkhD
-DncLKvbdEARhlzWw
-EOcLKvbdrXQMDJYq
-EObkKvbdmJETptrB
-EOcKjvbdAMgxsXZx
-EPDKjvbdULvPBVni
-DoDKjvbdqGEFTvAh
-DoDKjvbdGLFTChMu
-DoCjjvbdLBKgNCXq
-DoCjjvbdOEcsiJLE
-EObjjvbdSLZFuHKs
-DoCjjvbdtkxXAsaX
-DnbjjvbdNGbpNQVL
-EOcLKvbdiLeEOUby
-EObjjvbdDoCjjwDE
-EPCkKvbdxrnJMrCH
-EPDKjvbdJTZBTMwl
-DncKjvbdBcpBWJlf
-DncLKvbdGKdsDHmV
-DncLKvbdDwwlUUTl
-EPDLKvbdbQHHELzd
-EPDLKvbdYlSEUOLm
-EObjjvbdhtyeXSUb
-EPCjjvbdACqxKZiQ
-EObjjvbdrDdiPmua
-EPCkKvbdcyxpYYqC
-EPDKjvbdrXQLbiZR
-DncKjvbdjmBlZeHP
-DncKjvbdlYrrTYft
-EObkKvbdaaWFFpPw
-DncKjvbdwyhGFwdr
-EPCkKvbduLxXAtBX
-EObjjvbdhancEvpq
-DncLKvbdbiMjKevx
-DncKjvbdTIyjRABM
-DoCkKvbdcImKLFvx
-DnbkKvbdZjSgpHBf
-EPCkKvbdGdKvJbJj
-EOcLKvbdSCDeMIyL
-EOcKjvbdZxdJnClS
-EOcLKvbdHDkVibJj
-DoDKjvbdezuxeJTw
-EOcKjvbdqFceUVaI
-EPDKjvbdWIYWXfxz
-DoDKjvbdNQXqWOHT
-DnbkKvbdOStWHEtp
-EPDKjvbdLAkGmBxR
-EPDKjvbdDxXksssl
-EPCkKvbdTqRPVUgm
-DoDLKvbdrDdhomvB
-DncLKvbdptUGrSKt
-EOcKjvbdiBnbeWqR
-DoDKjvbdezvYeJUX
-DnbkKvbdOAJStJrA
-DnbjjvbdtcCuWvPP
-DnbjjvbdIjEAKPgE
-EObkKvbdWWiXvEEg
-DnbkKvbdSBdFMJYk
-EOcKjvbdQdCaQQcr
-EPDLKvbdLZRKSzuG
-DoCkKvbdpfEFTuaI
-DnbkKvbdVBBqSqRy
-DncLKvbdMoxRVnGs
-EOcLKvbduoTzqKnt
-DoCjjvbdxxJKCPyk
-DncLKvbdVvhwvEFH
-EPDLKvbdOYPVzcnU
-EOcLKvbdBdPaWJlf
-DnbkKvbdJSyAsMwl
-DoCkKvbdYTLaMsnx
-EOcKjvbdUWLpJsaR
-DoCjjvbdhbOcEwRR
-DncKjvbdKfGHbAqV
-DoCjjvbdlZTSSyGt
-DncLKvbdatbGxLTh
-EPDLKvbdiGicYvKV
-EOcLKvbdTIyjRAAl
-EPDKjvbdZsiIyDsO
-DnbjjvbdZLqcsmlN
-EOcLKvbdeOeTLTtS
-DncKjvbdQdCaPqDr
-EPCjjvbdUGznLvvF
-EObkKvbdrDdhpNvB
-EPDLKvbdRadFLhxk
-DnbjjvbdhytelQmf
-EPDKjvbdFkFSbhNV
-DoDKjvbdaSGDHsek
-EObkKvbdzHYlAMdw
-DnbjjvbdliDsptrB
-EPCkKvbdYlSDtNlN
-DoDKjvbdnPyxujxb
-EObjjvbdRkYfVGjs
-EPCjjvbdRaceMJZL
-EOcLKvbdnUuZkJrG
-DncKjvbdOYOuzdNt
-DoCkKvbdJbjDQicY
-DnbjjvbdRyjHsCvA
-EOcLKvbdUGzmlXVe
-EPCjjvbdMoxRWOGs
-DncKjvbdlrZUzTEJ
-DoCjjvbdJYUBgkpp
-EOcLKvbdACrXizJQ
-EPDKjvbdsCGMkfkZ
-DncKjvbdqYnhGqEY
-DncLKvbdjgflFemk
-DncKjvbdrzMQTAgn
-DoCjjvbdlZTSSxgU
-EPDLKvbdKCibqKCx
-EOcLKvbdmJDtQuSB
-DncLKvbdQcbaPqES
-DoCjjvbdOXoVzdNt
-EObkKvbdbsCjsdKB
-EPDKjvbdySmiMqbH
-DoCjjvbdrMzKZLhJ
-DncKjvbdtAGqIAAr
-EPCjjvbdEXxMTtUM
-EOcKjvbdVrOYBdkc
-DoDKjvbdzROlhiwA
-DncKjvbdqTtHRrLU
-DnbkKvbdiUzEwSUb
-DoCkKvbdZLqcsnMN
-DnbjjvbdUaBqTRRy
-DoDKjvbdRosgKGEX
-EObkKvbdShzKRABM
-DoDLKvbdqZOhHRDx
-EPDLKvbdiUzFWqtb
-DoCkKvbdZyEJmbkr
-DncKjvbdREDBPpdS
-EPCjjvbdMSWmZtpz
-EPDLKvbdTAEiHaoE
-DoDKjvbdNeETiIjd
-EOcLKvbdqdFJPmua
-DoCkKvbdRpTfjFcw
-DncLKvbdznoqEcMY
-DoCkKvbdFfJqmiUR
-EOcLKvbdSPsfifEX
-DnbjjvbdtunYJpsA
-EPDKjvbdqcdiQOVa
-DnbkKvbdeXyssrFz
-EPDLKvbdQYmAGrqj
-EObjjvbdegjuqmpg
-EOcLKvbdbLLenmcA
-EOcLKvbdpyPHgREY
-DoDKjvbdZRMdhmEq
-DncLKvbddZxoxZRC
-EOcKjvbdKxpjSztf
-EPDKjvbdKkBHvAJy
-EObkKvbdnBiwYOnV
-EObkKvbdrWolDJYq
-DoCkKvbdZyEJmbkr
-DoDKjvbdkDMLRHUg
-EPCjjvbdQwNccMID
-DncKjvbdSZihSbvA
-DncLKvbdnHFXmNgZ
-DncKjvbdGKeSbhMu
-DncLKvbdULvPAuoJ
-EOcLKvbdYqNFJMeR
-DoDLKvbdMfcPmQVL
-EPDKjvbdFpATWgGZ
-EObjjvbdeqaWzkbo
-EOcKjvbdZoNhddzK
-EObjjvbdFeiqmiTq
-DoDKjvbdauBfwjsh
-EOcLKvbdBraDUFvr
-DoDLKvbdyYIjCPzL
-DnbjjvbdmRxuZsEJ
-EObjjvbdMfcQMpUk
-EOcKjvbdyNsIXrhc
-EPDKjvbdREDBPpcr
-EPCjjvbdRkYeuGkT
-EPCkKvbdtAHRIAAr
-DnbkKvbdxUmFQxkn
-EObkKvbdtTSTZZdc
-EOcKjvbdmIdUQtqa
-EOcKjvbdXrkaNUPY
-DoDKjvbdCWzdIePv
-DoDKjvbdbBVdfQPw
-EPCjjvbdZyEJmblS
-DncKjvbdlZTRrxft
-EPDLKvbdIxUCIMQp
-DnbjjvbdKyRKSztf
-EOcKjvbdNeEUIhjd
-EOcLKvbdjKGIJmXr
-DoDLKvbdCEPaVimG
-EPCkKvbdOFDsiIkE
-EOcLKvbdehKvSORH
-DoDKjvbdwWkaWAuu
-EPDKjvbdpxoHfpcx
-EPDKjvbdJbjCqJbx
-DncKjvbdZtJJZETO
-EPDLKvbdsZkpTBHn
-EPCkKvbdTlWPAuoJ
-DoCjjvbdjggMFfOL
-DoDKjvbdfMewGlik
-EPDLKvbdnBivwoOV
-DoCjjvbdwuNEpxkn
-DnbkKvbdiifIKNYS
-EOcKjvbdKVuFdFGi
-EPCjjvbdZdxGzgiC
-EOcLKvbduaDxsPEh
-EPCkKvbdRotHJfEX
-DncLKvbdCIjajhej
-DoCkKvbdcImJjfWx
-EOcLKvbdKVtecdgJ
-DoCjjvbdeFOrBwCj
-EPDKjvbdqvpLcIxq
-EObjjvbdEARiMyvw
-DncKjvbdbUafxLTh
-DncLKvbdLAkGmCYR
-DoDKjvbdxVMdqYkn
-EPDKjvbdWWiYWDdg
-EObkKvbdKDJbpjCx
-DoCkKvbdnPyxvKyC
-DoCkKvbdZsiJYcsO
-EObkKvbdJpzFOeme
-EOcLKvbdOSsufeUp
-DoDLKvbdTfznMWvF
-EPDLKvbdfNFwGlik
-EPDLKvbdCDpAuilf
-EPDKjvbdbiMikGWx
-DoCkKvbdrbGMkfjy
-DoCjjvbdWIXuxHYz
-EPDKjvbdGFiqnIsq
-EPDLKvbdNGbpMpVL
-EOcLKvbdtSrTYyeD
-DoDKjvbdjJfHjNXr
-EPCkKvbdzitpPcrt
-DoDLKvbdxmrgxSiD
-EPDLKvbdcJNKLFvx
-EPDLKvbdsrrSxydc
-DnbkKvbdqceIonWB
-EPCkKvbdZnnIddzK
-DoCjjvbdLYpirztf
-EPCjjvbdLrWlzUpz
-DnbjjvbdRkZGVGjs
-EObjjvbdnBivxOmu
-DoCjjvbdmIdUQuSB
-EObkKvbdtcCtvuoP
-DnbjjvbdANIYrvzY
-DncKjvbdmaivwoNu
-EOcLKvbdrouoJcWG
-DoDLKvbdTppoVVIN
-DoDLKvbdVUMtFkuj
-DncLKvbdznpQdblY
-DncKjvbdEPCkLXDE
-EOcLKvbdfHkVqmqH
-EPDKjvbdapGgDkzd
-EPCjjvbdSPsfifDw
-DoDLKvbdGKeTDINV
-EObjjvbdyqPNIjXA
-EPCjjvbdatbGwkUI
-DoCjjvbdCTAcTewS
-DnbjjvbdxnTIXsJD
-EOcKjvbdbKlFnnDA
-DncKjvbdjJegjNXr
-EObjjvbdMuTRkNAX
-EObkKvbdUxgsykOn
-DoCkKvbdRaceMIxk
-EPDLKvbdJbibpibx
-DoDKjvbdEztQdlCi
-EPDKjvbdcyyPwyRC
-DncKjvbdjlbMZdfo
-EPCkKvbdRXNdClID
-DncLKvbdtbbuXVoP
-DoDKjvbdieLHVPAO
-DoDKjvbdFVxopMie
-EObjjvbdzoPpdblY
-EPCjjvbdmIdUQuSB
-EPCkKvbdYkrEUNkm
-DoCkKvbdVwIxVdEg
-DoCjjvbdOSsvGdtp
-EPCjjvbdmSYtysDi
-EObkKvbdWWiYVceH
-DoDKjvbdrNZixkgi
-EPDKjvbdbVCHYKsh
-DnbkKvbdjKFgimXr
-EPDKjvbdNsUWHFUp
-EObkKvbdeAUQlwjG
-EOcKjvbdTAEiICPE
-DoCkKvbdZLqdUNkm
-EOcKjvbdZisHogCG
-EPCkKvbdKVtfEEgJ
-EObjjvbdaSGDIUGL
-EPDKjvbdZRNFIleR
-DoDKjvbdyXiJaoyk
-EObkKvbdRkYfVHKs
-DnbkKvbdLAkHNCXq
-DncKjvbdJpyePFnF
-EPCkKvbdkHgMFenL
-DoDLKvbdOFDtIhkE
-DoCkKvbdtTSTZZdc
-EOcLKvbdkClKpfuH
-DoCjjvbdBcpBVjNG
-DnbkKvbdfMfXHNJk
-DoDKjvbdBsBCtFvr
-DoCjjvbdHgGzYwwg
-DncLKvbdSwjkmzkY
-DoCkKvbdDihJuwjA
-EPDKjvbdQccBPpdS
-EPDKjvbdehLVqnQg
-DoCjjvbdmozZVkZC
-DoDLKvbdaNKasVNH
-EObkKvbdrRtkOLBN
-DoDKjvbdehLWRnRH
-EObkKvbdSCEEkiYk
-DoCjjvbdRXOEDMID
-EOcKjvbdFejRmiUR
-EOcLKvbdFkEsChNV
-DncKjvbdWWhwuceH
-EPCkKvbdNwoVzdOU
-EOcKjvbdePFSkUTr
-DoDKjvbdMRwMzUpz
-EObjjvbdLrXMzUpz
-EPDKjvbdZxdJnDLr
-EOcLKvbdrRtkNjaN
-EPCkKvbdTvLoitBR
-DncKjvbdKeehCApu
-EPDLKvbdemFvfljL
-DncLKvbdeFOqawCj
-DoDKjvbdZyEJnCkr
-DoCjjvbdlZTRsZHU
-DnbkKvbdRbDdlJZL
-DnbjjvbdYqMdiNFR
-EObjjvbdSQTfjFdX
-DoCjjvbdgFlZnGgA
-DoDLKvbdwtldqYkn
-EObkKvbdjggLfFmk
-DncLKvbdMgCpNPtk
-DncKjvbdmpZyWKxb
-EPDKjvbdVqnYBeMD
-DoDKjvbdULuoBWOi
-DncLKvbdezvZEiTw
-EPCkKvbdjblLRHUg
-EPCjjvbdBiKakJGK
-DncKjvbdTukpJtAq
-DoCkKvbdkWWnEBxX
-EPCjjvbdnPzYvLZC
-EOcLKvbdWHxVxGxz
-DncLKvbdNsUWHEtp
-EObkKvbdHDkWKBij
-EObkKvbdVAbQsQrZ
-DnbkKvbdKCibqKDY
-EObjjvbdLYqKSztf
-DoCkKvbdZLrDtOMN
-EOcKjvbdemFvgNJk
-DncLKvbdiCOcEvpq
-DnbkKvbdEXxLtTtM
-EObkKvbdFjdrbglu
-EObkKvbdmttykJrG
-DoCjjvbdePFTLUTr
-DoCkKvbdWRmwadlD
-DoDLKvbdVqmxCElD
-EPCkKvbdnBiwXoOV
-DnbjjvbdEvZQPmKF
-EObkKvbdSKyGVGkT
-EPCjjvbdauBgXkTh
-EPCjjvbdVrNxBeLc
-EObjjvbdOEcshiLE
-DoDLKvbdbLMGPNcA
-DnbkKvbddZxpYYqC
-DoCkKvbdlZTSTZHU
-EObkKvbdtlXwBTaX
-EObkKvbdHffyxwxH
-EPDKjvbdrpWOicVf
-DncKjvbdkVvmdBww
-EPDKjvbduaDySoFI
-EObkKvbdsZkosBHn
-DoDLKvbdTAFJICOd
-DnbjjvbdpstHRrLU
-DncKjvbdUQqOtuIN
-EPDKjvbdVUMtFlWK
-DoDLKvbdrouoKDVf
-DoCjjvbdmRyUysDi
-EPDKjvbdgFkzNgHA
-DnbjjvbdZshiZDsO
-DnbjjvbdIMBzmwRL
-EObjjvbdZshhxdTO
-EOcLKvbdZGwEAOri
-EPCkKvbdkHflFfOL
-DoCkKvbdKDJcQibx
-EOcLKvbdFkEsCgmV
-EPCjjvbdJutfEEgJ
-DoCkKvbdOXnuzdNt
-EPDLKvbduLwwAtAw
-DoDKjvbdqvpLbiZR
-EPCjjvbdGYuVBEXb
-EOcLKvbdCJKajhfK
-DnbjjvbdkMbLyeGo
-EPCkKvbdijGIKMwr
-DoDLKvbdJzpGXdAN
-DoDKjvbdNwnuzdOU
-EOcLKvbdtSqsYyeD
-EOcLKvbdmRxuZrdJ
-EPDKjvbdhlEcmtcZ
-DoCkKvbdbiNJjevx
-DoDKjvbdGckVibJj
-DoDLKvbdGLFSbhMu
-EPDKjvbdEObjkWbd
-EObkKvbdBhkBjiGK
-EPDKjvbdtAGqIAAr
-DoCkKvbdWRmwadkc
-EObjjvbdQdDAoqDr
-EOcLKvbdwNWANDeN
-EPCjjvbdMowqVmgT
-EPDLKvbdegkWSNpg
-EPDLKvbdjAQHAogK
-DoDLKvbdvwLaVaWV
-EPCjjvbdLGFgbBQu
-DoCjjvbdxsOJMrCH
-EObkKvbdFkFTChMu
-EObjjvbdbLLenmcA
-EPDLKvbdiCObeXRR
-EPCjjvbdhbObdvpq
-EObkKvbdVZIUZkOn
-EPDLKvbdfVzxPizs
-EPDKjvbdnPyyVjyC
-DncLKvbdRzKITCvA
-EOcLKvbdUtMsfLuj
-DncKjvbdVBBpsRRy
-DnbkKvbdzeZnzdzQ
-EOcLKvbdUtNTfMVj
-EObjjvbdqcdiQOWB
-DoCkKvbdNddTiIjd
-DncLKvbdrykosBHn
-EPDKjvbdWRnYBeLc
-DncLKvbdrXQLcIxq
-EPCkKvbdUWLpKTaR
-DoCkKvbdZRNFJMeR
-EPDLKvbdunszpjoU
-DoDKjvbdzitpPdSt
-EObkKvbdvBDxrneI
-DoDLKvbdVviXvDeH
-EPCkKvbdDihJuxKA
-EPCkKvbdNPxQunGs
-DoCjjvbdmuUzKjRf
-DnbkKvbdbPffdLzd
-DoDLKvbdXrlBNTnx
-DoDKjvbdZQmEhmFR
-EObjjvbdmttzLKRf
-DoCkKvbddijRvUzn
-EPDLKvbdHffyyYXg
-EPCkKvbdcTDKtEJa
-EPCkKvbdpecdtWAh
-DncKjvbdRjxeuGkT
-EPCjjvbdqdEhpOVa
-EPCjjvbdelfXGmJk
-EObkKvbdWWhwudFH
-EPDKjvbdhbObeXQq
-DoCkKvbdffLynHHA
-DnbjjvbdpaJFAXIE
-DoDKjvbdqZPIGpcx
-DoDLKvbdmaivxPOV
-DncKjvbdqFdEsvAh
-EPCjjvbdrpWOibvG
-EPCkKvbdyfyMAMdw
-DoDLKvbdhuZdvqtb
-DncLKvbdWRnYBeMD
-DncLKvbdDncLKvbd
-EObkKvbdhzUfLpnG
-EOcLKvbddoFSkTtS
-EPDKjvbdbKlFoODA
-DoCkKvbdRWmccLhD
-EObjjvbdeAUQlxJf
-DncLKvbdKVuGEEfi
-EObkKvbdVvhwvEEg
-EPDLKvbdhaoDEvqR
-EPDKjvbdpfEFTvBI
-EPCkKvbdyzeNrIJI
-DoDLKvbdGckViaij
-EObjjvbdnHExNNfy
-EObkKvbdZLqdUOLm
-DoDLKvbdDxXktTsl
-EObkKvbdFVxpPmKF
-DoDKjvbdNdctJJLE
-DnbkKvbdTXkMNzjx
-DncKjvbdbrbkUEKB
-DoCkKvbdGKeSbhNV
-EPDKjvbdYSkaMtOx
-EPCjjvbdiGicYujV
-EObjjvbdnHFXmOGy
-DoDKjvbdZyDjNblS
-EOcLKvbdGYtuBEXb
-DnbjjvbdqGDeUWAh
-DnbkKvbdTppnuVHm
-EOcLKvbdPyNAGsRj
-EPCkKvbdIrxaSlxM
-DncKjvbdCfkfHAzc
-DnbkKvbdIHHZxxXg
-EPCjjvbdjKFhKMxS
-EOcKjvbdehKvRnRH
-EObjjvbdxVMdpyMO
-DnbjjvbdSLYetgKs
-EObkKvbdRjyGUfkT
-DoCjjvbdwyhFeweS
-DncLKvbdrJAKElne
-EPCjjvbdiGjCxvKV
-EPCjjvbdCIjajiFj
-DoDLKvbdunszqLPU
-DnbjjvbdySmhlrCH
-DnbkKvbdnBjWxPNu
-DoDKjvbdlhdTqUrB
-DoCjjvbdGdKvJajK
-EObjjvbdkySqryHU
-EPCjjvbdYkqdTmkm
-EObkKvbdDnbjkXDE
-EPDKjvbdKDKCqKDY
-EOcLKvbdeYZstSFz
-EPDKjvbdZyDjNbkr
-DncLKvbdPyNAGrrK
-DoCkKvbdTlVoAuni
-DncKjvbdEPCkKvbd
-EPCkKvbdcTCkTcjB
-DnbkKvbdcJNKLGXY
-DnbjjvbdRkYfVHKs
-DoDLKvbdaaWEfQQX
-EPDKjvbdmbJvwnmu
-EOcLKvbdZyDimcMS
-DoDLKvbdYkrEUNkm
-DoDKjvbdmaivwnmu
-DoDLKvbdqYoIHQcx
-EPDKjvbdLrWlyuQz
-DncLKvbdkCkkQgVH
-EObjjvbdrXPlChyR
-DoCjjvbdJTYaTMwl
-EPCkKvbdNsTvHFVQ
-DnbjjvbdeEnqavcK
-EPCjjvbdVvhwuceH
-EPCkKvbdbLMFoODA
-EPDLKvbdCIkCLIfK
-DoDLKvbdbLLennDA
-DncLKvbdyNrhYTIc
-EPDLKvbdNHCpNQUk
-DnbkKvbddndsLUTr
-DncKjvbdaogHDkzd
-EPDLKvbdZjSgpGbG
-DnbjjvbdaSGDIUGL
-EPCkKvbdjhGlFfNk
-EPDLKvbdbKkenmcA
-EOcKjvbdIHHZyXxH
-DoCjjvbdiUydwRtb
-EPDLKvbdauBgYKtI
-EPDLKvbdZMSDsmlN
-DoDKjvbddneSjtTr
-EPCjjvbdJbibqJbx
-DnbjjvbdGYtuAcwb
-DoDLKvbdsQVoJbvG
-DoCkKvbdxmrhXsIc
-DoCjjvbdyNsHwsJD
-DoCkKvbdKWVFceGi
-DoDLKvbdsBfNMGkZ
-DnbkKvbdJzoewdAN
-EPDKjvbdwzHefYFS
-DnbjjvbdBiKbKhej
-EOcKjvbdjuvmdCXw
-EOcKjvbdbhmKKevx
-DoCjjvbdehLWRmpg
-EPCjjvbdACrYJzJQ
-EOcKjvbdhuZeXSUb
-DoCkKvbdJcJbqJcY
-EPDKjvbdYqMeJNEq
-DncLKvbdmJDtRUqa
-EPDKjvbdnBjWxOnV
-DoDLKvbdOEctJIkE
-DoCjjvbdDxYLtTtM
-EOcLKvbdZnnJFFZj
-EOcKjvbdKRZeOfNe
-DoCjjvbdTukpJtAq
-DoDKjvbdhyuGLpnG
-DoDKjvbdhtzFWrUb
-DnbkKvbdQccBQRDr
-EPCjjvbdTukojUBR
-EPDKjvbdeKKRvUzn
-EOcLKvbdeXzTtSFz
-DncKjvbdyTOJNSCH
-EObkKvbdjmBkydfo
-EPCjjvbdelevflik
-DoDKjvbdZtJIxcrn
-DoDKjvbdqiAJeNOe
-DoCjjvbdddnqavbj
-DoCjjvbdZLrDtOMN
-EPDKjvbdZyEKNcLr
-EObkKvbdMgDPmQVL
-EPCjjvbdxrmiMrBg
-EObjjvbdZGvdAPSi
-EPCkKvbdvvkaWBWV
-DncKjvbdfMewHNJk
-DoCjjvbdlrYtyrdJ
-DncLKvbdiLeDnVCy
-DnbjjvbdvwLaWBWV
-EOcLKvbdVBCRSprZ
-DoDLKvbdYzbfSKVy
-DnbkKvbdXrlBNUPY
-EObjjvbdKfFhCAqV
-DoCkKvbdVTmTekvK
-EPDLKvbdaSGChTfL
-DncLKvbdauCGwjsh
-EObjjvbdBcpBWJlf
-DnbjjvbdZjTIQHCG
-DoCkKvbdDjHiuxKA
-EObkKvbdZxdKNblS
-DoDLKvbdptTfrRjt
-DoDLKvbdJbjCqKDY
-EOcKjvbdEJhKWYKA
-DnbkKvbdssSSyZeD
-EOcLKvbdZshhyESn
-EPDKjvbdRjxfUgKs
-DncKjvbdwygefYEr
-EPCkKvbdiLeEOVCy
-DnbkKvbdTvLojTaR
-DoCkKvbdzdzOzdyp
-EPDKjvbdVUNUGMWK
-EObjjvbdqdEhonVa
-EPDKjvbdKefHbAqV
-DncKjvbdtSqsYzFD
-DoDLKvbdZjTIPgBf
-EPCkKvbdRjyFuHLT
-EOcKjvbdUtMsfLvK
-DoCjjvbdnHEwlnGy
-DnbjjvbdURQnttgm
-DoCkKvbdFfJrOIsq
-DoDLKvbdjKGIKMwr
-EOcKjvbdTAEiIBnd
-EPDLKvbdFxttaEXb
-DoDKjvbdJTZAsNYM
-EPCkKvbdFejSNhtR
-EPDKjvbdwkXEHzyf
-DnbjjvbdbUafxLTh
-DoCkKvbdZQleJNEq
-EPCjjvbdmpZyVkZC
-DnbjjvbdmJEUQuRa
-EObkKvbdrEFIpNua
-EOcLKvbdJpzEnfNe
-DnbjjvbdyTNiMqag
-EObjjvbdNQYQvOHT
-EPDKjvbdGKdrbgmV
-EOcLKvbdCJKakIej
-DncLKvbdlhcsptrB
-DnbjjvbdZirhPfaf
-DncKjvbdZoNiFFZj
-EOcLKvbdjuwNcaww
-EOcKjvbdUyITzLPO
-DnbjjvbdxVMdpyLn
-EObjjvbdnCJwXnnV
-EPCjjvbdIMBznWqL
-EObkKvbdJpzFOenF
-EObjjvbdlhdTpuRa
-DncLKvbdSCDdkiZL
-EObjjvbdZxcimcMS
-EOcKjvbdxVMdqZLn
-DoCkKvbdrJAKFMne
-EObjjvbdXsMAmUPY
-EObjjvbdeFOqbWbj
-DncKjvbdCTBCsfWr
-DoCjjvbdRyjHsCvA
-EPDKjvbdziuQQDrt
-EOcLKvbdziuPocrt
-EPCkKvbdWWhwvEEg
-EPCkKvbdeEoRavcK
-EPCjjvbdSKyFuGkT
-EPCjjvbdrEFIonWB
-EObjjvbdrEFIpOVa
-DncKjvbdzGyMANEw
-EPDKjvbdrRtjmjaN
-DoCkKvbdJbjDRKDY
-EObkKvbdfNFvgNKL
-DnbkKvbdZHWdAPTJ
-EPCjjvbdCDoaWKMf
-DncLKvbdJKEAKPgE
-DnbjjvbdssSTYydc
-EOcKjvbdIsYaTNYM
-EPCkKvbdgPazvcxI
-DoCjjvbdmozYvLYb
-DnbkKvbdeATqNYKG
-EObjjvbdIwsbIMQp
-EPDLKvbdpssfrSKt
-EPCkKvbdhzUfLpmf
-EOcKjvbdNGcPlpUk
-DncLKvbdhkeEOVDZ
-EPDKjvbdLFfIBaRV
-EPCkKvbdJuuGEFGi
-EOcKjvbdRacdlJYk
-EPCjjvbdmbKWxOmu
-EPDLKvbdwtmFQxkn
-DnbjjvbdgvyAzzAJ
-EPDKjvbdNrsugFVQ
-DncKjvbdmttzLKRf
-DnbkKvbdZyEKNcLr
-EObkKvbdxrmiNRag
-DoDLKvbdiMFDnVCy
-EObjjvbdWSNxBdlD
-DnbkKvbdCTBDUFwS
-DoDKjvbdYTLaMtPY
-EOcLKvbdZtIiZDrn
-EObjjvbdYzcGSJvZ
-EObkKvbdCSaDUFvr
-DoCjjvbdTppnuUgm
-DoCkKvbdOTUVfduQ
-EOcLKvbdfpBzwDwh
-DncKjvbdGBPQyJzm
-EPCjjvbdVZITyjnn
-EObkKvbdVhXuxGxz
-EObjjvbdiifHimXr
-EPDKjvbdvwMAvAvV
-EOcKjvbdkWXODbYX
-DoDKjvbdmbKXXnnV
-DoDLKvbdZsiJZDrn
-DoCkKvbdlrZUzTDi
-DoDKjvbdSQTfjGEX
-EOcKjvbdqcdiPnWB
-EOcLKvbdpssgSSKt
-EPDLKvbdhkeENuCy
-EPDKjvbdZQmEhmEq
-DoDKjvbdZtJIxcrn
-DncLKvbdhgJbxujV
-DoCkKvbdDoDKkXCd
-EObkKvbdZGvdAOsJ
-EObkKvbdwjvdHzyf
-EPCjjvbdUQpoUuHm
-EPDKjvbdUGznMXVe
-DnbjjvbduaEYroFI
-DoDLKvbdehLWRnRH
-DoDLKvbdgQBzwEYI
-EObkKvbdbUagYKsh
-EObjjvbdyqPMhiwA
-EPDKjvbdvvkaWBWV
-DnbkKvbdJTYaTNYM
-DoDKjvbdZtIhxdSn
-EOcLKvbduaEZTOdh
-EObjjvbdkNCMZeGo
-EPCjjvbdZLqdTnLm
-DoCkKvbdUsltFkuj
-DncKjvbdnPyyVkZC
-DoDLKvbdwjvdHzzG
-EPCkKvbdGKdsCgmV
-DnbjjvbdiMFDmtby
-EObjjvbddneSjtUS
-DncLKvbdezvZFJUX
-EPCjjvbdhbOcFWqR
-DoCkKvbdaMjbTVMg
-DoDLKvbdHDjvKCJj
-EOcLKvbdpxoIHRDx
-DoDKjvbdZshhxcrn
-EOcLKvbdcJNKKewY
-EObjjvbdTppntuHm
-EPCjjvbdemGWfmJk
-DoCkKvbdjcLkQftg
-EObkKvbdQwODbkgc
-EPDLKvbdCTAcUFwS
-DnbjjvbdvOszpkPU
-EOcKjvbdkClLRHUg
-EOcLKvbdNHCpMpVL
-EObjjvbdZMRcsnMN
-DoCjjvbdpxnggQcx
-EOcKjvbdyTOJNRbH
-EPDKjvbdeKKRutzn
-DncKjvbdrzLosAgn
-EPDKjvbdYzcGRjWZ
-EPDKjvbdQcbaPpdS
-DnbkKvbdtkxXAsaX
-DncKjvbdCDpAvKMf
-EPDKjvbdHEKvKBjK
-EOcKjvbdfpBzvdYI
-DncLKvbdiifIJmYS
-EPDLKvbddeOqbWbj
-DnbkKvbdZyDinDMS
-DoDLKvbdkNCLydgP
-EOcLKvbddePSCWbj
-DnbkKvbdZxcjNcMS
-DoCjjvbdQwNccMID
-EPDLKvbdiiehKMwr
-EOcLKvbdCTBDUFwS
-EPDLKvbdbLMGOnDA
-EOcLKvbdUMWOaVni
-DnbjjvbdyqPMhjXA
-DncKjvbdCTAbsewS
-DncKjvbdMpYQvOHT
-EPDKjvbdTqRPVVIN
-DoCjjvbdZxdJnClS
-DoCjjvbdWSNwbElD
-DnbkKvbdrWokcIxq
-EObkKvbdWIYWXgYz
-EPDKjvbdzitopDsU
-EObjjvbdUVkojUBR
-EPDLKvbdEObkLXCd
-EOcKjvbdrbFmMHKy
-DnbjjvbdehKuqmpg
-EOcLKvbdZshiYcrn
-DoCjjvbdZnnIdeZj
-EOcLKvbdmttzLKRf
-EObjjvbdGZUuBDwb
-DoCjjvbdHDjvJaij
-DnbjjvbdKQzFPGNe
-DncKjvbdRbDeMJYk
-DoCjjvbdezuyEhsw
-DoDKjvbdwkWdHzzG
-DncKjvbdEASJMyvw
-DncLKvbdyfyMANEw
-EPCjjvbdCSaDTfXS
-EOcKjvbdCJKajiGK
-EObjjvbdrJAKFNOe
-DnbjjvbdFWZPoljF
-DnbjjvbdmpZyVjyC
-EPDKjvbdiifIKNYS
-DncKjvbdGAnqYizm
-EOcKjvbdiMFEOVDZ
-DnbjjvbdJXtBglRQ
-DoCkKvbdijGHilwr
-DoCjjvbdDwxMUUUM
-DoDLKvbdUMWPBVni
-EPCjjvbdDwwksssl
-DnbkKvbdNeDshhkE
-EObkKvbdbAudfQQX
-DnbkKvbdwuMdqZLn
-DnbjjvbdijGHjNXr
-EPCjjvbdOFETiIkE
-DoCjjvbdxsOImSCH
-DoCkKvbdLiBkqYAS
-DncKjvbdFkFTDHmV
-DoCjjvbddoErjstS
-EObjjvbdyOTIXsIc
-DncKjvbdeXzTtSFz
-DoCjjvbdqdFIonWB
-EPDLKvbdMpYRWNgT
-DoDLKvbdfNGXHNJk
-EPCjjvbdePErkTsr
-DoCjjvbdNHCpNQVL
-EObjjvbdsQVnjCuf
-DnbjjvbdtcDUwWPP
-DoCjjvbduaDySndh
-EPDKjvbdqZPIGqDx
-EObjjvbdijFgimYS
-DncKjvbdZyEJmblS
-DoDKjvbdirziSkJz
-DncLKvbdeOeTKtTr
-EOcKjvbdfpBzwEYI
-DnbkKvbdezvZFItX
-EPCjjvbdrRuLOKaN
-DncLKvbdbrbjscjB
-EObkKvbddBrlrAUN
-EPDKjvbdZoOIdeZj
-EOcKjvbdGYuUaEYC
-EPCkKvbdNxPVzdNt
-EOcLKvbdhlFDmuDZ
-DncKjvbdKVtecdgJ
-EPDLKvbdqlzJxkhJ
-EOcKjvbdySmhlqbH
-EPCkKvbdxsNiNRag
-EPDKjvbdTYKkmzjx
-EObkKvbdIryBTMxM
-EPDLKvbdxnShXsIc
-EPCjjvbdaSFbhUGL
-EObjjvbdRDbaQQdS
-EObkKvbdrbFmMGkZ
-EPCkKvbdWXJXudEg
-EOcLKvbdcJNKKfXY
-DncKjvbdEuxpPljF
-DncKjvbddCTNSATm
-EOcLKvbdFVyQPmKF
-EPCkKvbdpeceUWBI
-DoDLKvbdVTmUGMWK
-DoCjjvbdFyVVBEXb
-EOcLKvbdTukpKTaR
-DncLKvbdDHLegAzc
-EPCjjvbddxZtTrFz
-DncKjvbdssRsZZeD
-DoDKjvbdeOeSjstS
-DoDKjvbdQdDApQcr
-DncLKvbdURQoUuIN
-DnbkKvbdezuxdiUX
-EPCjjvbdbPgHDkzd
-EOcKjvbdFWZQQMjF
-DoDKjvbdMfcQMotk
-EPCjjvbdrWokbiYq
-DoDKjvbdnGdwmOGy
-EOcKjvbdnBjXYOmu
-EOcLKvbdDoCjjvbd
-DoDLKvbdsQVoJbuf
-EObkKvbdZirhQHBf
-EPCkKvbdIGgZxwwg
-DncLKvbdrMzKZMIJ
-DnbkKvbdkHflFemk
-EObkKvbdfHkWSORH
-DnbkKvbdwygfGYEr
-EOcKjvbdxmrgxTJD
-DnbjjvbdGdLViaij
-DoDKjvbdmSYtysEJ
-EObkKvbdfILVqmpg
-DncLKvbdADSXizIp
-DoCjjvbdznpQdbkx
-DncLKvbdmbKWxOnV
-EPCkKvbdJvUfEEfi
-EOcLKvbdcScLTdJa
-DnbjjvbdQcbaPpdS
-EPDKjvbdDoDKjvcE
-DncKjvbdhzUfMROG
-DncKjvbdbrcKtDia
-EOcLKvbdJpydoFme
-DnbjjvbdxLWdHzyf
-EPCjjvbdwuMeQyMO
-EOcLKvbdiifHimXr
-EOcLKvbdySmiNSCH
-EPCjjvbdznopeCkx
-EPDLKvbdZshhyESn
-DoDLKvbdrDeJQNvB
-DoDLKvbdILaznXQk
-DoCjjvbdnUtzKiqf
-DnbkKvbdjJehKMwr
-EOcLKvbdDxXlUUUM
-DoCkKvbdtSqsYyeD
-DoDKjvbdxVMeQxlO
-EPDLKvbdZjTHofaf
-EObkKvbdZisHogBf
-DnbkKvbdnBiwXoOV
-DoCkKvbdYSkaMtPY
-DncLKvbdHELVibKK
-EPCkKvbdhlEcnVCy
-EPCkKvbdZLqdTnMN
-DoDKjvbdbsCkUEKB
-EPCkKvbdMpYRVnHT
-EOcLKvbdFWZQPljF
-DoDLKvbdznoqEcLx
-DnbkKvbdcImJjewY
-EPCkKvbdvvlBVaWV
-DoCkKvbdmIdTqUrB
-DncKjvbdxZgeexFS
-EOcLKvbdrouoJbvG
-DoCkKvbdWRnYBdlD
-DoCkKvbdBhjbLJFj
-DnbjjvbdrouoKDWG
-DoDKjvbdUxgsyjnn
-DoDLKvbdakMFnnDA
-EOcLKvbdZtJJYcsO
-DncLKvbdrbFllHKy
-EPCjjvbdmajXXnmu
-DncLKvbdpyPHgQdY
-EObjjvbdyNrgwsJD
-EPCjjvbdaMjaruMg
-DncLKvbdYfwEAPTJ
-DoDKjvbdbiNKLFvx
-DoCjjvbdajkfOnDA
-EObjjvbdZoOJEeZj
-EOcKjvbdqZOhGqEY
-EOcKjvbdziuPodTU
-DoDKjvbduLxWaUBX
-EObkKvbdyXhjBoyk
-DoDKjvbdTkunaWPJ
-EObkKvbdBraCsfXS
-DoDLKvbdTAEiICPE
-DnbkKvbdDjHjVwjA
-EOcKjvbdqlzKZLhJ
-EObkKvbddneTLTsr
-EObkKvbdWRmwaeMD
-DoDLKvbdLBLHNBwq
-DoDLKvbdUxhUZkPO
-DncKjvbdYlSDsmkm
-DoCkKvbdxZhGFwdr
-EObjjvbdbsDKsdJa
-EPCkKvbdGYuVAdYC
-EObkKvbdRXNccLhD
-DnbjjvbdFVxpQMjF
-DoDLKvbdMgDQNPtk
-EObkKvbdQvmccMHc
-DncKjvbdMpXqVnHT
-DoCjjvbddZxoxYqC
-DncKjvbdnVUzKjRf
-DoCjjvbdEuyQPmKF
-DoDKjvbdLYqKSzuG
-EPDLKvbdTAFJICOd
-DoCjjvbdCJLCKiFj
-EOcLKvbdFyVVAcwb
-DoCjjvbdbQHHDkzd
-DoCkKvbdNrsvGduQ
-DnbjjvbdRWmcblID
-DnbkKvbdQvnEDLgc
-DnbjjvbdVZITzKnn
-EPDLKvbdxxJJaoyk
-EObkKvbddoEsLUTr
-DncLKvbdZQldhldq
-DoDLKvbddCSmSAUN
-DoDLKvbdYpldhldq
-DoDLKvbdDxXlUTsl
-EPCkKvbdnGdxMmfy
-DncKjvbdwWlBWAuu
-EOcLKvbdkDMKpgUg
-DoDLKvbdZshiYdSn
-EPDLKvbdhfjCyWKV
-EObjjvbdKRZeOeme
-DoCkKvbdznopdcLx
-EPCkKvbdZMSDsnMN
-DnbkKvbdkWWmcbXw
-EObjjvbdpxoHfqEY
-DnbkKvbdtlYXAsaX
-EPDLKvbdjvXNcaww
-EPDLKvbduDDVXVoP
-DoDKjvbdLGFgbBQu
-EObjjvbdmuUzLKRf
-EObjjvbdRaceMIyL
-EPDLKvbdiHKCyVjV
-DoCkKvbdxnTHwriD
-EOcLKvbdZjTIPgCG
-DncLKvbdBcpBVjNG
-EPDLKvbdVwIxVceH
-DoCkKvbdkIGkeemk
-DnbkKvbdozmdKxPA
-DoDKjvbdjuwNdCXw
-DoCkKvbdeEoSCXCj
-EPCkKvbdcScKtEJa
-EPDLKvbdySnIlrBg
-EPCjjvbdnQZyVkYb
-DoDLKvbdqYnggREY
-EObkKvbdBsBDUGXS
-DnbkKvbdUWLoitAq
-DoCkKvbdIGgZxxYH
-DoDLKvbdvwLaWBVu
-EObjjvbdmfeXlnHZ
-EPDLKvbdRXNdDMID
-EPCjjvbdZLrDsmkm
-EOcKjvbdUQpoUuHm
-DnbkKvbdEzsqFMDJ
-EOcLKvbdQlwayOUz
-EPDKjvbdyzdnRhJI
-DoDLKvbdwzHfGXeS
-EOcKjvbdTvMPitBR
-EOcKjvbdJbicRJcY
-DoDLKvbdFVxpQNJe
-DoDLKvbduLxXBTaX
-DoCjjvbdLYpirzuG
-DnbjjvbdvwMAvBWV
-EPCkKvbdBiKbKiFj
-DncLKvbdIryArmYM
-DncKjvbdySmiNRag
-DncKjvbdeEoRbWbj
-DoDLKvbdjuwOECXw
-EPDLKvbdFWZPomJe
-EObkKvbdjcMLRGtg
-DncLKvbdQwNccMHc
-EPDLKvbdzQoMiJwA
-DoDKjvbdmSYtzSdJ
-EOcLKvbdelfWgMjL
-EOcLKvbdiMFENuCy
-EPCkKvbdezvZEhsw
-EPDLKvbdUVlPisaR
-EPDKjvbdbKlGOmcA
-EObkKvbdzGyMANEw
-DoDKjvbdXFxzUAPT
-EPDLKvbdqrUkNkAm
-EOcKjvbdPxmAGsSK
-EOcLKvbdyfyMAMeX
-EObjjvbduDDUwVoP
-DncLKvbdyYJJbQZk
-DoDLKvbdxVNEqYkn
-EPCjjvbdNPxRWOHT
-EObkKvbdYqNEiNEq
-EPDKjvbdXrlAlsoY
-EPDLKvbdbrcKtEJa
-EObjjvbdGdKvJbJj
-DoCjjvbdrDeJPnVa
-DoDKjvbdZLrETnMN
-DoDKjvbdKVuGDeGi
-DoCkKvbdZtJIyETO
-EObjjvbdYSlAlsoY
-DoDLKvbdCSaDUGWr
-EObjjvbdmfeYNNgZ
-DoDKjvbdtumwiqTA
-DncKjvbdqFdEtWAh
-EPCkKvbdauCHXjtI
-DnbjjvbdvOszqKoU
-EOcKjvbdxrnImSBg
-DoCkKvbdjvWmdBww
-EPCjjvbdmuUzKiqf
-EObjjvbdNdcsiIjd
-EOcLKvbdNPxRVnGs
-EObkKvbdSPsgKFdX
-EPDLKvbdVAbQsQqy
-EPDKjvbdVZHsyjoO
-DncKjvbdJzofXdAN
-EObkKvbdFjeTChNV
-DnbjjvbdjJegjNXr
-DnbkKvbdZLrDsnLm
-DnbjjvbdbAueGQQX
-DncLKvbdQcbaQQdS
-DnbjjvbdFjdrbglu
-DncLKvbdAMgxsWyx
-DnbjjvbdRpUHKGDw
-DncLKvbdMfcPlpVL
-EObjjvbdIwtBhMRQ
-EPCkKvbdelfXGmKL
-DoDLKvbdFkErbhMu
-EPCjjvbdHffyyYXg
-DoDKjvbdOEctJIkE
-DoCkKvbdKkAgvAKZ
-EObjjvbdzitopDsU
-EPCjjvbdRpUHJfEX
-DoCkKvbdZLrDtNkm
-EPCkKvbdijGIKNXr
-DoCjjvbdxUmEpxlO
-DnbjjvbdIxTbIMRQ
-EPCkKvbdMfbpMotk
-DncLKvbdjlbLzFGo
-EObkKvbdrRtkNjaN
-DnbkKvbdRosgKFcw
-EPDLKvbdpfDeUWAh
-DnbkKvbdkxsRryHU
-EPCkKvbdkVvmcbXw
-EOcKjvbdhficZWJu
-EPDKjvbdCEQBWKMf
-DoCjjvbdUyITzKoO
-DnbjjvbdaNKbStmH
-EPDLKvbdFWYpQMie
-EObjjvbdhytekqNf
-EObjjvbdeXyssqez
-DnbkKvbdLAjgNCYR
-DncKjvbdSBdFLiZL
-EPDKjvbdBhkBjiGK
-DoDKjvbdmajWxOmu
-DoCjjvbdrMzJyMHi
-DoDKjvbdZLqctOMN
-EOcKjvbdnPzYujxb
-DncKjvbddoFTKstS
-DncLKvbdjcMLRGuH
-DoCkKvbdbUagYKtI
-DncLKvbdVAaqTRSZ
-EPCjjvbdOEdTiJLE
-EPCjjvbdJvUfEFHJ
-DnbjjvbdIryBTNYM
-EPDKjvbdYpleJNEq
-DncKjvbdZGwEAOri
-DncLKvbdBdQAvJmG
-DoCkKvbdmIdTqUqa
-EPCkKvbdtcCuWuno
-EPCjjvbdmuUyjjSG
-DncLKvbdjAQHApHK
-EPCjjvbdGdKujBjK
-EPDKjvbdYkrETmlN
-DncKjvbdYORAYUut
-DnbkKvbdiHKCxvJu
-EPCjjvbdkHgLfGOL
-DoCjjvbdpssfqqkU
-EPDKjvbdZnmheEzK
-EPDLKvbdySmhlrCH
-EPCkKvbdjJegilxS
-DoCkKvbdqcdhpNua
-EPDKjvbdIHHZyXxH
-DnbjjvbdjmBkydgP
-DoCjjvbdYkqcsnLm
-EPCkKvbdZnmhdeZj
-EPDLKvbdDjIJuwjA
-EOcLKvbdnQZxvKyC
-EPCkKvbdBhkCKiGK
-DnbjjvbdYkrDsnMN
-DncLKvbdyzeNqghh
-DncLKvbdrRuKmjaN
-EPCjjvbdssRsYzEc
-DoDLKvbdZQleJNFR
-EObjjvbdZQleJMeR
-EPDKjvbdtvNxJqTA
-EObjjvbdbBWFGPpX
-EPDLKvbdajkeoODA
-EPDLKvbdSZihTCvA
-EObkKvbdZMRdTnMN
-EPCkKvbdsCFmLgKy
-EObjjvbdVvhxVceH
-EPCkKvbdaaVeFpQX
-DoCjjvbdZQmEhleR
-EOcKjvbdhzUfLpmf
-EPCkKvbdREDBQRDr
-DncLKvbdemFwHNJk
-EOcKjvbdGAnqYizm
-DncLKvbdtTRsZZdc
-DoDLKvbdGGKRmhtR
-DoDLKvbdIidAJogE
-DoCkKvbdxZhGFxEr
-DncLKvbdpxoHgREY
-DnbjjvbdQcbaQRES
-EPDKjvbdjAPfaPgK
-EPCkKvbdvwMAuaWV
-EOcKjvbdZLrDsnMN
-DncKjvbdyqOlhiwA
-EObkKvbdRacdkiYk
-DoDKjvbdUWMQJsaR
-EPDKjvbdUGzmkvvF
-DoCjjvbdhbPDFXRR
-EObjjvbdXGZZtAPT
-EPCjjvbdMoxRWNgT
-EOcKjvbdGFiqmhtR
-DoCkKvbdNPxRWNgT
-EObkKvbdyNrgxTJD
-EPDKjvbdrXPkcJYq
-EOcLKvbdFjeTChMu
-DncKjvbdjvXNcaww
-DncKjvbdkMbMZdgP
-EOcKjvbdDnbkLXDE
-EObjjvbdbBWFGPow
-DoCjjvbdAMhZSwZx
-EPDLKvbdZRNEiMeR
-DoDKjvbdqdEiQNvB
-DoCkKvbddePRavbj
-EPDKjvbdaMjbStlg
-EObkKvbdHgGyxxYH
-EOcKjvbdtkxXBUAw
-DnbjjvbdmSZUysEJ
-EObkKvbdrXQLbhxq
-EObkKvbdVTlsfMWK
-DoDKjvbdSLZGUfjs
-DoCkKvbdFVyPpMjF
-DoCjjvbdhgKCyViu
-EPCkKvbdZMSDtOLm
-EPCjjvbdySmhlqag
-EPDKjvbdWRmwadlD
-EPCjjvbdqZPHfpdY
-DoDLKvbdXsMBMsoY
-DncLKvbdelewHMjL
-EObjjvbdYpleImEq
-DoDKjvbdZirgogBf
-EOcLKvbdrXPlChxq
-EPCkKvbdFVxpQMie
-DoCkKvbdrNZjZMHi
-EOcKjvbdDjIJuxKA
-DncLKvbdeOeSkTsr
-DoCjjvbdZoNhddyj
-DoDKjvbdkWXNcaxX
-DoDLKvbdTpqOtthN
-DnbjjvbdehKuqnQg
-EPCjjvbdmgFXlmfy
-DncLKvbdShyiqAAl
-EOcKjvbdKaKgNBwq
-EPDKjvbdEztREkbi
-EOcKjvbdVviXvEFH
-EPDKjvbdcIlikGWx
-EPCkKvbdUWLojUAq
-EPDLKvbdOStWHEtp
-DoCjjvbdHlBzmwRL
-DnbjjvbdWIYVxHYz
-EPDLKvbdADSXjZhp
-EPDKjvbdRzJgrcWA
-EObkKvbdxrnIlqag
-EObjjvbdRosgKFcw
-DoDKjvbdkySrTYgU
-DncKjvbdsrqrxydc
-EPDLKvbdZyEKODLr
-EPCjjvbdEXxMUUTl
-EOcKjvbdtcCtwWOo
-DncLKvbddndrkTtS
-EPDKjvbdrafMkfjy
-EPCjjvbdJcJbpibx
-EObkKvbdFfJqnIsq
-EPCkKvbdyNsHwriD
-DoCjjvbdaRebgsfL
-DnbjjvbduoTzpjnt
-EPCjjvbdZGvdAOsJ
-DoDKjvbdmozYujyC
-EPDKjvbdZGvdAPSi
-DnbjjvbdmSYtzTDi
-DoCjjvbdRotGjFdX
-EObkKvbdSBceLhxk
-DoCjjvbddijRvUzn
-EObkKvbdMgDQNPtk
-DoCkKvbdFVxoomKF
-DncKjvbdGcjujBjK
-EPDKjvbdBcpAvJlf
-DncLKvbdLBLHNCYR
-EObkKvbdmIctQtrB
-DoDLKvbdFpATXGey
-EPCkKvbdbrbkUDjB
-DncLKvbdcTCjtEJa
-DncLKvbdBsAbsfXS
-EPDKjvbdFpATXGfZ
-DoDKjvbdwuMeQxlO
-EObkKvbdqUUGqrKt
-DncKjvbdZyEKODLr
-EPDKjvbdjhHLefNk
-EPCkKvbdrbFmMGjy
-DoCkKvbdsQWOjCvG
-DoCjjvbdLBLHMbXq
-EObjjvbdrpVnicVf
-EPCjjvbdVqmwaeMD
-DncLKvbdRNYCYnUz
-EObjjvbdRXNdCkhD
-DncKjvbdIHHZyYXg
-DnbjjvbdyTOJMrCH
-DoDLKvbdUsmUFkuj
-DncKjvbdQcbaPqES
-DnbkKvbdmgFYNNgZ
-EOcKjvbdkySrTYgU
-DoCjjvbdHlBzmwQk
-DnbjjvbdaSFcITek
-EObjjvbdQdCaPqDr
-DncKjvbdxVMdpyLn
-EOcKjvbdiMEdOVCy
-DoCjjvbdRosgJecw
-DncLKvbdkDMLQftg
-EPCkKvbdKDKCqKDY
-DoCjjvbdjvWnDaww
-EOcLKvbduVnYJpsA
-DoDLKvbdWRnYBdlD
-DoDKjvbdssSSxzFD
-EPDLKvbdJYTaglRQ
-EOcLKvbdhzUfLpmf
-DoDLKvbdJutfDdgJ
-EOcKjvbdxmrgwrhc
-EObkKvbdwWkaVaVu
-EOcKjvbdxrmiMrBg
-DoDKjvbdRDcApRES
-DoCjjvbddjJrVtzn
-EOcKjvbdxVNEqYlO
-DoCjjvbdJJdAJofd
-DoDLKvbdemGWfmJk
-EOcKjvbdnPyyWKyC
-DoCjjvbdbrcLTcia
-DoDKjvbdjuvmdCXw
-DncLKvbdtkwvaUAw
-EOcKjvbdHDkViaij
-EObkKvbdRDbaPpcr
-EOcLKvbdtSqryZeD
-EOcKjvbdrRuLOKaN
-EOcKjvbdczYowyRC
-DnbkKvbdjcMLQfuH
-DncKjvbdmbJwYOnV
-EPDLKvbdZnmiFEzK
-EPDKjvbdjbkkQgVH
-EObkKvbdJTZArmYM
-DncKjvbdSPsgJfEX
-DncLKvbduMYXBUBX
-EObkKvbdkIHMFfOL
-EOcKjvbdYORAYVWU
-DoCjjvbdyzdmqghh
-DncLKvbdtumwiqTA
-EPDKjvbdQmYCZOUz
-DoCjjvbdtcCtvvPP
-EObjjvbdVTmUGMVj
-EObkKvbdBsAcUGXS
-DoCjjvbdqYngfqDx
-EPCkKvbdtkxXBTaX
-DoDLKvbdACqwiyhp
-DncKjvbdraelkgKy
-EPDKjvbduLwvaUBX
-DncKjvbdpssgSSLU
-EPCjjvbdIxTbHlRQ
-EPDKjvbdPyNAGrqj
-DoDLKvbdnCJvxOnV
-EObkKvbdZRNFJNEq
-DoCjjvbdFxuVBEYC
-EOcKjvbdVAbRSpqy
-DnbjjvbdJbibqKDY
-DoDLKvbdKCicQjCx
-EPCjjvbdNrtVgFUp
-EOcLKvbdZQleJNEq
-DoDLKvbdaRebgsfL
-DoCkKvbdCIjakIej
-EOcLKvbdBraDUGWr
-EPDLKvbdADRxKZiQ
-DoCjjvbdHkazmvpk
-EPDKjvbdUsltGLvK
-EOcKjvbdTkvOaVoJ
-DncLKvbdZnmiEdyj
-DoDKjvbdZtJJYdSn
-DoDLKvbdbiNJjfWx
-DnbjjvbdIsZBTNYM
-EPCkKvbdhbPDEvpq
-DncKjvbdqlyjYlIJ
-DoCkKvbdbsDLTcia
-DoDKjvbdKCjCqKCx
-DoDLKvbdnBiwYOmu
-DnbkKvbdjKGIKMwr
-EPCjjvbdHgGyxxYH
-EOcLKvbdcyxpXxqC
-DncLKvbdlZSrSyGt
-EPCjjvbdTAFIhCPE
-EObkKvbdZdwfzgiC
-DoDLKvbdSLYfUgLT
-DoCjjvbdRMwayNtz
-DnbjjvbdCflGHAzc
-DoCjjvbdrJAKFNOe
-EPCjjvbdjblKpgUg
-EPDLKvbdQccAoqDr
-DnbjjvbdCJKbKhfK
-EPDLKvbdiGibyWJu
-EOcLKvbdyNsHxShc
-EPDLKvbdmIcspuSB
-DnbjjvbdnGdxNOHZ
-DoCkKvbdhzVGMRNf
-DoDLKvbdeFPRawDK
-EObjjvbdsQWOjCvG
-EObkKvbdhzUelQmf
-EObkKvbdeJirWUzn
-DncLKvbdxxIibPzL
-EObkKvbdSBceMIxk
-DoCkKvbdehKvRmqH
-EObjjvbdRbDeLiZL
-EObjjvbdGYtuAdYC
-DnbjjvbdHDkVibKK
-DoCjjvbdKQyeOfNe
-DoCkKvbdmbJvxOmu
-DoCkKvbdULvOaWPJ
-DncLKvbdrWpMCiZR
-EObjjvbdhytfLqNf
-DoCjjvbdgPazvdXh
-DoCjjvbdiHKDYuiu
-EPDKjvbdRWnDbkhD
-DncLKvbdrMzKZLhJ
-EObkKvbdyXhiaoyk
-EPCkKvbdjmCLydfo
-DnbkKvbdDxYMUTsl
-EPDKjvbdxmrgxSiD
-DnbkKvbdmSYtyrci
-EPCjjvbdqvokcIxq
-DoDLKvbdXsMAmUPY
-DncKjvbdDoDKkWcE
-EPCkKvbdMgDPmQUk
-DoDLKvbdKyQirztf
-EPCjjvbdmajWwnmu
-EOcLKvbddCSlrATm
-EPDLKvbdrJAKElne
-DoCkKvbdIsZBTMxM
-DnbkKvbdffMZnGgA
-EOcKjvbdJcKDQjDY
-EObjjvbdxsOJMrCH
-EObkKvbdEKHiuwjA
-DncKjvbdunszpjnt
-DoDLKvbdZjTIQHCG
-DnbjjvbdsQVnibvG
-DnbkKvbdGQATXHGZ
-DnbkKvbdBsBDTfXS
-DoCkKvbdBsAbsevr
-DoCkKvbdRXNdDLhD
-EPCjjvbdRadElJZL
-DnbkKvbdxwhibPzL
-EOcKjvbdCJLBjiFj
-DncLKvbdZMSDsmkm
-DoDKjvbduaEZSoFI
-EPCjjvbdhgJbxujV
-EOcLKvbdCJLBjhfK
-DoCkKvbdZisHpHBf
-DoCkKvbdqFdFUWBI
-EPCkKvbdDGlFgAzc
-DncKjvbdZxcjNblS
-EPDLKvbdLqvmZuQz
-DoDKjvbdxZhGFxFS
-EObkKvbdZdxGzhIb
-DoDLKvbdqwQMChyR
-DoCkKvbdjlalZeGo
-DncKjvbdZRNEhldq
-EPCkKvbdZHXEAPSi
-DoDKjvbdDoDLKwCd
-DnbkKvbdmbJwYPNu
-DncKjvbdMfcPlouL
-DoCkKvbdQwODblHc
-DoCjjvbdNQYQunGs
-DnbjjvbdlqxtzSci
-EOcLKvbdrDdhpNua
-DncLKvbdKefICApu
-EPDKjvbdatagXkUI
-DoCjjvbdaofgDkzd
-EObkKvbdIrxaTMwl
-DncLKvbdSLYfVGkT
-EPCkKvbdelevfmKL
-DncKjvbdFfKSOIsq
-EObjjvbdfILVqnQg
-DncLKvbdZjShPgCG
-DoCjjvbdrNZixlHi
-DnbkKvbddoFTKstS
-EOcKjvbdWSNwbFMD
-EPDLKvbdpxngfqDx
-EOcKjvbdIHGyxxYH
-EOcLKvbdvwMAuaVu
-EOcKjvbdkxrqryGt
-DncLKvbdZjShQHBf
-DnbjjvbdiUzEvquC
-EObkKvbdpxoHfpcx
-DoCkKvbdGAoRZJzm
-EOcKjvbdehLVrOQg
-EPDKjvbdkDMLRGuH
-DnbkKvbdKCjDRKDY
-EPCjjvbdLGFhBaRV
-EPDLKvbdaMjbSuNH
-DncKjvbdWfYzUAOs
-DoCjjvbdsBelkfjy
-DncLKvbdZnmheFZj
-EOcLKvbdatagYLUI
-EObkKvbdWXJXvEEg
-DoDKjvbdZMRdTmlN
-EPCjjvbdWXIwvEEg
-DoCjjvbdkCkjqHUg
-EPCjjvbdijFhJlxS
-EPDKjvbdmSZUysEJ
-DoDKjvbdMgDQMouL
-EPCkKvbdrDdhomvB
-EPCjjvbdRNXbYmtz
-EPCkKvbdUtMtFlWK
-DnbjjvbdGcjvJajK
-EPDKjvbduaDyTOeI
-DncLKvbdziuPocrt
-DoCjjvbdcScKscjB
-DncKjvbdmgExMmfy
-EObjjvbdJcJcQibx
-EPDKjvbdMpXpvNfs
-EObkKvbdyqPNIjXA
-EPCjjvbdCSaDUGWr
-EOcKjvbdZnnJFEyj
-EObkKvbdyOSgwriD
-EPCjjvbdtkwwAtBX
-DnbkKvbdDncLLXDE
-EOcKjvbdZshhxcsO
-DoCjjvbdxVMdpxlO
-DncKjvbdLGGHaaQu
-DoCkKvbdxUmFQyMO
-EPDKjvbdpfEEsvAh
-DoCkKvbdZRMdhldq
-EPDLKvbdYzberJuy
-EObjjvbdfHkWSOQg
-EPDLKvbdRMxByNtz
-DncLKvbdmoyyWLZC
-EObkKvbdhtydvrVC
-DoCkKvbdVhYWYGxz
-EPDKjvbdbVCHXjsh
-EPCkKvbdTlWPBVni
-DncLKvbdFkEsCgmV
-DnbkKvbdIsYaSlxM
-DncKjvbdzaAOffbM
-DncLKvbdaSFcHtGL
-DoDLKvbdiGjDYuiu
-EObjjvbdDigjVwjA
-DncKjvbdqmZixlIJ
-DnbkKvbdRjxfUgLT
-EObkKvbdeAURNYKG
-EPCjjvbdjvWnECXw
-EPCjjvbdNQXqVmgT
-DoDLKvbdxmsHxShc
-EPCkKvbdqwPlChxq
-DnbjjvbduLwwAsaX
-DncKjvbduCbuWuno
-DnbkKvbdJpydnenF
-EPDLKvbdRXOEClID
-DncKjvbdSKyFuGkT
-DncKjvbdczZQYZRC
-EPCkKvbdGZUtaDxC
-EPCjjvbdOAJTUKSA
-DnbkKvbdsZlQSaHn
-DncKjvbduWNwiqTA
-DoDLKvbdRNYCZOUz
-DoCkKvbdVTmTfMVj
-EOcLKvbdeATpmYJf
-DncKjvbdbUbGxKsh
-DnbkKvbdLZRKSztf
-DncKjvbdcJMjLFwY
-DnbkKvbdRadEkhyL
-EPCkKvbdauBgXkTh
-EObkKvbdrJAKFNOe
-EOcKjvbdDnbjkXDE
-DoDKjvbdrafMlGjy
-EOcLKvbdliDtRVRa
-EObjjvbdZjShQHCG
-DnbjjvbdZnmiFEyj
-EPDKjvbdbAueFpQX
-EPCjjvbdVwJYVcdg
-EObkKvbdijGIJmYS
-DoCjjvbdJpyeOenF
-DoDKjvbdYlSDsnMN
-DncLKvbdehLVqmqH
-DnbjjvbdTppnuVHm
-EOcKjvbdSLYetgLT
-EPCkKvbdZyEKOClS
-DoDKjvbdHDjujBij
-EPCkKvbdHkazmvpk
-EObkKvbdkxrrTYft
-EPCjjvbdOTUVfeVQ
-DoCjjvbdYzbfSKWZ
-DncKjvbdkxrrSxgU
-EObjjvbdEOcKkXCd
-EPDKjvbdcTCkTcia
-DoDKjvbdatagXkTh
-DoDLKvbdNHCpMpUk
-DoDKjvbdhtzEvquC
-EPCjjvbddePSBvbj
-DoDLKvbddneTLUUS
-DncLKvbdijFhKMwr
-EPDLKvbdpxoIHRDx
-DncLKvbdqquLOKaN
-EPCkKvbdSCEEkiZL
-DoDLKvbdvAdYroEh
-DncLKvbdDwwksstM
-EOcKjvbdKWVFcdgJ
-EPDKjvbdZnmhdeZj
-DoCjjvbdJSyBTMxM
-DoDLKvbdtcDVXVoP
-EOcLKvbdbAudfPow
-EPCjjvbdpfDdtWAh
-DncKjvbduCcUwWOo
-DnbjjvbdGFirOItR
-DnbjjvbdLBKgNBxR
-DnbjjvbduVnYJpsA
-DnbjjvbdjuvnDbXw
-DoDKjvbdFkFTDINV
-EOcKjvbdEvZQQMie
-DoCkKvbdMfbolpUk
-EPCjjvbdhbPCdwQq
-DoDKjvbdZyEKNblS
-EPCjjvbduCbtwWPP
-DnbjjvbdgLGzbfAE
-EObjjvbdqGDdsvAh
-EPDLKvbdNGbolotk
-DoCkKvbdSPsfifEX
-DncLKvbdbVCGwjsh
-EObkKvbdijGHjMwr
-DnbjjvbdRosfifDw
-DoCjjvbdQccApRDr
-DoDKjvbdqTtHSSKt
-EOcLKvbdsQWPJcVf
-EObkKvbdeOdsLTsr
-DncLKvbdcTDLUDjB
-DoDKjvbdVgwvXfxz
-EOcKjvbduoTzqKnt
-EPCjjvbdYNqAYVWU
-EObjjvbdemGXGmJk
-DoCkKvbdVgxWXfxz
-DoCjjvbdqlzKZLgi
-EPDLKvbdLFfHaaQu
-DnbkKvbdcSbkTcjB
-EObjjvbdgGLzNgHA
-EObjjvbdZjSgpGbG
-DnbjjvbdGckVjBij
-EOcLKvbdUMVnaWOi
-EObkKvbdrylQSaHn
-EPDLKvbdZHWdAOri
-DoDKjvbdyfxlAMdw
-DnbjjvbdZMSDsnLm
-DoDKjvbdOTUVgEtp
-DnbkKvbdJSxaSlwl
-DncKjvbdkNCLzFGo
-DoDKjvbdfMevgMik
-DnbjjvbdMgDPlpVL
-DncKjvbdqquLOLAm
-DoCkKvbdfNFwGlik
-DncLKvbdpxnhHRDx
-DoDLKvbdZMRdTmlN
-EPCkKvbdURRPVVHm
-EPCkKvbdmgEwmOHZ
-EOcLKvbdVAapsRSZ
-DoCjjvbdczZPwxpb
-EPDLKvbdWXIxWDdg
-EPCkKvbdUVlQJtBR
-EOcKjvbdelfWgNJk
-EPDKjvbdUtMtFkuj
-DnbjjvbdRkZFtfjs
-EObkKvbdCJLCLJGK
-DoDLKvbdKVuGEEgJ
-DncKjvbdIxTbHkqQ
-DncLKvbdMSWlzUpz
-EPCkKvbdKefICAqV
-EOcKjvbdtunXjRTA
-DoDLKvbdZMSETmlN
-EObkKvbdapHHELzd
-EObkKvbdmRxtyrdJ
-DoCjjvbdtTSSxzEc
-EObjjvbddeOrBvbj
-DncLKvbdJYUBgkpp
-EPCjjvbduLxXBUAw
-DnbjjvbdSLYetfjs
-DncKjvbdzQnmIiwA
-EPCjjvbdRpUGjFdX
-EOcLKvbdddnqbWcK
-EOcKjvbdWWhwucdg
-EOcLKvbdCWzdJEov
-EPDKjvbdTkuoAuni
-DncLKvbdqUTgSSLU
-DoDLKvbdNHDQMotk
-DncLKvbdWXJXvEEg
-EPCjjvbdaNKaruNH
-EPDLKvbdraelkfjy
-DncLKvbdLqvmZtpz
-DnbjjvbdNddThhkE
-DoDKjvbdzoQQdcLx
-EPDKjvbdYpldiNFR
-EObjjvbdZtJIyDsO
-DoCkKvbdWWiYWDeH
-DoCkKvbdeEoSBwDK
-DoCjjvbdBsAcTevr
-EObjjvbdqvpMChyR
-EPCjjvbdsCGMlHKy
-DnbkKvbduLwwAtAw
-EObkKvbdMRwMyuQz
-DncLKvbdwWlAuaWV
-DncLKvbdHgHZxwxH
-DncKjvbdBsAcTewS
-DoDLKvbdJpyePFme
-DncKjvbdVUNUFlWK
-DncKjvbdEYXktTtM
-DncLKvbdwMvANDeN
-DnbkKvbdtSrTZZeD
-EOcLKvbdJYUBhMRQ
-DncKjvbdlYrrTZGt
-DoDLKvbdliDsqUrB
-EObjjvbdegjuqnQg
-EObjjvbdlZSrTZHU
-DncLKvbdfNGWfljL
-DoDLKvbdLFegbBQu
-DncLKvbdemGXGmKL
-EPDKjvbdDwwksssl
-DnbjjvbdxmsIYTJD
-DoDLKvbdBsBCtGWr
-DoCjjvbdIsYaTNYM
-DncKjvbdJuuGEEgJ
-EObkKvbdkySqsYgU
-DnbkKvbdNPwqWNfs
-EPDLKvbdmIdTptrB
-DoDLKvbdyqOmIjXA
-EPCjjvbdhkeEOUcZ
-DoDKjvbdJqZePFme
-EPDLKvbdfSAvzlCo
-EObjjvbdbhljLFvx
-EOcLKvbdaMkBsUmH
-DoCjjvbdKyRKSzuG
-EObjjvbdcSbjtEJa
-EOcLKvbdkHflGFmk
-DoDLKvbdemFwHMjL
-EObjjvbdSLZGVHLT
-DoCjjvbdJXtCILpp
-EOcLKvbdaaVdfPow
-EOcLKvbdFpATWgGZ
-DoCjjvbdxZgeewdr
-EObkKvbdeEnqawCj
-EObjjvbdhytfMQmf
-DnbjjvbdoznEKxPA
-DnbjjvbdoAKzsgdO
-DoCkKvbdYzbfRivZ
-DoDLKvbdqqtkOKaN
-DncLKvbdqvokcJYq
-EPDKjvbdOStVfeUp
-DoDKjvbdZxcinDLr
-DoCkKvbdcyyQYYqC
-EObkKvbdcIlikGWx
-EOcLKvbdffLzNgHA
-EPCjjvbdMtsRkNAX
-EOcKjvbdpeceTvBI
-EOcKjvbdZsiIxcsO
-DncLKvbdJvVGDdgJ
-DnbkKvbdZMRdTmlN
-EPDLKvbdnCJwXnnV
-EObkKvbdxUldqZLn
-EPCjjvbdNddUJIkE
-DoCjjvbdyYJJapZk
-DnbjjvbdpxoHgQcx
-EObjjvbdHDjvKBij
-DncKjvbdUtNUFlWK
-EPCkKvbdkVvmdBww
-DnbjjvbdgGMZmgHA
-DoDLKvbdmIdTqVSB
-EOcLKvbdzitpPdTU
-DncLKvbdkxrqrxgU
-DoCjjvbdVBBpsRSZ
-EOcLKvbdGFiqmiTq
-EOcKjvbdxsOJMqag
-DoCkKvbdHDkVjCJj
-EPDKjvbdjSziTKiz
-EOcKjvbdCTAbsewS
-EPCkKvbdkWWnDbYX
-DoDLKvbdJSxaTMxM
-DoDLKvbdMoxRWNgT
-DoDLKvbdmuVZkJrG
-EPDKjvbdbUbHXjtI
-DnbjjvbdkWWnEBxX
-EOcLKvbdnPyxukZC
-DnbjjvbdXrlBMtOx
-DoDLKvbdJuuGEFGi
-EPDKjvbdUaBprprZ
-EObjjvbdsrqrxydc
-EObjjvbduCbtwWOo
-DoCkKvbdSLYeuHLT
-DoDKjvbdKQyePFme
-EOcKjvbdeYZssrFz
-DoDKjvbdpxoHfpdY
-EPCkKvbdcIljKfXY
-EPDKjvbdDwwksstM
-DnbkKvbdsQWOicVf
-EPDLKvbdIidAKQHE
-DoDLKvbdrDeJPnWB
-EOcLKvbdZoNiEeZj
-EObjjvbdptTgRrLU
-EPDKjvbdmRyUzTEJ
-DoDLKvbdFxtuBEYC
-DnbkKvbdehLVqmqH
-EPCjjvbdUtNUGLuj
-DoDLKvbdxVNEqZLn
-DncKjvbdySnImRbH
-DoCjjvbdbLMGPNcA
-EPCkKvbdzQoMiKXA
-DnbkKvbdbiMijevx
-EOcKjvbdSQTfiedX
-DnbjjvbdZisIQHBf
-EObkKvbdYpleIldq
-DncLKvbdjmBlZeHP
-DncKjvbdSCDdkhxk
-DnbkKvbdrykpTAgn
-EObkKvbdZQldiMeR
-DnbjjvbdeYZssqez
-EPDLKvbdlYrrSyHU
-EOcLKvbdTpqOttgm
-EOcKjvbdCJLCLIej
-EPDKjvbdUQqOttgm
-EObkKvbdGBOqZJzm
-DncKjvbdqwQMDIyR
-EPDKjvbdbBWFFoow
-EOcLKvbdZMRctOLm
-EPCkKvbdHEKuibKK
-DnbjjvbdNddThiKd
-DncKjvbdJuuFdEgJ
-DncLKvbdRzJgsDWA
-DncLKvbdRWmdCkhD
-EPCjjvbdZRNFImEq
-EOcLKvbdUaBqTRSZ
-EObkKvbdWIXvYGxz
-DoDKjvbdrRuKnKaN
-DoCjjvbdYgXEAPTJ
-DoCkKvbdwuMeQyMO
-EPDLKvbdkHfkfFmk
-DoDKjvbdTqQnuUhN
-DoCkKvbdbKlFoODA
-EObkKvbdrzLoraIO
-DncLKvbdFxuVAdYC
-DoCjjvbdZQldiMeR
-EOcKjvbdJTZBTNXl
-EPDKjvbdsQWPKCvG
-EOcLKvbdeEoRawDK
-EPDLKvbdtTSSxzEc
-DncLKvbdliDsqUqa
-DnbjjvbdZQleImEq
-EPCjjvbdaSGDITek
-DoDLKvbdRWnDbkhD
-EPDLKvbdpedEsvAh
-EPCkKvbdYpldhldq
-DoCjjvbdZoOJEdyj
-EOcLKvbdmoyxvKyC
-EObjjvbdmSZVZsEJ
-DoDLKvbdqUUGrSLU
-EPDLKvbdmpZxujyC
-EPCjjvbdCDpBVilf
-EPCjjvbdFfJrNhsq
-DoDKjvbdsZkosBIO
-DnbjjvbdiBnbdvpq
-DncKjvbdkDMKpftg
-EPCkKvbdatbGxLTh
-DoCjjvbdJTYaTNXl
-DnbjjvbdhkdcnVCy
-DncLKvbdyNrgxTIc
-EPDLKvbdyNsHwriD
-EPDLKvbdBdQBVilf
-DoDLKvbdIsYaTNXl
-DnbkKvbdkxsSTZHU
-EPCjjvbdBsBDUGWr
-EOcLKvbdgQBzwDxI
-DnbjjvbdjblLQfuH
-DnbkKvbdbVBgYKsh
-DncLKvbdMgComPuL
-EPDLKvbdqceIpOVa
-DnbjjvbdqFceTvAh
-EPCjjvbdFWYpQNJe
-DoDLKvbdHDjujBjK
-DncLKvbdIHGyyXxH
-DnbjjvbdeFOqawCj
-DoDKjvbdGQASwGfZ
-DncLKvbdrWokbhyR
-DncKjvbdSKyFtfkT
-DoCkKvbdemFvfmKL
-EPDKjvbdxsNhmRbH
-EOcKjvbdsPunicVf
-EObjjvbdrbGNMGjy
-EPDLKvbdOXoVzcnU
-EOcLKvbddZxpYYpb
-DoDKjvbdVBBpsRRy
-EPDKjvbdHDkWKCKK
-DoCkKvbdSiZjRAAl
-EPDKjvbdURQoVVHm
-DoCkKvbdpyPHgQdY
-EOcKjvbdGAoQxizm
-DnbjjvbdMpXpvNfs
-DncKjvbddndrjtUS
-DnbkKvbdlhcsptqa
-DoCkKvbdfNFvfmKL
-EPCkKvbdHffyxxXg
-DoCkKvbdYpleImFR
-DoCkKvbdbBVdfPpX
-DncLKvbdWSNxBdlD
-EPDKjvbdSQTfjFcw
-EPCjjvbdkxrqsYgU
-EPDKjvbdrovOjCvG
-DoCjjvbdaSGCgsek
-DncLKvbdZGwEAOri
-DoDLKvbdJmADzHUa
-DoCjjvbdNdcshiKd
-DoCkKvbddneTLTtS
-EObkKvbdMoxQumfs
-DncKjvbdVgxVwfxz
-DoDKjvbdGcjuibKK
-EObkKvbdTqQnuUhN
-DncKjvbdURRPUuIN
-EObkKvbdbrbjtEJa
-DnbkKvbdKQyeOenF
-EObjjvbdbKkfOnDA
-EPDLKvbdlhdTptrB
-EObjjvbdxnTHxTJD
-EObjjvbdKCjCpjDY
-DoDLKvbdMSWmZtpz
-DoCkKvbdBsBCsfXS
-DnbkKvbdfRaWzkcP
-EPDKjvbdbAvFGQQX
-DoCjjvbddoFSjtUS
-DnbjjvbdypoNJJwA
-EPDKjvbdzdzOzdyp
-EObjjvbdJpzEoFme
-DoCkKvbduCbuXWPP
-EPCkKvbdFfJrOItR
-DoDLKvbdkIGlFfOL
-DnbjjvbdbAudfPpX
-DoDLKvbdtAHRIABS
-EOcLKvbduDCuWuno
-DoDKjvbdkHgLfGNk
-EOcLKvbdxZhFeweS
-EObkKvbdUxgszKoO
-EOcKjvbdiBoCeXRR
-DnbkKvbdZeXfzhJC
-EObkKvbdtcDUvvPP
-EOcKjvbdMtrrLNAX
-DnbkKvbdWXJYVceH
-DnbkKvbdJbjCpibx
-EPCkKvbdajlFnnDA
-DnbjjvbduaEZTPEh
-EOcKjvbdGcjuibJj
-DncLKvbdKefHbAqV
-DoDKjvbdUxgtZjnn
-EPCjjvbdVZITzKnn
-EPDKjvbdHkaznXRL
-DnbkKvbdOEdTiIkE
-DnbjjvbdiGjDYvJu
-DoDKjvbdnUtykJrG
-EPCkKvbdBdQBWKNG
-EPDKjvbdsBemLfkZ
-EPCjjvbdtumwiqTA
-EOcKjvbdnCKXYPOV
-DncLKvbdVwIxVdFH
-DnbjjvbdWIYWYGxz
-EObkKvbdFpATXHFy
-DoCjjvbdauBgXjtI
-DnbkKvbdTqROuVHm
-DnbjjvbdlhcsqUqa
-EPDLKvbdxZhGGXeS
-DoDLKvbdZjTHogCG
-EOcKjvbdbKlGOnDA
-EObjjvbdLiBlRYAS
-DncKjvbdxrnJMrCH
-EOcLKvbdMJBlRYAS
-EOcKjvbdUsmTekuj
-DnbjjvbdEYYMTssl
-EObkKvbdZMSEUNkm
-DncLKvbdGGKSNhsq
-DoDKjvbdGZVVAdXb
-EPDKjvbdKRZdoFnF
-EOcLKvbdEXwlUTtM
-DoDKjvbdEztQeLcJ
-DoCkKvbdJYUBglQp
-DoCkKvbdJTZAsNXl
-EObjjvbdvmWAMdEm
-EPCjjvbdxZgefYFS
-DncKjvbdtTRrxzEc
-EOcLKvbdiGjDZWJu
-DoCkKvbdYlRctOLm
-DncKjvbdDxXlTtUM
-EPCjjvbdcyxpYYqC
-EOcLKvbdqGDeUWBI
-DnbjjvbdnPyxvLZC
-DoDLKvbdKefHbApu
-DoCkKvbdjblKqHVH
-EObkKvbdTfzmkvue
-EOcKjvbdZnmiEdzK
-EOcKjvbdDxXkstTl
-EPDLKvbdBdQAujMf
-DoDKjvbdGZVVBDwb
-DoDLKvbdEvZPpMie
-EPCjjvbdVwJXuceH
-DoDLKvbdRjyFtgLT
-DoCkKvbdXsLaNTnx
-DnbjjvbdDHLfHAzc
-DoCkKvbdVBCQrprZ
-DoCkKvbdyNsIYShc
-EPDKjvbdyXiJbPzL
-DoCjjvbdUsltFlWK
-EPCkKvbdcyyQYZRC
-DnbkKvbdddnqbWbj
-EPCkKvbdmuUyjjSG
-EObkKvbdZyDinDLr
-DnbjjvbdZtIiZESn
-EPCjjvbdVBCRTRRy
-EOcLKvbdCWzciFPv
-EObkKvbdrEFJPnWB
-DnbkKvbdqUUHSRkU
-EPDLKvbdlqyUyrci
-DoCjjvbdIMBznXQk
-DoCjjvbdUxgsykOn
-EPCjjvbdXsMBMsnx
-DncKjvbdjuvmdBxX
-EOcLKvbdkIGkeemk
-DoCjjvbdjKGIKNYS
-EPDLKvbdSLZGVGjs
-EOcKjvbdMfcPmQUk
-DoCjjvbdrNZjYlIJ
-EOcLKvbdkyTSTZHU
-EObjjvbdjAQGaQHK
-EPDKjvbdMoxRVnHT
-EObkKvbdeATpmXif
-EObkKvbdFjdsDHmV
-DncLKvbdbLLfOmcA
-EPCkKvbdunszqLOt
-DnbkKvbdnQZxvLZC
-DncLKvbdZyDjNblS
-DnbkKvbdptTfrSKt
-DoDLKvbdzaAOgHCM
-EPCjjvbdhbPCeXRR
-DnbkKvbdmuVZkKSG
-DoCkKvbdziuQQESt
-DnbkKvbdhgKDZWKV
-DnbjjvbdULuoBWPJ
-DncLKvbdWXJXucdg
-DoCjjvbdRacdlJYk
-DoDLKvbdegjvSNqH
-EOcLKvbdnUtzLKRf
-EOcKjvbdFxtuBEXb
-DoCkKvbdmIcsqUrB
-EObjjvbdULvPAvPJ
-EOcLKvbdSwkLmzkY
-EPCkKvbdSZjITCvA
-EPCkKvbdeOdrjtUS
-EPCjjvbdIxUBhLpp
-EObkKvbdqiAJeMoF
-DnbkKvbdhlEcmtcZ
-EOcLKvbdFejRnJTq
-EOcKjvbdwXMAvBWV
-DoDKjvbdmpZyWLZC
-DoCjjvbdGLErbhNV
-DoDLKvbdmaivwnmu
-EOcLKvbdOXoVzcnU
-DncLKvbdBhjbLJGK
-EPDKjvbdZjTIQGaf
-DoCkKvbdgPazwEYI
-DncLKvbdGGKRmiUR
-EObjjvbdfHkWRmpg
-DnbkKvbdXrkaNUPY
-EPCkKvbdzQoMhiwA
-EOcKjvbdrpWOjDVf
-DncKjvbdZtJJZDrn
-EPDKjvbdqZOggRDx
-DnbjjvbdhgJbyWKV
-DoDKjvbdiVZdwRuC
-DoDKjvbdIwtCHkpp
-DoDKjvbdVAapsRRy
-EPDLKvbdwjvcgzzG
-DoDLKvbdRyihScWA
-DoDLKvbdrRuKmkAm
-DnbkKvbdqGDdsuaI
-EPCkKvbdAMhYrwZx
-DncKjvbdSPsfjGEX
-DncKjvbdczYpXxpb
-DoDLKvbdkIHMGFmk
-EPCjjvbdkClKqHUg
-EObkKvbdxVMdqZMO
-DoDKjvbdBdQBVjMf
-EObkKvbdZjTHpGbG
-EPDKjvbdTfzmkvue
-EPCkKvbdLAjfmCXq
-DoCjjvbdLGGHbApu
-EPDKjvbdEzsqEkcJ
-DoDKjvbdwygfGYFS
-DoDLKvbdhgJbyWKV
-EPDLKvbdZshiZETO
-EPDLKvbdKWUfDdfi
-DnbkKvbdqYoHgQcx
-DncKjvbdnGeYMmgZ
-EPDKjvbdKCjDRKDY
-DoCkKvbdJcKDQibx
-EObkKvbdZoNiFFZj
-EPCkKvbdUyHsykPO
-EOcKjvbdtvNxKQsA
-EObjjvbdatafwjtI
-DoDLKvbdhzVFkpmf
-EObkKvbdMgComQVL
-EPCkKvbdSCEEkhxk
-DoDLKvbdgFlZnGgA
-EObjjvbdZMSETnLm
-EObkKvbdtumxKQsA
-EObjjvbdZoOIddyj
-EOcLKvbdqZOggQcx
-EOcLKvbdKfFhBaQu
-DncLKvbdzGxlANEw
-EObjjvbdehLWRnQg
-EObkKvbdEPCjkWbd
-EObkKvbdqYnhHRDx
-EObkKvbdjvXODaww
-DnbjjvbdqTsgSRkU
-EOcKjvbdTqQoVVHm
-DnbjjvbdQmYBxnUz
-DnbjjvbdpyOhGqEY
-EOcLKvbdLGGHbAqV
-EObkKvbdZirgpHCG
-EObkKvbdqYnhGpcx
-DncLKvbdrbGNLgKy
-EObkKvbdkySrSxgU
-EOcLKvbdeAUQlwjG
-DncKjvbdkVwNdCYX
-DoCjjvbdJvVGDeHJ
-EPCkKvbdEuyPpNKF
-EOcKjvbdDjHivXjA
-DnbjjvbdkNCLydfo
-EPCjjvbdZjTHogBf
-DoDKjvbdGKeTDINV
-DnbkKvbdJXtBglQp
-DnbjjvbdFejSOIsq
-EOcKjvbdhytelRNf
-DnbjjvbdbBVdeopX
-DoCkKvbdFjdsDINV
-DoDLKvbdjvXNcbXw
-DnbkKvbdZdxGzhJC
-EPDLKvbdjAPgBQGj
-EObjjvbdJXsbHkqQ
-EPDKjvbdiVZdwRtb
-EObjjvbdGFjSNiTq
-EPDKjvbdznpQdbkx
-EPCjjvbdemFvgNKL
-EPDKjvbdWXIxWEEg
-DncLKvbdEObkKvcE
-DnbjjvbdLAjfmCYR
-EPDLKvbdEXwkstTl
-EObjjvbdFfKSNhsq
-DncKjvbdygZMANFX
-EPCkKvbdYqNFIleR
-DoCkKvbdSKyGUgLT
-DncKjvbdBdQBVjNG
-DnbkKvbdbUagYLTh
-EOcKjvbdsPunjDWG
-DncLKvbdrEFIonVa
-DncKjvbdaSGChTfL
-DoCkKvbdcJNKKfXY
-EObkKvbdULuoBWOi
-DncLKvbdKWVGEEgJ
-EPCkKvbdqFdEsuaI
-EPDKjvbdAMgySvyx
-DncLKvbdiUzEwRuC
-EObjjvbdZoNheEzK
-DnbkKvbdZLrETnMN
-EObjjvbdKWVFcdfi
-DoDLKvbdcScLUEJa
-EPCkKvbdIwsbIMRQ
-EOcKjvbdsBemMHKy
-EOcLKvbdzitoodSt
-EPDKjvbdrMyjZLhJ
-DnbjjvbdaRfCgsfL
-DoCkKvbdKQzEnenF
-EOcLKvbdUGznLvue
-DncLKvbdZxcinCkr
-DnbjjvbdEuyPpNKF
-DncKjvbdGFirOIsq
-EOcLKvbdVqmxBeMD
-EOcLKvbdwuMeRZLn
-DnbkKvbdBhkBkIej
-EOcKjvbdNQXpumfs
-EObkKvbdVBCRTRSZ
-DoDLKvbdZeYGzhJC
-DncLKvbdREDBPqES
-DnbjjvbdvBEZSoFI
-EPCjjvbdakLeoNcA
-EPDLKvbdeFOqbWbj
-EPDLKvbdiGicZWJu
-EPCkKvbdEKHiuwjA
-EPCjjvbdwkWcgzyf
-DoDKjvbdmpZyVkZC
-EPCkKvbdSZihSbvA
-EPDKjvbdelevfmKL
-DnbjjvbdeATplwif
-DoCjjvbdGAnpxizm
-EPDKjvbdTlWPBWOi
-EOcKjvbdmSYtzTEJ
-DncLKvbdnGeXmNfy
-DoDKjvbdTIzJqAAl
-EOcKjvbdqdEiPnVa
-EOcKjvbdcTCkUEKB
-DoCjjvbdEvYopMjF
-DoDLKvbdwuMdpyMO
-EPDKjvbdEuyQPlie
-EOcLKvbdVUMsfMVj
-EObjjvbdijFgilxS
-DoDKjvbdnPyxujyC
-EOcKjvbdTAFIgbPE
-DnbkKvbdZxdJnDLr
-DncLKvbdqdEiPmua
-EOcKjvbdhgJcZVjV
-DnbkKvbdRbEFLhxk
-DoDKjvbdmaivwoNu
-DoCkKvbdZQmFJMdq
-DncLKvbdeYZtTqez
-EObkKvbdqYoIGpdY
-DnbjjvbdEASJMyvw
-DoDKjvbdwzHfGYFS
-DncKjvbdjvXOECYX
-DncLKvbdbBVdepQX
-DoDLKvbdrEFIomua
-DnbjjvbdYgWdAOsJ
-EOcKjvbdkMakydfo
-EPCjjvbdegkWSNqH
-EPDLKvbdYlSEUNkm
-EPDLKvbdzRPMhjXA
-DnbjjvbdmSZUyrci
-EPDKjvbdiiehKNXr
-EPDLKvbdwzIGGXdr
-DncKjvbdSLYetfkT
-EOcLKvbdURROtuHm
-EPDLKvbdEYYLtUUM
-EOcLKvbdaSGDIUFk
-DnbkKvbdhfibyViu
-DncKjvbdeFOqavcK
-EPDLKvbdZtIhyETO
-EOcKjvbdsPuoKDVf
-DoDLKvbdBhkBjiGK
-EPDLKvbdnQZyVkYb
-DncLKvbdNsTugEtp
-EPCjjvbdCDpBWJmG
-DoCkKvbdmIdTqVRa
-EOcKjvbdptUHRqjt
-DnbjjvbdRpTfifDw
-DncKjvbdaRebgtFk
-EPDLKvbdEARiMyvw
-EOcKjvbdyNsHxShc
-DoCkKvbdxKwDgzyf
-DncKjvbdwuNFQyLn
-DncLKvbdegjvSORH
-DncLKvbdOStWGdtp
-EOcLKvbdcTCkTdKB
-DncKjvbdRECaQRES
-DoDLKvbdkIHMFemk
-EPCkKvbdfjfzcGAE
-DncKjvbdZLqdTnLm
-EOcKjvbdIMBzmwRL
-EOcKjvbdwzHeexFS
-EPCjjvbdKVuFdFHJ
-EPCjjvbdRXODcLgc
-DoDLKvbdlrZVZrdJ
-EPDKjvbdjKGIJmYS
-EObkKvbdHEKujCJj
-DncKjvbdNddTiIjd
-DoDKjvbdZjSgpGaf
-DoCjjvbdmfeXlnHZ
-EPCjjvbdRosfifDw
-DoCjjvbdZxcinDLr
-DoCjjvbdNeDsiIjd
-EPDKjvbdVgxVwgYz
-DnbkKvbdqTtGrRjt
-DnbkKvbdTqQntuIN
-DncKjvbdBvzdJEpW
-EPCjjvbdqUUHRrLU
-DnbjjvbdqcdhonWB
-DncKjvbdHDkWKBjK
-DnbkKvbdxVMeQxlO
-EObjjvbdkClKpgVH
-EOcLKvbdCSaDUGXS
-DncLKvbdUQqOttgm
-DoCkKvbdZxcjOClS
-EPDKjvbdVqmxCFMD
-DnbjjvbdqmZixlHi
-DnbjjvbdiUydvquC
-DoCkKvbdOTTugFVQ
-EOcKjvbdUQpoVVIN
-DoCkKvbdNHDPlpVL
-EOcLKvbdDncLKwCd
-EOcLKvbddeOrCXCj
-EObjjvbdqvolChyR
-EOcLKvbdaofgELzd
-DoDLKvbdrpVoKDWG
-DncKjvbdaMjasUmH
-EObjjvbdliETqUrB
-DncLKvbdXsLaMtOx
-EObkKvbdrykpTAhO
-EPDKjvbdehKvRmpg
-EObjjvbdUxhTzKnn
-DncLKvbdTfznMXVe
-EPDLKvbdqUTfqqkU
-DoCjjvbdHELWKCKK
-DoDLKvbdwuNFQyMO
-DoCjjvbdffLynGgA
-EOcLKvbdSLYetfkT
-EPDKjvbdtTRryZeD
-EPDKjvbdddoRbXDK
-DoDKjvbdFVxooljF
-DoDLKvbdxsNiNSCH
-DoDLKvbdsCGNMGkZ
-EOcLKvbdkHfkfFnL
-EPCkKvbdqrUjnLAm
-DnbkKvbdHELViajK
-EOcKjvbdNHDQMouL
-EPCkKvbdWWhxVdFH
-DnbkKvbdUWMPitBR
-DncLKvbdZoOJFFZj
-DncKjvbdcIljKewY
-DoDLKvbdVUNUGLvK
-EObkKvbdNsTufdtp
-DnbjjvbdGKdsCgmV
-EObkKvbduDCtwWPP
-EObjjvbdkMbMZeGo
-EPCkKvbdJSyAsNXl
-DnbjjvbdmbJwXnmu
-EPCkKvbdRjxeuGkT
-EObkKvbdaSFcITek
-EPDLKvbdGYtuAdYC
-DoDKjvbdFeirNiUR
-EPCjjvbdhyuGMQmf
-EObjjvbdDxYLstUM
-EObkKvbdFfKRmhtR
-DnbkKvbdyTNhmSCH
-EPCjjvbdJSyAsNYM
-EPCkKvbdEuxpQMie
-DoDLKvbdkClLQgUg
-DnbkKvbdssRrxzEc
-EPDLKvbdRMwbZNtz
-EPCkKvbdssSTYyeD
-DoCkKvbdYqMeImEq
-EOcLKvbdjuwOECXw
-EOcKjvbdOTUWHFUp
-EPCjjvbdliDtQtrB
-EPDKjvbdZxdJmblS
-DoDKjvbdbVCHXkTh
-DoDKjvbdpstHSRjt
-EOcLKvbdNPwpunGs
-DoCkKvbdLAjgNCXq
-DoCjjvbdDoDKjvbd
-DoCkKvbdZirgpHBf
-EPDLKvbdezuxdiTw
-DoCkKvbdLrXMyuQz
-DncLKvbdqlyjYkgi
-DnbkKvbdLrWlzUpz
-DoCjjvbdhytfLpnG
-EObjjvbdxrmiNSBg
-EPDLKvbdqquLNjaN
-EObjjvbdiHKCyVjV
-DncKjvbdjSziTKiz
-EPCjjvbdCflGHAzc
-EPCjjvbdZtJJZDrn
-EPCjjvbdJKEAKQHE
-EPDKjvbdIxTbHlRQ
-EOcKjvbdZRMdhmEq
-EOcLKvbdmttykJqf
-DncLKvbdEzsqFMDJ
-EPDKjvbdJuteceGi
-EOcKjvbdemFvfmJk
-DoCkKvbdkySqsZGt
-EOcLKvbdlrZVZsDi
-EOcLKvbdEXxLstTl
-DnbkKvbdkNBlZeHP
-DncLKvbdauCHYKsh
-EPCkKvbdhuZeXSVC
-EPCjjvbdOTTufdtp
-DoDKjvbdDoCkKwCd
-DoDLKvbdOAIrsirA
-EPCjjvbdlAmPNALA
-EOcLKvbdiBoCdwQq
-DoCkKvbdnCJwYOnV
-EOcLKvbdqwQLbhxq
-DncLKvbdGYuVBEYC
-EPCjjvbdcyyQXxqC
-EPDKjvbdrEEiPmvB
-DnbkKvbdJbibqJbx
-DncLKvbdiGjCxuiu
-EObjjvbdjKGIJmXr
-EPCjjvbdFkEsDIMu
-EPDKjvbdCWzchePv
-EObjjvbdEObjjwDE
-EPCkKvbdQdDApRDr
-DoDLKvbdbAvEfQPw
-DoDLKvbddtAUATNW
-DnbjjvbdUxhUZkOn
-DnbjjvbdwNWANEEm
-EPCjjvbduDCuWuoP
-DnbjjvbdjAQHApHK
-DncLKvbdJzpFxEAN
-DncKjvbdwtldpxlO
-EObjjvbdBraCtGWr
-EPDKjvbdJmADzGuB
-DoDLKvbdRadEkiZL
-DoCkKvbdAMhZTXZx
-DoCjjvbdqGDeUVaI
-DoCjjvbdVvhxWDdg
-EOcKjvbdSBceMIyL
-DnbkKvbdRkYfUfjs
-EOcLKvbdFWYpQMjF
-DoDLKvbdhlFENuCy
-EObkKvbdiCObeWpq
-DnbkKvbdHELWJaij
-EObkKvbdCTAcTfWr
-EPDKjvbdbrcLTdJa
-DoDLKvbdDncKkXDE
-DoCkKvbdmSYtzSdJ
-EOcLKvbdVZHszLPO
-DnbjjvbdhkdcmuCy
-DnbkKvbdLrXNZuQz
-EPDKjvbdZnmiFEzK
-EPCkKvbdlrZVZsEJ
-DnbjjvbdqmZixkhJ
-DoDLKvbdcTCjsdKB
-DoCkKvbdcyyPxYqC
-DoDKjvbdssRrxydc
-DoDKjvbdvPTzpjnt
-EObjjvbdZLqctOMN
-DoDLKvbdRNXbYnUz
-DncKjvbdJYUBglRQ
-EObkKvbdkIGlGFnL
-DoDLKvbdiUzEwSUb
-EPDKjvbdeEnrCWbj
-DoDLKvbdRbDdkhxk
-EObjjvbdYzcFqjWZ
-EOcLKvbdjggLfFnL
-DncLKvbdgQBzwEXh
-DoCjjvbdQlxByNtz
-DnbkKvbdoznDjwoA
-DnbkKvbdVgwuxHYz
-DoDLKvbdaaVdepQX
-DoDKjvbdLZRKSztf
-EPDKjvbdbUbHXkUI
-EOcLKvbdjhGkfFmk
-EObkKvbdeEoSBvcK
-DncKjvbdUtMtGMVj
-EPDLKvbdJTZAsMxM
-DnbkKvbdOEdUJJKd
-DoDKjvbdZHXEAPSi
-EObkKvbduaDyTPFI
-DnbjjvbdqAiFAWhE
-EObjjvbdelevgNKL
-DnbjjvbdTAEhgbPE
-DoDKjvbdnPzZVkZC
-DoDKjvbdQwNdDLhD
-DnbjjvbdnBjWwoNu
-EObkKvbdfMewGljL
-DncKjvbdrpVnjCuf
-EPDLKvbdLGFgbBRV
-EObkKvbdkCkkRHUg
-EObkKvbdTlVoAuoJ
-EPDLKvbdrMyjZMHi
-EOcLKvbdWHwuxHYz
-EOcKjvbdLrXNZtpz
-EObjjvbdbQHHDkzd
-EOcLKvbdfILWRnRH
-EPCjjvbdyfyMAMeX
-DncLKvbdNHCpNQVL
-EPCjjvbdFkEsDHlu
-DncKjvbdGGJqmhtR
-DnbkKvbdvAcxrndh
-DoCjjvbdqGDeTvBI
-DoCjjvbdJvUfDdgJ
-DoCjjvbdUVlPisaR
-DoCkKvbdqTsgSRkU
-EObjjvbdjblKpftg
-EObkKvbdtcDVXWPP
-DnbkKvbdfHkVqnRH
-DncLKvbdmoyxvLZC
-EObjjvbdkHfkfFnL
-EPDKjvbdwNWAMcdm
-EPCjjvbdJpzFOfNe
-DncKjvbdmbJvxOnV
-DncKjvbdTqQnuUgm
-EOcLKvbdTpqOuVHm
-DoCjjvbdYlSETmkm
-DoDKjvbdjEkGuPAO
-DoCkKvbdwygefXdr
-EObkKvbdrXPkcJYq
-DoCjjvbdxUleQyMO
-EOcLKvbdBsAcTfXS
-EPDLKvbdLBLGlbXq
-EObjjvbdmbJvwnnV
-DnbjjvbdbVCGwjsh
-DnbkKvbdxUmEpyMO
-EPCkKvbdYSlBNTnx
-DoDKjvbdeOeSkUTr
-DncLKvbdqmZixlHi
-EPCkKvbdNHCpNQVL
-DoCkKvbdDigjWXjA
-EObjjvbdrDeJQNvB
-EOcLKvbdJuuGDeHJ
-DoCkKvbdddnrCXCj
-DoDKjvbdqTtGqrKt
-DoDKjvbdeOeTKstS
-EObjjvbdySmiNRbH
-DnbjjvbdZshiYdTO
-EObjjvbdnCKXXnmu
-EPDKjvbdqiAKFMne
-DoDKjvbdNeEUIiKd
-DnbjjvbdzitpPdTU
-EPCkKvbdzaAOffal
-EOcKjvbdZtIiZDrn
-DoCjjvbdtSrTYyeD
-DoDLKvbdFVxopNJe
-DoDLKvbdJJdAJpHE
-DoDLKvbdHDjuiaij
-EObkKvbdUWMQKUAq
-EPDKjvbdTpqOuVIN
-EOcLKvbdqvpMChyR
-DoCkKvbdVviXudEg
-DoCkKvbdGLErbgmV
-EPCkKvbdZirhPfbG
-DoCkKvbdWXJYVceH
-DnbjjvbdhkeEOUcZ
-DncKjvbdSPtHJedX
-DncKjvbdFfKRnIsq
-DncKjvbdWWhxVdEg
-DoCkKvbdOStWHEuQ
-DoDLKvbdEuyQPmKF
-DncKjvbdrpVoKDWG
-DoCjjvbdKVtfEEfi
-DoCjjvbdWXIwudEg
-EPDKjvbdSCDeMIyL
-EPDKjvbdDoDKkXCd
-DoCkKvbdJpzEnenF
-EPDKjvbdaaWEfPow
-DoCjjvbdVwJXucdg
-EPCjjvbdauCHYKtI
-EOcLKvbdNeDshhkE
-DncLKvbdNGcQMpVL
-EOcLKvbdIryBSmXl
-DnbkKvbdTAFJICPE
-EOcLKvbdrMzKYlHi
-EOcKjvbdznopeDMY
-EOcLKvbdMRvmZuQz
-DncKjvbdeFOqbXCj
-DncLKvbdbhlijfWx
-EOcKjvbdqdEhpOWB
-DoDLKvbdUWMQJsaR
-DoDLKvbdptUGqrLU
-EObjjvbdaSGChUFk
-EPCjjvbdYTMAltOx
-DncKjvbdEPCkLWbd
-EOcKjvbdKCjDRKCx
-EPDKjvbdZyDjNcMS
-DncLKvbdFfKRnJUR
-EPDKjvbdrNZiyLhJ
-EOcKjvbdZeXfzgiC
-EOcKjvbdbUbGwkTh
-EPDLKvbdHfgZxwxH
-DncLKvbdrovOjCuf
-DnbjjvbdfNGWflik
-DnbkKvbdZoNiFEyj
-EPCjjvbddneTKtUS
-EObjjvbdRbDdlIxk
-EOcKjvbdKfFgbBRV
-EPDKjvbdFyUuBDxC
-EPCkKvbdiUzFXRtb
-EPCjjvbdrJAJeNPF
-DncLKvbdVAbRSqSZ
-EObjjvbdaNKbTVMg
-DoCkKvbdlhctQtqa
-DoDKjvbdZshiZDrn
-EPDLKvbdFkFSbglu
-EPCjjvbdHffyxwxH
-DncKjvbdTvLojTaR
-DnbkKvbdauCHXkUI
-DoDKjvbdGdKuiajK
-EOcKjvbdkClKqHVH
-EPDLKvbdnUtykKSG
-DnbkKvbdBiKbKhej
-DoDLKvbdHffzZXwg
-EPCjjvbdbrbkTcjB
-DoCkKvbdVwJYWDdg
-DncLKvbdJJdAJogE
-EPCkKvbdJvUfDdfi
-DoDKjvbdZeYGzgiC
-EObjjvbdZyEJnDMS
-EOcLKvbdmSZVZsEJ
-EPCkKvbdDnbjjvbd
-EPCkKvbdJvVGDeGi
-DoCjjvbdTXkLmzkY
-DnbkKvbdLqwNZuQz
-DncKjvbdZtIiYcsO
-DoDKjvbdLYqKSztf
-DnbkKvbdULuoBVni
-EObkKvbdiBnbeWqR
-EObjjvbdfILWRmqH
-DncKjvbdezvYdhsw
-DnbjjvbdJvUfEEfi
-EPCkKvbdRpUHKGDw
-EObkKvbdZGwEAPTJ
-EOcLKvbdcTCkUEKB
-EObjjvbdGAoQxizm
-DnbjjvbdNwoVzcmt
-DncLKvbdJbicRKDY
-DnbkKvbdGZVVAcxC
-EPCkKvbdRadFMJYk
-DnbjjvbdxsNiNRag
-DnbjjvbdiBncFXRR
-EPCjjvbdySmiNRbH
-DoDKjvbdeATqMxKG
-DnbjjvbdtSrSyZdc
-EOcKjvbdwtldpyLn
-EPDKjvbdqwPkbiYq
-EPDLKvbdzitpPcsU
-DoDKjvbdDjHiuwjA
-EPCkKvbdfMewGmKL
-DncKjvbdlrYtyrci
-EPCjjvbdZQldiMdq
-EPDKjvbdJbjDQjCx
-DncKjvbdqTsgRrKt
-EPCkKvbdEvZQPljF
-DoCkKvbdUsltGMWK
-EOcLKvbdEJgivXjA
-DnbkKvbdePFTLTtS
-EPDKjvbdEYYLstTl
-EPDKjvbdMfcPmPuL
-DoDKjvbdBsAcTevr
-EPDLKvbdwtleRZMO
-EObjjvbdRotHJfDw
-EOcKjvbdJuuFdFHJ
-DnbjjvbdZoOIeFZj
-DoDLKvbdsZlQSaHn
-EPCjjvbddoFTLTtS
-DncKjvbdbVBgXjsh
-EPCkKvbdaMkBrtlg
-EPDKjvbddiiqutzn
-EObkKvbdiZuFkpnG
-EPCkKvbdIxTaglRQ
-EOcKjvbduaEYrndh
-DnbjjvbdzQoMiJwA
-DoCkKvbdsCGNMHKy
-EObjjvbdMoxQunHT
-DnbkKvbdxwiJbPzL
-EOcLKvbdJbibpjCx
-DncKjvbdIxTbHkpp
-DoCkKvbdwuMeQxlO
-EOcKjvbdKeehCBRV
-EPCkKvbdZxdKNblS
-EPCjjvbdLFegbBQu
-DoCkKvbduLwwBUBX
-DoDKjvbdjlbMZeHP
-DoDLKvbdjAPfaPfj
-EObjjvbdqGEFTvBI
-EObjjvbdeAURNXif
-EObjjvbdxmrgxTJD
-EPCkKvbdqGDeUWAh
-DncKjvbdqTsfqrKt
-EObjjvbdjEjftoAO
-EOcKjvbdNrtWHFUp
-EObkKvbduCcUvvOo
-EPCkKvbdvwMAvBWV
-DncLKvbdtkwwBUBX
-DoCjjvbdVZHsyjnn
-EPDKjvbdQccBQQdS
-DnbkKvbdjgfkeemk
-EPDLKvbdFyVVBDxC
-DncLKvbdrNZiyMIJ
-EObjjvbdHfgZxwwg
-DoDKjvbdqceIomvB
-EPCkKvbdNGcPlouL
-DoCkKvbdCIkBkIej
-DoCjjvbdjKFhJmYS
-EObkKvbdBsBDUGWr
-EObkKvbdnQZxvKyC
-DnbjjvbdhzVFkqOG
-EPCjjvbdGLFScHlu
-DoCjjvbdtlXwAtBX
-DoDLKvbdUtMtFkvK
-DoCkKvbdBvzchdov
-DncLKvbdlZSrTZHU
-EOcKjvbdZnnJEdyj
-DncKjvbdYpleJMdq
-EPDKjvbdiMEcmtcZ
-EPCjjvbdfelZmgHA
-DnbkKvbdLhalRYAS
-DncKjvbdehLWRnRH
-DnbjjvbdeKJqvUzn
-EPCjjvbdqqtkOLBN
-EOcLKvbdfRaWzlDP
-DncLKvbdhtzFWquC
-EObkKvbdJvVFdFGi
-EObkKvbdMfcPlotk
-DoCjjvbdtcCuWvPP
-DnbjjvbdwtmFRZMO
-DoDKjvbdsPvPKCvG
-EPCjjvbdmfdwmOHZ
-EPDLKvbdMgDPlouL
-DoDKjvbdnGdwlnHZ
-DoCkKvbdVwJXudFH
-EObjjvbdQdCaQQcr
-DnbkKvbdYSkaNUPY
-DoCjjvbdULvPAuni
-EPCjjvbdSZihScWA
-DoCkKvbdBiLCKhej
-DnbkKvbdhXZAzzAJ
-EOcLKvbdQYmAGsRj
-EOcLKvbdZtJIyDrn
-DnbkKvbdNsTufduQ
-EOcKjvbdEXxMUTsl
-DoDLKvbdKyRJrzuG
-DoDKjvbdrWpLbhxq
-DnbjjvbdrDeIonWB
-EPDKjvbdHELViaij
-DoDLKvbdBdQBWJmG
-DncLKvbdRjyGUfkT
-EPDLKvbdYNqAYUut
-EPDKjvbdRXNdClID
-EPCkKvbdNwnuzdOU
-EOcLKvbdjmBkydfo
-DoCjjvbdrpWPKDVf
-EPCkKvbdZyEKNbkr
-EOcKjvbdQZNAHTRj
-EOcKjvbdwtmEpxkn
-DncLKvbdLhbMRYAS
-DoCjjvbdsrrTZZdc
-DncKjvbdxmrgxShc
-EPCkKvbdmozZVkZC
-EPCjjvbdbsDLTcia
-DoDKjvbdGKeScIMu
-EPCjjvbdrEFIpOWB
-EOcKjvbdmpZxukZC
-DoCkKvbdTkunaVni
-DoCjjvbddneSkUUS
-EPCjjvbdTlVoBWPJ
-DoDKjvbdxsNhmSCH
-EPCkKvbdVviXvDdg
-DnbjjvbdwzHfFwdr
-EPDKjvbdfMewHMjL
-DoCjjvbdbsDKtDjB
-EPDLKvbdUQpoVVIN
-EObkKvbdrEFJPmua
-EObkKvbdhlEcnUcZ
-DoDKjvbdZRMeIleR
-DnbjjvbdmajXYOnV
-DoDKjvbdaRfDHtGL
-DoCjjvbdbhljKewY
-DoDLKvbdDwwksssl
-DncLKvbdUMWOaVoJ
-DncKjvbdWWiYWDdg
-DoCjjvbdyXiJbQZk
-DnbkKvbdHDkVibKK
-EPCjjvbdtSrSxzEc
-EOcLKvbdaSGChUFk
-DnbkKvbdYSlBNUOx
-EPDLKvbdJTZBSmYM
-DoCjjvbdTkvOaWOi
-DncKjvbdMowpvNfs
-EPDKjvbdeEnqavcK
-EOcLKvbdiifIJlxS
-DnbkKvbdqceIpNua
-EPDKjvbdrNZixkhJ
-DncKjvbdiHKDZViu
-DnbkKvbdrDdiPnWB
-DncLKvbdLGFhCAqV
-DoCjjvbdwuMdqYlO
-EPCjjvbdePFTKssr
-EObjjvbdVBCQrpqy
-EObjjvbdbrcKsdKB
-DnbkKvbdBvzciEpW
-DoCjjvbdIHGyyXxH
-EObjjvbdrzLpTAhO
-EOcKjvbdemGWgNJk
-EObkKvbdVZHtZjnn
-EOcKjvbdiCObeXRR
-EPCkKvbduoTzpkPU
-DoCkKvbdrNZjYkgi
-DnbkKvbdTAEhgand
-EOcKjvbdhuZdwRuC
-DoDLKvbdWWiXuceH
-EPDKjvbdZoOIddzK
-DncLKvbdVAbRSprZ
-DnbjjvbdhgKDZWJu
-DoCkKvbdVZITykOn
-DoCkKvbdiGibyWKV
-EPDLKvbdwyhGGYFS
-DoDKjvbdiHKCxvJu
-EPDLKvbdhyuGLpnG
-EPDKjvbdOAJStKSA
-EOcKjvbdzitpPdSt
-DoCkKvbdzROlhjXA
-DoDLKvbdtTSSxzEc
-DoDKjvbdzoQRFCkx
-DnbkKvbdxnSgxShc
-DnbjjvbdiBoDFWqR
-DoCjjvbdnBjWwoNu
-DncLKvbdVYhTzKnn
-DncLKvbdkIGkefNk
-DnbkKvbdlqxuZsEJ
-EOcLKvbdACrYJzIp
-EPDKjvbdmaiwYOnV
-EOcKjvbdYkrEUNlN
-DoCjjvbdVUNTfLuj
-DoDLKvbdfHkWSOQg
-DnbkKvbdBraCsfXS
-EOcKjvbdMJBkpxAS
-DoDKjvbdcyyQXyQb
-EObkKvbdeEnrCXDK
-EObkKvbdFejSNiTq
-DoCjjvbdEYXkstTl
-EPDKjvbdyYIjBpZk
-DncKjvbdiHJcZWKV
-DncKjvbdQdDAoqDr
-EObkKvbduDDUvvOo
-EPCkKvbdzGyMANEw
-DoDKjvbdQvnECkgc
-DncKjvbdVviXudEg
-DoDLKvbdQZNAHTSK
-EPDKjvbdkCkjqHUg
-EObjjvbdwyhFeweS
-DoCjjvbdxwiJbQZk
-EOcLKvbdEPDLLXDE
-DncLKvbdVrNwbFLc
-DoCkKvbdjAPgBPgK
-EOcKjvbdpstGqqjt
-EPDLKvbdHDkVjCKK
-DncKjvbdirzhrjiz
-DnbjjvbdxrnJNSBg
-EPCkKvbdraelkgLZ
-DncLKvbdptTgRqjt
-DoCkKvbdIsYaTMxM
-DoCjjvbdMpXqVnGs
-DoDLKvbdUVkoitBR
-DoCkKvbdjmCLyeHP
-DoCjjvbdiVZeWquC
-DoCjjvbdVUMtFlWK
-EPDLKvbdxKvdHzzG
-DoDKjvbdiMEdNuCy
-EPDKjvbdwzIFfYEr
-EObjjvbdJXsagkpp
-EPCkKvbdxrmhmSBg
-DoDKjvbdlqxuZsDi
-EPDKjvbdsQVoJcVf
-DnbjjvbdEYYLstUM
-DncLKvbdkHgLfGNk
-EPCjjvbdbsDKtDjB
-DnbjjvbdJcKDQibx
-DoCjjvbdyzdnSIIh
-DnbkKvbdrpWOjCuf
-EObjjvbdbAudeopX
-DnbkKvbdYkqctNlN
-EPDLKvbdfHkWRnRH
-EPDLKvbdXmqAYUut
-DncKjvbdFyVVBEXb
-DnbkKvbdrDdhpNua
-DncKjvbdeAURNXjG
-DoCkKvbdOTUVgEuQ
-EPCjjvbddwyssrFz
-DoCjjvbdMpYRWNfs
-DoCkKvbdjuvnDaww
-DnbkKvbdVhXvXgYz
-EObjjvbdTulQKTaR
-EObjjvbdOAJTUJrA
-EPDLKvbdsZkosBIO
-DoCkKvbdhgJbxvKV
-EPCjjvbdnBivxOnV
-DncKjvbdxrnIlrCH
-DncLKvbdzaAPHGbM
-EPCkKvbduMXvaUBX
-DnbkKvbdSBceMJZL
-EObjjvbdJpzEoGOF
-DnbkKvbdWexytAPT
-DnbkKvbdkVwNcaxX
-EOcLKvbdEYYLsstM
-DoCkKvbdRosfiedX
-EOcKjvbdwuMdpyMO
-EObjjvbdUsmUFlWK
-EObjjvbdjuwOECXw
-DncKjvbdqlzJxkgi
-DoCkKvbdiHJbxujV
-EPDLKvbdakMFoNcA
-EOcLKvbdmIcsqUqa
-EPCkKvbdeKKSVtzn
-EPCkKvbdvBEZTOeI
-DncKjvbdpstHSRjt
-EOcKjvbdKVuGEEfi
-DoDLKvbdZQldiNFR
-EPCjjvbdxnTIYShc
-EOcKjvbdtunXjQsA
-EPDKjvbdjcLkRHVH
-DncKjvbdDoDLLXCd
-DnbjjvbdZyEJnDMS
-DoDLKvbdFkFTCgmV
-EOcKjvbdhkddOUby
-EPDLKvbdNeEUJIkE
-DnbkKvbdyzeNqghh
-EPDKjvbdFVxopMjF
-EOcKjvbdGdLVibKK
-DncKjvbdBdQAvJlf
-DoDKjvbdbiNKLFwY
-EPCkKvbdnGeYNNgZ
-EPDLKvbdEYXlUTsl
-DncLKvbdOEcsiIjd
-DncKjvbdKaLHMbYR
-DncKjvbdyTOIlrCH
-EPCkKvbdMpXpumgT
-EPCjjvbdtbbtwVno
-DoDKjvbdrRtkOLAm
-EObjjvbdbLLfPNcA
-DncKjvbdjmCLydgP
-DnbkKvbdTkuoBVoJ
-DnbkKvbdSCDdlJYk
-EObkKvbdCEPaVjNG
-DoDLKvbdFaOpxizm
-EPCjjvbdfMevgMjL
-DoCkKvbdYzcGRjVy
-DnbjjvbdKRZdoGNe
-EPDLKvbdZisIQHCG
-EOcLKvbdZMSEUOMN
-DoCjjvbdiGibxuiu
-EPDLKvbdZQmFJMeR
-DoCkKvbdsBemLfjy
-DncLKvbdzoPqEcMY
-DncLKvbdMoxRWOGs
-EOcLKvbdFeirOJUR
-DoDLKvbdpyOgfpdY
-DncLKvbdyzeOSIJI
-DoDLKvbdRkZFuHKs
-DnbkKvbdxVNEqZLn
-DoCjjvbdMgDPmPuL
-EPDKjvbdZQmEhmFR
-DncKjvbdBraDUFwS
-DoCkKvbdqqtjmkAm
-EPDLKvbdLZQirzuG
-DoDLKvbdlYsRryGt
-EOcKjvbdKaLHNBxR
-EOcKjvbdTqQoUthN
-EObkKvbdhbObeXRR
-EPDKjvbdJutfDeGi
-DoDLKvbdRkZFuGkT
-EOcKjvbdrbGNLgKy
-DnbjjvbdmpZyWKyC
-EPDKjvbdHELVjBij
-EPCjjvbduDDUvuoP
-EOcKjvbdrDeIonWB
-DoCjjvbdnPyyWLZC
-EPDKjvbddndrjtUS
-EObjjvbdjuvnDbYX
-EPDLKvbdCIkBjhfK
-EObkKvbdZjTHogCG
-EOcKjvbdjJehKNYS
-DnbkKvbdSxLMNzkY
-DoDLKvbdKDKDRJcY
-EPCkKvbdmpZxvKxb
-DnbjjvbdssSTYyeD
-EObjjvbdHDkVibJj
-DnbkKvbdSLZFtgLT
-DoCjjvbdxnTIXriD
-DnbkKvbdcSbjsdJa
-DoCkKvbduoTzpjoU
-DoCjjvbdXsLaNUOx
-DoDLKvbdcScKtEJa
-DnbkKvbdfpBzwDwh
-EPDKjvbdjlakyeGo
-DnbjjvbdYzcFqivZ
-DncLKvbdCIkBjiGK
-EPDLKvbdxZhFfYFS
-EObjjvbdrEFJQNvB
-DoDLKvbdjAPgBQHK
-EOcLKvbdkDLjqHUg
-DoCkKvbdiUzFWqtb
-DoCkKvbdKVtfDdfi
-DoDLKvbdwkXEHzyf
-EObjjvbdqcdhpOWB
-EPCkKvbdeEnrBvbj
-DoCkKvbdCTAbsewS
-DnbjjvbdNHCpMouL
-DoDKjvbdSQUGiecw
-DoDLKvbdelevfmKL
-DoCkKvbdySnImSCH
-DncKjvbdANIZSvzY
-DncKjvbdrJAJeNPF
-EPCjjvbdqTtGqqjt
-EObjjvbdaRfDHsfL
-EPCkKvbdrJAJeMne
-EPDKjvbdiGjDYvJu
-DoDKjvbdMgCpMpVL
-DncKjvbdZjTIQHCG
-EOcLKvbdJYTbILqQ
-DoCkKvbdzoPqEbkx
-EPDLKvbdvlvANDeN
-DncLKvbdatafwjsh
-DncLKvbdJuuFcdgJ
-DncLKvbdwXMAvBWV
-DoDLKvbdaMjbStmH
-DoCkKvbdeOdsLTtS
-DoDKjvbdbLLeoNcA
-EPDKjvbdJKEAJpGd
-DnbjjvbdZnnIeEyj
-EOcLKvbdunszpjnt
-EObkKvbdmoyyWKxb
-EObkKvbdILazmvpk
-EPDKjvbdQlwbYmtz
-EPCjjvbderAvzkcP
-EObkKvbdegjvSORH
-EOcKjvbdsrqsYydc
-EOcKjvbdfIKvSORH
-DnbkKvbdFjdsDIMu
-EPDKjvbdpstHRqjt
-EOcLKvbdWRmxCElD
-EOcLKvbdkHflGFnL
-DoCjjvbdZjTHofbG
-EObjjvbdeEoSBwCj
-EPCkKvbdJSyBTNXl
-DnbkKvbdUaCRTQqy
-EPDKjvbdSLZFtfkT
-DncKjvbdyNrgwsJD
-DoDKjvbdezuxdiUX
-DoDLKvbdACrXiyhp
-DoDLKvbdxwiJaoyk
-EOcKjvbdUxhTzLOn
-DnbjjvbdnHFYNNfy
-EOcLKvbdhanbeWqR
-DoDKjvbdzHYlAMdw
-DoCjjvbdKyRJrzuG
-DncLKvbdliETpuRa
-EObkKvbdczYpXyRC
-DoDKjvbdFfKRnIsq
-EPDKjvbdVAbQsRSZ
-DncKjvbdezvZEiUX
-DoCkKvbdZisHofbG
-EPDKjvbdjKFgilxS
-EOcLKvbduVmxKQsA
-DnbjjvbdhuZeWrUb
-EObkKvbdGYuUaDxC
-DoDLKvbdaaWFGPpX
-DnbkKvbdUQpoVUhN
-EPCjjvbdZxdJmcMS
-DncKjvbdhbPCdwRR
-EObkKvbdZRMeJNFR
-DnbjjvbdTlVoBWOi
-DoCkKvbdatbHYKtI
-EObkKvbdiHJbxvJu
-DncKjvbdsQWOjCvG
-DncLKvbdRosfjGEX
-EObkKvbdREDBQRDr
-EOcLKvbdeEnqawCj
-EPDLKvbdGZVUaEXb
-EPDLKvbdIryArmXl
-EObjjvbdiiehJlwr
-DoCkKvbdMJCMRYAS
-DnbkKvbdlrYtzTDi
-DoDLKvbdnGeXlmfy
-DoCkKvbdSCDeMJZL
-EObkKvbdLFegaaRV
-DoDKjvbdGGKRmhsq
-EObkKvbdiLdcnVDZ
-DnbjjvbdGBOqZJzm
-DnbjjvbdhfjCxvKV
-EPCjjvbdlBNPNALA
-EOcKjvbdtbbuXWPP
-DncLKvbdEPCjjwDE
-DoDLKvbdLqwNZtpz
-EPDLKvbdbVCGwkUI
-DncLKvbdZyDimcLr
-DncLKvbdfILWSNpg
-DoDKjvbdFVyPpNJe
-DncKjvbdqiAJeMoF
-EOcKjvbdqrVLOLAm
-DoCjjvbdehKuqnQg
-DoDLKvbdGLFTCglu
-DoCjjvbdXrlBMtPY
-DncKjvbdlYrrTYgU
-EPCkKvbdWSNxCFMD
-DncKjvbdUVkoitAq
-DncLKvbdfHjvSORH
-DoCkKvbdCEPaWKMf
-EObkKvbdmbJvxPOV
-EPDKjvbdwzHefXeS
-EOcKjvbdvvlAvAuu
-DncLKvbdpxngfqDx
-DnbjjvbdIwtCIMQp
-DncKjvbdHDjvKBjK
-EOcKjvbdjmCLzFGo
-DnbkKvbdZMRdTnMN
-EObjjvbdEOcLLWbd
-DoDLKvbdkNBlZdfo
-EPCjjvbdemGXHNKL
-EOcLKvbdkxrqryGt
-EOcKjvbdsPvPKDWG
-EOcKjvbdXsMAlsoY
-DnbkKvbdmIcspuSB
-DoCjjvbdUaBpsRRy
-EOcLKvbdSPsfiedX
-EOcKjvbdSCEEkiYk
-DncKjvbdWXJXudEg
-DncLKvbdRyigrbvA
-DoDLKvbdUMVoAvOi
-DnbjjvbdZtIhxcsO
-EOcLKvbdJXsbHkpp
-DnbkKvbdZtIhyETO
-DncLKvbdHlBzmvpk
-EObkKvbdzHZMAMeX
-EPDKjvbdKCjCpjDY
-EOcKjvbdjblKqHUg
-DoDKjvbdGGJrNiUR
-DoDLKvbdrEFIomvB
-EPCkKvbdrovPKDVf
-DoDKjvbdpxnhGpdY
-EPDKjvbdemGWgNKL
-EPDLKvbdTlWPAuoJ
-EOcLKvbdhuZeWqtb
-DnbkKvbdhyuGLpnG
-EObjjvbdSBcdlJZL
-DnbkKvbdeEnqbWcK
-DnbjjvbdJKEAJofd
-EObjjvbdbQGfckzd
-EPCjjvbdRkYeuHLT
-DoDLKvbdXrlBMtOx
-EObkKvbdznoqFCkx
-EPDLKvbdjggLfFnL
-EPDKjvbdhuZdwSVC
-EPCkKvbdeEoRbXDK
-EPCkKvbdKaKgNCYR
-DoDLKvbdWWhxWDdg
-EPCjjvbdqUTfqqjt
-EOcKjvbdcSbkTdJa
-DncKjvbdauCHXjtI
-DoCkKvbdQlwbZNtz
-DnbjjvbdqvolCiYq
-EOcLKvbdePFSjstS
-EOcKjvbdhgKDZWKV
-EObkKvbdCgLfHAzc
-DncKjvbdnUuZkKSG
-DnbjjvbdlhctRUrB
-DoDKjvbdpyPHgREY
-DoCkKvbdjJegimXr
-EPDKjvbdfHkVrORH
-EPDKjvbdyTOIlqbH
-EPDKjvbdjKFhKNYS
-EPDKjvbdFWZPpMie
-EPCjjvbdIwsahLpp
-EObkKvbdKfGIBaQu
-DncKjvbdGFirOJTq
-DnbjjvbdpedFUWBI
-EPCkKvbdNeDshiKd
-EObjjvbdBiLBjhej
-EObjjvbdCJKbLJFj
-DncKjvbdvwMAuaWV
-DnbjjvbdZRMdhleR
-DncKjvbdhgKCyViu
-DoCkKvbdhficZWKV
-DnbjjvbdwkWdHzyf
-DncLKvbdVBBqSprZ
-EOcLKvbdUsmTelVj
-EOcLKvbdFxuVBEYC
-DoDKjvbdKaLHMbYR
-EPCkKvbdGdKuiaij
-EPDKjvbdfIKvRnQg
-DncKjvbdfekzNfgA
-DoCkKvbdJbicRJbx
-EOcKjvbdIwsagkpp
-DncKjvbdOEctIiKd
-DncKjvbdOTUVfduQ
-EPCkKvbdFWZPomKF
-EObjjvbdezvZFJUX
-DoCjjvbdtSrTYzFD
-DoCkKvbdbVCHYLTh
-EPDLKvbdZMRdUOLm
-DoDLKvbdNwoVzdNt
-EPDLKvbdFaPRZJzm
-DoCjjvbdxZhGFweS
-EPCjjvbdZQmFImFR
-DnbjjvbdsQWOibvG
-DoCjjvbdSBdFMIxk
-EPCkKvbdEObkKvcE
-DoDKjvbdqFcdsvAh
-EOcKjvbdezuyEhsw
-DnbkKvbdVqnXaeMD
-EObjjvbdnGeXlmgZ
-DncLKvbdCIkBkIfK
-EPDLKvbdpecdtWAh
-EPDKjvbdsQVnjCvG
-DoDKjvbdkDMLQfuH
-EObjjvbdAMhZTWzY
-EPCjjvbdiCObdvqR
-DoDKjvbdUWLoisaR
-DncLKvbdSPtHKGDw
-EObjjvbdaNLBrtmH
-EPDKjvbdUyHszKoO
-DoDKjvbdQwNccLhD
-EPDLKvbdnVUzKjRf
-DoCkKvbdRyigrcWA
-EOcLKvbdbiNKLGXY
-DncKjvbdlhctRVSB
-DoCkKvbdNPxRWNfs
-EObjjvbdANHxsXZx
-DnbjjvbdNrsvHEuQ
-EPCjjvbdmbJvxPNu
-EOcKjvbdJvVGEFGi
-EPDKjvbdUWLoitAq
-DoCkKvbdkDMKpfuH
-EOcLKvbdfjfzbfAE
-EOcLKvbdczZQYZRC
-DoDLKvbdQwNcblHc
-EObkKvbdOTTugEtp
-DncKjvbdbUagYLTh
-EPCjjvbdfNGWfmKL
-EObjjvbdiVZdvrUb
-DncLKvbdZyDinDMS
-EPCkKvbdmaiwYOmu
-EOcLKvbdqUUHSRkU
-DncLKvbdDncKjvbd
-DoCkKvbdVqmxCElD
-EPCkKvbdaRfDIUFk
-EOcKjvbdjKGIJlxS
-DncLKvbdkxrrTZHU
-DncKjvbdypnmIjXA
-DoDLKvbdJpyeOfOF
-DoDLKvbdwXMBVaVu
-DoDKjvbdKfFhCAqV
-DoCjjvbdIxTahLqQ
-EOcLKvbdADSYKZiQ
-DoCkKvbdMowpunHT
-EOcKjvbdgKfzbfAE
-EPDKjvbdhkddOVDZ
-EPDLKvbdemFwHMik
-EPCjjvbdUVlQKTaR
-DncLKvbdRWnECkhD
-DnbjjvbdkWXODbYX
-DoCjjvbdZeYGzghb
-DoCkKvbdSKyFtfkT
-DoDLKvbdBhkCLJFj
-DncKjvbdlhdTqVRa
-EPDKjvbdqqtjmjaN
-DoDLKvbdZjTHofbG
-EPDLKvbdJmADzHVB
-DoDLKvbdSBceLhyL
-EObjjvbdqwPlCiYq
-DncLKvbdYORAXtvU
-EPDLKvbdZnnJEdyj
-DoCjjvbduWNxKQsA
-EPDKjvbdWSNxCElD
-DoCkKvbdRjyFtgLT
-DoCkKvbdeOeSkUUS
-EOcKjvbdDihKVxKA
-EObjjvbdffLymgHA
-DoDLKvbdcScKsdKB
-EPDLKvbdlYsSSyGt
-DnbjjvbdGKeTDINV
-DoDLKvbdCTBCtGXS
-EObjjvbdEASIlyvw
-EPDLKvbdfMfWfmKL
-DoCkKvbdpstGqrLU
-DncLKvbdtlXwAsaX
-DoDKjvbdNrsvHEuQ
-EObjjvbdCTBDTfXS
-DoDKjvbdkMalZeHP
-DoDLKvbdQccBPqDr
-DnbkKvbdYqNEiNEq
-DnbkKvbdvBDyTOeI
-DnbjjvbdLAkGmBxR
-EObkKvbdLiBlRYAS
-EPCjjvbdTukpKUBR
-EObkKvbdhuZeWqtb
-DoDLKvbdZyEJmbkr
-DnbjjvbdxrmiNSCH
-EPCjjvbdKWVFdFHJ
-EPCjjvbdRWmcblID
-EPCkKvbdsQVoJcVf
-EPCkKvbdGcjuibJj
-DoCjjvbdJuteceHJ
-DnbjjvbdLLAhWAJy
-DncKjvbdULunaWOi
-EOcLKvbdHlBznXQk
-DoDKjvbdvBDxroEh
-DoDKjvbdzaAPHGbM
-DoDLKvbdUyITyjoO
-DnbkKvbduaDxroFI
-EObkKvbdAMhZSvzY
-EObjjvbdDoDKkWbd
-EObkKvbdGKdrbhNV
-EPCkKvbdmgFXlnGy
-EOcKjvbdzdzOzdzQ
-EPCkKvbdKkBHvAJy
-EOcKjvbdqAiFAWhE
-DoCjjvbdQvmdClID
-DncKjvbdMtsSKmAX
-EObjjvbdziuPpETU
-DoDKjvbddZyQYZQb
-EPDLKvbdauBgXkTh
-DnbkKvbdnCJvwnmu
-DoCjjvbdxUmFQyMO
-DncKjvbdXGYzUAPT
-EPDLKvbdOAJTUKSA
-DncKjvbddZyPwxqC
-EOcKjvbdqlzKYlIJ
-DnbjjvbdkVvnDaww
-DnbjjvbdZdxGzhIb
-DnbkKvbdDwxLtTsl
-EObkKvbdGKdrcHmV
-DncKjvbdTAFJHbOd
-DoDKjvbdEObkKvcE
-DnbkKvbdaNLCSuNH
-DoDLKvbdDxYLtTtM
-EObjjvbdVZIUZjnn
-DoCkKvbdNsUVfduQ
-EOcLKvbdGGKRmhtR
-EPDKjvbdbKlFnmcA
-DncKjvbdvvlAvBWV
-DoCjjvbdliEUQtrB
-DnbjjvbdjgfkfGNk
-EPDKjvbdlYsSTYft
-DoDLKvbdbKlGOnDA
-EPDKjvbdjAPfaPfj
-DnbkKvbdzGyMAMeX
-DoCjjvbdZnmhddzK
-EPCkKvbdIMBzmwQk
-EObkKvbdjEkHVPAO
-EPCkKvbdQccBPpdS
-EPCjjvbdhgKCxvJu
-DncLKvbdVgxVxHYz
-EOcKjvbdxVNFQxkn
-DoDKjvbdbLMGPNcA
-DncLKvbdGckWJajK
-DnbkKvbdrMyiyLgi
-EOcLKvbdKefICApu
-DoCjjvbdqFdEtWBI
-EPCkKvbdYSlBNUPY
-DoCjjvbdIwsbILpp
-EPCjjvbdmgFYMnHZ
-EObjjvbdQvmccMID
-DncLKvbdURQntthN
-EOcLKvbddxZtUSFz
-EPCkKvbdhtzFWqtb
-EOcKjvbdVBCRSpqy
-DncKjvbdtbbtvvOo
-EPCkKvbdczZQYZQb
-DnbjjvbdQwODcLgc
-EPDLKvbdtunXipsA
-DncLKvbdBhjajhej
-DoDKjvbdNrtVfduQ
-EOcLKvbdKWUfDdfi
-EObjjvbdpstHRrLU
-DnbjjvbdznpRFClY
-EPCjjvbdfNFvgMik
-DoCjjvbdUsltGLvK
-DnbjjvbdlqyVZsDi
-DoCkKvbdNPwqWOHT
-EOcLKvbdakLeoNcA
-DoDKjvbdsCGNMGkZ
-EPDKjvbdaRfDHsfL
-DoDKjvbdZtIhyDrn
-EPDLKvbdOStVgFUp
-EPCkKvbdeATplxKG
-DncLKvbdySmhlrBg
-DoDKjvbdnCKWwoOV
-DnbjjvbdDncKjvcE
-EOcLKvbdwzIGGXdr
-EObjjvbdmIdTqVSB
-DnbjjvbdUGznLwVe
-DncLKvbdTkvOaWPJ
-DncKjvbdyOSgwsIc
-DncKjvbdjmCLzFGo
-DoDLKvbdpssfqqkU
-EPDKjvbdmtuZjirG
-EOcKjvbdOFEThhkE
-DoDKjvbdIMBznWqL
-EPCkKvbdJvVFcdfi
-EPDKjvbdnBivxOmu
-EObkKvbdTvLojTaR
-DoCkKvbdMRwNZtpz
-EObjjvbdEARhlzXX
-DnbjjvbdcScLTcjB
-DncKjvbdxmrhXrhc
-DoDKjvbdEvZQQNKF
-DncLKvbdGLErcHmV
-DoDLKvbdFkFTChMu
-DoCkKvbdOFETiIkE
-EPDKjvbdnVUzLKRf
-EPDKjvbdmuUzKjSG
-EPCjjvbdwuNFQxkn
-DncLKvbdeATpmXjG
-EObjjvbdxUmEpxkn
-EPDKjvbdcSbkTcjB
-EPCjjvbdmbKXXoNu
-EPDKjvbdSQUHKFdX
-DoDKjvbdCTAbsewS
-EOcLKvbdVwJYVdFH
-DoDKjvbdZtIiYcsO
-EPDKjvbdhkeENtcZ
-EObkKvbdGBOpyJzm
-EPCkKvbdRMxCYmtz
-DoCjjvbdzjVPocsU
-DoDLKvbdrDdiPnWB
-EPCjjvbdFjdsDIMu
-DoDLKvbdSLZGUgLT
-EPDLKvbdKefHaaQu
-DoDKjvbdKCibpicY
-EOcLKvbdijGIJmYS
-EObjjvbdelfWgNKL
-DnbkKvbdbhmKKfWx
-DoDKjvbdSQUHKGEX
-EPCkKvbdnGdxMmgZ
-DncLKvbdJJdAKPgE
-EPDLKvbdmRyUyrdJ
-EOcLKvbdhzUfLqOG
-DoDKjvbdLAjgMaxR
-DoDKjvbdRosfjGEX
-EObkKvbdpssfqqjt
-DnbkKvbdjAQHAofj
-DncLKvbdidkHUoAO
-DoCkKvbdCIjbLIej
-DncLKvbdelfWfmKL
-DoDLKvbdxUleQxkn
-EPDLKvbdEvZQPljF
-DncLKvbdJbjDQjCx
-DncLKvbdyOTIXriD
-DoDKjvbdTulPjUAq
-DnbjjvbdJSyAsNYM
-EOcLKvbdbBVeGQQX
-EPCjjvbdbKkenmcA
-EPCjjvbdiGjDZWJu
-DncLKvbdcSbjsdJa
-EObkKvbdZtJIyDsO
-DoDLKvbdrafMkgLZ
-DoCjjvbdiMFDmuDZ
-DnbkKvbdnUtyjirG
-EPDKjvbdfNFvflik
-DoDLKvbdrWokcJZR
-DncKjvbdWWhxWDdg
-EPDLKvbdNeDtJJKd
-EOcLKvbdqlzKYkhJ
-DncKjvbdSQUHKGDw
-DoCkKvbdkHflFfOL
-EPCkKvbdRXNdDMID
-DncLKvbdSLZFtfkT
-EOcLKvbdZQldiMeR
-DnbjjvbdSBdElJYk
-DncLKvbdwWlBVaWV
-DoCjjvbdhzUfLqOG
-DoDLKvbdmJEUQuSB
-DnbjjvbdULvPBVoJ
-EPDLKvbdYkrDtOMN
-EPDKjvbdHEKujBij
-EObjjvbdJuuGDdfi
-EObjjvbdzaAOgGbM
-DncLKvbdkClLRHUg
-EObkKvbdYTMAmToY
-EObjjvbdxVMeQyLn
-DoDKjvbdrEFJQNua
-DncKjvbdYSlBNTnx
-DnbjjvbdrSUkOLAm
-EOcLKvbdrylQTBIO
-DnbjjvbdrouoKDVf
-DoDLKvbdwWkaVaVu
-DoCkKvbdZQmFIleR
-EPCjjvbdiLeENtby
-DoCjjvbdrDeJQNua
-EObjjvbdIGfzYxXg
-DoCkKvbdySmiMqag
-EOcKjvbdbVBgYLTh
-DoDKjvbdLFehCApu
-EPCkKvbdCDpAvJmG
-EObkKvbdZLrDtOLm
-EPCkKvbdZnnJEdyj
-EPCjjvbdZjSgpGbG
-EOcKjvbdWSOYBdkc
-EPDKjvbdwtleQyLn
-DnbkKvbdmJDtQuSB
-EObkKvbdkWXODbXw
-DncKjvbdezuyEiTw
-EObjjvbdnBjWwnmu
-EPDKjvbdZxdJmcMS
-EPDKjvbdrbGNMHLZ
-EObkKvbdEYXlTssl
-DnbjjvbdyTOJNRag
-DnbkKvbdGZVVAdYC
-EPCjjvbdTYLMNzkY
-DncLKvbdJcJcRKDY
-EOcLKvbdYpmEhldq
-DoCkKvbdjKFgjNYS
-EPDLKvbdJbibqKCx
-EPCjjvbdyTNiNSCH
-DoDLKvbdGGKRmhsq
-EPDLKvbdLAkGmCYR
-EPDLKvbdCEPaWKMf
-DoCkKvbdZsiIyDsO
-EPCjjvbdjbkkRGuH
-DnbkKvbdqYoHgREY
-DoDLKvbdZMRctNkm
-EObjjvbdDjIJvYKA
-DncKjvbdVqnXbEkc
-EPCkKvbdiHKCyViu
-EOcKjvbdkHflGFmk
-DoDKjvbdOFDsiIjd
-EOcLKvbdVrOYCEkc
-EPCjjvbdhtydvrUb
-DoDLKvbdrNZjYlHi
-EPDKjvbdVwIxWDeH
-EObkKvbdhyuFlRNf
-EPDLKvbdSKyFuHKs
-DoCkKvbdBhjajiFj
-DoDKjvbdhanbeWpq
-DncKjvbdGGJqnJTq
-EPDKjvbdZtJIyETO
-EOcLKvbdANIZSvzY
-DnbkKvbdptUHSSLU
-DoDLKvbdRDcBPpdS
-DoDKjvbdBcpAujNG
-DnbjjvbdaaVdeopX
-DnbjjvbdhtydvrUb
-DoCkKvbdkWXNcaxX
-DncLKvbdrNZjYkgi
-EPCjjvbdBiKajiGK
-EObkKvbdwkWcgzzG
-EPCkKvbdRDcApQcr
-DncLKvbdfekzNgHA
-DoDKjvbdiBoCdwRR
-EOcLKvbdIBlZdzAD
-DnbkKvbdZLqcsnMN
-DoDKjvbdatbGwkUI
-EObjjvbdmgFXlmfy
-EPDLKvbdxUmEqYkn
-EPDLKvbdauBfxKsh
-EObjjvbdsPvOjDVf
-DnbkKvbdkVwNdBww
-EPCkKvbdzaAPGfbM
-EOcLKvbdRotGjGDw
-EPCkKvbdqceJPmua
-EPDLKvbdZyDinCkr
-EObkKvbdCDoaWKMf
-EOcKjvbdjmCLzEgP
-EPDKjvbdHlBznXRL
-DncKjvbdeOeTLTtS
-EPCjjvbdGZUuBEXb
-DnbkKvbdqTtHRqjt
-EOcLKvbdFyUuAdXb
-EPDLKvbdEARiMzWw
-EOcKjvbdFeirNiUR
-DoCkKvbdzjUoocsU
-EOcLKvbdEztQdlCi
-DncLKvbdKCjCpibx
-EPCjjvbdxZhGFxFS
-EObjjvbdwWkaWAvV
-DnbkKvbdaaWFFoow
-EOcKjvbdBsBDUGXS
-EPDLKvbdmIdUQuRa
-DncKjvbdVAbRTRRy
-DoCkKvbdHffyxxYH
-EObjjvbdDGkfHAzc
-DoCkKvbdiCPDFXRR
-EPCkKvbdVrNwbEkc
-EPCkKvbdiGjDYvKV
-DnbkKvbdIMBzmvpk
-EPCkKvbdKxqJrztf
-DncLKvbdmIctQuSB
-EOcKjvbdaSFbhUGL
-DoCjjvbdmbKWwnmu
-DoCkKvbdiUyeWrVC
-DncKjvbdGGKRmhsq
-DoCjjvbdehLVqnQg
-DncLKvbdTkunaVoJ
-DnbjjvbdGZUtaDxC
-EPCjjvbdtSrSyZeD
-DoDLKvbdjbkkQfuH
-EOcLKvbdOFDtJJLE
-DnbjjvbdBdQAvJlf
-DoCkKvbduDDVWvPP
-EOcKjvbdZtJIyDsO
-DncLKvbdQccBPpdS
-DncLKvbdiUzEvquC
-EPCjjvbdvvkaWAuu
-DoDLKvbdZoOIeEzK
-DnbkKvbdkCkkRGuH
-EOcKjvbdRkZGVHLT
-EObkKvbdtcCuXVno
-EPCjjvbdMpYRVnGs
-DoDKjvbdFfJrNiTq
-DnbkKvbdZnmiFFZj
-EPDLKvbdbhmKKfWx
-DoDLKvbdDjHivXjA
-DoDLKvbdiLeDnVDZ
-EOcLKvbdUQqOtthN
-EPDKjvbdZHXEAOri
-EObkKvbdvAdYrndh
-EObkKvbdQlwaxnUz
-DoCjjvbdQwOEDLhD
-EPDLKvbdqrVKnLBN
-EObjjvbdwtmFQxkn
-EPDLKvbdTfznMWvF
-DnbkKvbdaMjasVNH
-EPCjjvbdcyyQXxpb
-DncKjvbdMfcQMpUk
-DnbjjvbdZnmheEzK
-DncLKvbdbrbkUDia
-DncLKvbdiCOcFXRR
-DoCjjvbdZxcimblS
-EPDLKvbdRkYfVHKs
-DncKjvbdDoDKjvbd
-EOcKjvbdGAnpxizm
-EOcKjvbdYpldhldq
-DnbkKvbdQwOEDMID
-DnbjjvbdcyxoxYpb
-DoCjjvbdakMGOnDA
-EPCjjvbdLAkGlawq
-DncKjvbdJJdAKPfd
-EOcLKvbdxrnImSBg
-DoDLKvbdNddUJIjd
-DncLKvbdfIKvRmpg
-DoCjjvbdiZuGLqOG
-EOcLKvbdeAURMwif
-DncLKvbdiCPCeWpq
-DoCjjvbdGcjvKBij
-EPDKjvbdRDcBQQdS
-EPCjjvbdUtMtGLvK
-EPDKjvbdyXhjBoyk
-DoDKjvbdqZOgfpcx
-EObjjvbdYTMAmUPY
-DoDLKvbdiCObeXQq
-DncKjvbdmJDtRUqa
-EObkKvbdSCEElIyL
-EObkKvbdNGbpMouL
-DoCkKvbdEzsqElCi
-EObjjvbdOStWHFVQ
-EPCjjvbdjmBlZdfo
-EPDKjvbdiUyeWqtb
-DnbjjvbdYSkaNUPY
-DoCkKvbdTAEhhCPE
-DoCjjvbdmttyjjSG
-EOcKjvbdrMyjZMIJ
-EPDKjvbdUsmTelVj
-EPCkKvbdNsTugFUp
-DnbkKvbdWRnYBeMD
-DncLKvbdHgGzZXxH
-EPDLKvbdZLrDsmlN
-DncLKvbdcSbkUDjB
-EObkKvbdziuPpDrt
-DoCjjvbdZyEJmblS
-EObkKvbdjggMFenL
-DnbkKvbdmfeXmNfy
-EObkKvbdiBncFXRR
-EPDKjvbdADSXiyiQ
-EObjjvbdLFfHbApu
-EOcLKvbdRMwbZOUz
-EPCkKvbdFVxoomJe
-EOcLKvbdZnmiEdyj
-DncLKvbdULunaVoJ
-DncLKvbddndsKtTr
-EPDKjvbdEztQeMDJ
-EObkKvbdcScKscjB
-EOcKjvbdFkErbglu
-DoCkKvbdsBfMlGkZ
-EPDLKvbdCSaCsfWr
-EPCjjvbdVAapsRSZ
-EOcLKvbdgFkzNfgA
-EPDLKvbdjhHLefNk
-EObjjvbdyNsIXsIc
-DoCjjvbdqcdiPmvB
-EOcKjvbdeXyssrFz
-DnbjjvbdEOcKjwCd
-DoDLKvbdGKdrbgmV
-DncLKvbdKQzEoFnF
-DoCkKvbdqvpMDJZR
-EObkKvbdZyEKODMS
-DncKjvbdBhjbKiFj
-DncKjvbdfHkVrNqH
-DncLKvbdeXyssrFz
-EObjjvbdxmsHwriD
-EPDKjvbdRyigsCvA
-DoCkKvbdZoNiEeZj
-EPCkKvbdhzUfLpnG
-DncKjvbdVUNUFkuj
-EPDKjvbdRXNdDMID
-EObkKvbdlBMnmALA
-EPDKjvbdffMZnHHA
-EPCjjvbdEARhlyvw
-EOcKjvbdVTltGLvK
-EOcKjvbdJqZdoFme
-EObkKvbdyOTHwsIc
-DoDLKvbdCfkegAzc
-DnbkKvbdZMRdTmkm
-DnbkKvbdhkeEOUcZ
-DoDKjvbdZnnIeEyj
-DnbjjvbdrafNMGkZ
-DoDLKvbdZtJIyESn
-EOcLKvbdaRecITek
-EPCjjvbdZoOJEdyj
-DoDLKvbdxsNhlrBg
-EPCjjvbdZxdKNcMS
-DoCjjvbdCWzdJEov
-EObkKvbdTppnttgm
-DnbkKvbdjmCLydfo
-EObkKvbdBsAbsewS
-EObjjvbdjgflFemk
-DnbjjvbdpstGrSKt
-EOcLKvbdOTTvHFUp
-DoCkKvbdczYowyRC
-EObkKvbdTvMPjUAq
-EOcKjvbdezvYeJUX
-EPCkKvbdzHYlANEw
-EPCkKvbdqcdiQOVa
-DoCkKvbdsrrSxyeD
-EObkKvbdOTUWGeUp
-DoDKjvbdbUbHYLTh
-DoCkKvbdHakydzAD
-DoDKjvbddjJrWUzn
-EPDKjvbdmaiwYPOV
-DoCjjvbdtbcUwVno
-EPDLKvbdrMyjYkgi
-DoCjjvbdUQpoUtgm
-DncKjvbdddoSBwDK
-EPCkKvbdatbGwkTh
-DncKjvbdmbJvxPNu
-DnbjjvbdwzHeewdr
-DncLKvbdzitpPcrt
-EOcLKvbdrMyjYkgi
-EOcLKvbdrEFIomvB
-DoDLKvbdiifIJlxS
-EOcLKvbdtvOYKQsA
-DoCkKvbdxsNhlqag
-DnbjjvbdyTOIlqag
-DncLKvbdIGgZyYXg
-EOcKjvbdUsmUGMWK
-EObkKvbdhzUfMQnG
-EPDLKvbdZxdJnCkr
-DncKjvbdKWUeceGi
-EOcLKvbdmbJvwnnV
-DoDLKvbdDncKjvbd
-EPCkKvbdZoNheEyj
-DncLKvbdVqnXadlD
-DncLKvbdtunXipsA
-DncLKvbdjAPgBPfj
-DoCkKvbdyqPNJKXA
-DncKjvbdrpWPJbuf
-EOcKjvbdqvpMDJYq
-DnbjjvbdcTDLUDia
-DnbkKvbdiGjCxvKV
-EPDKjvbdauBfxKtI
-DoCkKvbdLFfHbApu
-DoDLKvbdHffyyXwg
-EOcKjvbdIxUCHkqQ
-DoDKjvbdzQoMiJwA
-DoDKjvbdyYIjBoyk
-EObkKvbdxnSgwriD
-EObkKvbdIMBznWpk
-EPDKjvbdYlSDtOMN
-DoDKjvbdijGHjMxS
-EOcKjvbdYkqcsnMN
-DoCjjvbdmaiwYOmu
-EPDKjvbdHELWKBjK
-DoCjjvbdwtmFRYlO
-EOcLKvbdFeiqnJTq
-EPDKjvbdiBncEvqR
-DoCkKvbdJXsbILpp
-EObjjvbdULunaVni
-DncKjvbdDwxLstUM
-DoDKjvbdrWpMChyR
-EObkKvbdYzcFqivZ
-DncKjvbdEzspdlDJ
-EPDKjvbdfMfXGmKL
-DoCkKvbdCTAbtGWr
-DoDLKvbdRkZGUgKs
-EPCkKvbdFWZQQMie
-DnbjjvbdxVNEqYkn
-DoCjjvbdeFPRbWbj
-EPCkKvbdZshhyESn
-EObjjvbdqrVKnLAm
-EPCjjvbdptUGqqjt
-EOcLKvbdrEEhpOVa
-DncKjvbdzQoNIjXA
-DncLKvbdmgFXlnGy
-DoDKjvbdZjShQHBf
-DnbjjvbdjKGHjNXr
-DoDLKvbdqFcdsvAh
-EPCkKvbdOEdUIiLE
-EPDLKvbdNeEUJJKd
-EPCjjvbdzHZMANEw
-DnbkKvbdqlzJyMIJ
-DnbjjvbdelfXHMjL
-EPCkKvbdANHyTWzY
-DnbjjvbdREDBPpcr
-DncLKvbdQmYCZOUz
-EOcKjvbduoTzpjoU
-DoCjjvbdqrUjmkBN
-DnbjjvbdyfxlANFX
-EOcLKvbdJmADygUa
-EPDLKvbdyNrhYTIc
-DoCjjvbdCTAbtFwS
-DncLKvbdSwkLmzkY
-DnbjjvbdjhHMFfNk
-DoCkKvbdZeXfzhIb
-DnbjjvbdbrbjtEJa
-DoCkKvbdxrmhmRbH
-DoDLKvbdrXQLbhxq
-EObjjvbdTulQKUBR
-EPCkKvbdMpYQumgT
-DncKjvbderBWzlDP
-DoCjjvbdiGjCxvJu
-DoCjjvbdlZSqsZGt
-EOcLKvbdZisIPfaf
-DnbkKvbdHEKvKBij
-DncLKvbdjSziSjiz
-EPDKjvbdCEQBWJmG
-EObkKvbdGGKRmiUR
-EPDKjvbdMuTRkNAX
-DnbjjvbdrXQLbiYq
-EPCjjvbdOTUWGduQ
-EPCjjvbdnBjXXoNu
-DoDLKvbdcarmSAUN
-DoCjjvbdNPwqWOGs
-EObkKvbdUslsekvK
-DnbjjvbdzaAPGfbM
-DoCkKvbdGdLVjCJj
-DoDLKvbdRjyFtfkT
-DoDLKvbdGLFTDHlu
-DnbkKvbdGFirOJUR
-EPDLKvbddoFTLUUS
-EObkKvbdkxrrTZGt
-DncKjvbdxrnJMqag
-EOcLKvbdCDpBWJmG
-DoCjjvbdlqyUysDi
-EPDKjvbdTfzmlXVe
-DncKjvbdEuxpQMie
-EOcKjvbdbLLfPNcA
-DncKjvbdVgxWXgYz
-DoDKjvbdrbFmLgKy
-DoCjjvbdzaAPGfbM
-DncLKvbdYSlAlsoY
-DoDLKvbdZyEJnClS
-EPDLKvbdEvYopMjF
-DncKjvbdmtuZjiqf
-DoCjjvbdCJKbLIfK
-EOcLKvbdcIljLFvx
-EObkKvbdrJAKFNPF
-DoDKjvbdBiKbKhfK
-EPDKjvbdWIYWYGxz
-DoCkKvbdjAQGaQHK
-DnbjjvbdjblLQftg
-DncLKvbdbhlikGXY
-EPDKjvbdZLrDsmkm
-DoDLKvbdVTlsfMWK
-DoCjjvbdliDsptqa
-DnbkKvbdjuvmcbXw
-DoCjjvbdbVCHXjtI
-DoCkKvbdQvmdClID
-DnbjjvbdLAkHNCXq
-EPDKjvbdZtIhyETO
-DnbkKvbdYkqdTmlN
-DoDKjvbdMtrrKmAX
-DncLKvbdJXtCIMQp
-EPCkKvbdlhdTqUqa
-EObjjvbdnHFYNNfy
-EPDKjvbdxrmhlrBg
-DncLKvbdiLeDmtcZ
-DncKjvbdNrsufdtp
-EObkKvbdlhcsptqa
-EObjjvbdNeETiIkE
-DnbkKvbdxsNhmRbH
-DnbkKvbdADRxKZhp
-DnbjjvbdTqROuUgm
-EOcKjvbdpxoIGqDx
-EOcLKvbdqBIeAWhE
-DnbjjvbdCIkBjiFj
-DncLKvbdTlWPBWPJ
-DoCjjvbdEKHjVxKA
-DnbkKvbdZRNFImEq
-EObkKvbdJbicQjCx
-DoDKjvbdNsTufeVQ
-EObjjvbdDxYMUTsl
-DoDLKvbdaSFcITfL
-EPDKjvbdcTDLTcia
-DoCkKvbdlhdTpuRa
-EObjjvbdCJKbKiFj
-DncKjvbdqAiFAWhE
-EPDKjvbdUslsfLuj
-EObjjvbdWWiXuceH
-EPCjjvbdOEcshiLE
-EPDLKvbdEJhJuxKA
-DoCkKvbdKyRKSzuG
-DncKjvbdHffzZXxH
-EOcLKvbdSLZGUfkT
-EObkKvbdHgHZxwxH
-DnbkKvbdcSbjtEJa
-EPDKjvbdZGwEAPTJ
-DoDLKvbdeAURNXif
-EPDLKvbdMpYQunGs
-EObkKvbdNeDshiKd
-DoDLKvbdzoQQdbkx
-EPDKjvbdWHxWXfxz
-EPCjjvbdCEPaVjNG
-DoCjjvbdbhlikFvx
-EOcLKvbdBvzdIdpW
-DoCkKvbdNPwqWNfs
-EPCjjvbdbhlijfWx
-DncKjvbdqwQLbiZR
-EObjjvbdkClLRGuH
-DncKjvbdNHDQNQVL
-DncKjvbdhkdcmuDZ
-EOcKjvbdKWVFdFHJ
-EPDLKvbdYTMBMtOx
-EObkKvbdSKxfVGjs
-DncKjvbdZoOJEdzK
-EObjjvbdMpXqVmgT
-EPDKjvbdhaoDFXRR
-EPCjjvbdrpWPJcVf
-EOcKjvbdczYpYZRC
-DoDLKvbdLLAhWAJy
-DoDKjvbdEObkLXDE
-EPDKjvbdnVUykKRf
-DnbkKvbdBvzdIdov
-EOcKjvbdGFirOJUR
-DoCjjvbdGGJrNiTq
-EPDKjvbdqAheAWgd
-DncKjvbdxmsIXriD
-EObkKvbdVAbQsRRy
-EPDKjvbdRXODbkhD
-EObjjvbdVZHtZjoO
-EOcKjvbdffMZmfgA
-EOcLKvbdbiMjLGXY
-DoDKjvbdUQpoVUhN
-EPCkKvbdhfjCxuiu
-DoCkKvbdziuPocsU
-EObjjvbdBhkBkJFj
-DnbjjvbdeAURNXif
-DncKjvbdQlxByOUz
-EPDLKvbdRbEEkhxk
-EPCjjvbdrbFlkgKy
-DoCjjvbdaSFbhUGL
-EOcKjvbdsCGMkfkZ
-DoCkKvbdJbicRJcY
-DnbkKvbdqlzKYlHi
-DoCjjvbdZyDimblS
-EOcLKvbdsrqsZZdc
-DoDKjvbdjggMGGNk
-DnbkKvbdADSXiyiQ
-DoCkKvbdehKurORH
-EOcLKvbdrylPsAgn
-EPCjjvbdRWmdClID
-EPCjjvbdbsCjsdKB
-EObjjvbdUQpoVVHm
-DnbkKvbdiCObeXQq
-DncLKvbdUQpoVUhN
-DoCkKvbdKCicRKDY
-DncKjvbdjlakzFGo
-DnbkKvbdMgDQMpVL
-DoDLKvbdWSNxBeMD
-DnbkKvbdvBEZTOdh
-EPCjjvbdsQWPKCuf
-EObjjvbdZeYGzghb
-DnbkKvbdxsNhmSCH
-EPDLKvbdkySrTZGt
-EObkKvbdrDdiQNvB
-DncLKvbdHDjuiajK
-DoCjjvbdURROtuIN
-DncKjvbdKyRJrztf
-EObjjvbdIGfyyYXg
-DncLKvbdXsMBMtPY
-EPCkKvbdaaVdfPpX
-DncKjvbdiHJbyWJu
-EOcKjvbdSKxfVGjs
-DoDKjvbdxZgfFwdr
-DnbkKvbdRNYCZNtz
-EPCkKvbdCDoaWKNG
-DoDKjvbdDjHjWYKA
-EPDKjvbdyNsHwsIc
-DoDKjvbdUtNTfLuj
-DoDLKvbdGGKRnJTq
-EPCkKvbdsBemMGjy
-EPDKjvbdSQUHKFcw
-DnbjjvbdkClKpfuH
-EObjjvbdRyjHrcWA
-EOcLKvbdSPsfjGEX
-DoCjjvbdGckWKBij
-EPCkKvbdGdKujBij
-DnbjjvbdcJMijewY
-EPDKjvbdkIGkefOL
-EPCkKvbdrSVLNkBN
-DnbkKvbdrpWPJbvG
-DoDLKvbdZirgpHBf
-EPCkKvbdHDjujBij
-EPCkKvbdvBDySoEh
-DoDLKvbdePEsKssr
-DoDLKvbdZRMdhldq
-EObjjvbdUQqPUtgm
-DoDLKvbdMSXNZtpz
-EObjjvbdVYhTzKnn
-EOcKjvbdrNZixlIJ
-DoDLKvbdTpqPVVIN
-DnbkKvbdkCkjqHVH
-DnbkKvbdkWWmcaxX
-EOcLKvbdJSyBSlwl
-EObkKvbdmRxtzTEJ
-DncKjvbdptTgRqjt
-EOcLKvbdqYoHfqEY
-DoDKjvbdGZUtaDxC
-EOcKjvbdKQydoGNe
-EPDLKvbdssSTZZeD
-EObjjvbdhkddOUcZ
-DoDKjvbdGdKvJbKK
-EOcKjvbdULvPAuoJ
-DoCkKvbdrEFJPnWB
-DnbjjvbdfNGWfmJk
-EPCkKvbdkWXODaww
-EOcKjvbdMtrrKmAX
-DnbjjvbdEuyPpMie
-EObjjvbdrSVKmkAm
-EPDLKvbdhanbdvqR
-DoCkKvbdkWWmdBww
-DnbjjvbdxUleQyLn
-EOcLKvbdpyPHfpdY
-DncKjvbdpfDeTvBI
-DoCkKvbdnVVZjirG
-DnbkKvbdzjVPocsU
-EPDLKvbdmfdwlmfy
-DnbkKvbdSKyFuGjs
-EObkKvbdVAaprpqy
-EPCjjvbdUaBqTRRy
-EObkKvbdZoNhddzK
-DncKjvbdrNZiyLhJ
-DncKjvbdaMkBruNH
-DoDKjvbdZyDjNcMS
-EPCjjvbdZjTIQHCG
-EObkKvbdjJegilwr
-EPDKjvbdHffzYxYH
-EPDKjvbdaSGChTfL
-DoDLKvbdcJMjLGWx
-EOcLKvbdtlXvaTaX
-DoCjjvbdGYuVAcxC
-EOcLKvbdUsltGLvK
-EPDLKvbdRNXayOUz
-DoDLKvbdRadFLiYk
-EOcKjvbdCTAbsfXS
-EPCjjvbdGZVVAdYC
-EPDLKvbdypnliJwA
-EPCjjvbdSBdFLhxk
-EOcLKvbdGLFSbhNV
-DncKjvbdTppnuUhN
-EObkKvbdezvYdiTw
-DoCkKvbdIsZBSlxM
-DncLKvbdRNYBxmtz
-EPCkKvbdeFOqawCj
-DnbjjvbdtSrTYzEc
-DncKjvbdkDLkQgUg
-DnbjjvbdEARhlzXX
-EOcKjvbdWRmxBeMD
-DoDLKvbdzQnliKXA
-EPDKjvbdpfDdtWAh
-DncLKvbdMgCpMpVL
-DnbkKvbdiZtfLpmf
-EPDLKvbdzQoNJJwA
-EPCkKvbdaNKasUmH
-EPDLKvbdRbDeLhyL
-DoDLKvbdKRZeOeme
-EOcKjvbdZxdJmcMS
-DncLKvbdeKKSVtzn
-EPDLKvbdRjxeuHLT
-EObkKvbdNGcPmPtk
-DoCkKvbdtcDVWvPP
-EPCjjvbdcTDKscjB
-DoDLKvbdbrcLTcia
-EObjjvbdvlvAMcdm
-EObjjvbdFxuVBDwb
-EPCjjvbdhkdcmtby
-EOcKjvbdRotHKFcw
-DncLKvbdelfWgNKL
-EObkKvbduCbuXVno
-EPDKjvbdEYXlUUUM
-EOcKjvbdbUbHXjsh
-EOcLKvbdmgEwmOHZ
-DoCjjvbdEXxLsssl
-EPDLKvbdZLqdTmlN
-EOcLKvbdbsCkUEJa
-EOcKjvbdqvpLbhxq
-EOcKjvbdfIKvRmpg
-DncLKvbdGBOpxizm
-DoDLKvbdnBiwXnmu
-DoCjjvbdKWVFceGi
-EOcLKvbdRbEEkiZL
-EObjjvbdffMZmgHA
-DoCjjvbdUMWPBWPJ
-EObkKvbdkClKpftg
-DoDLKvbdBhkBkIej
-DoDKjvbdhgJbyWJu
-DoCjjvbdEASIlzXX
-EPDKjvbdGZUtaDxC
-DnbjjvbdlYsRryHU
-EOcKjvbdhgKCyWJu
-EPCkKvbdsQWOibuf
-DoCjjvbdRMwbYmtz
-DoDKjvbdZxdJnClS
-EPCjjvbdJTZBTNYM
-DnbjjvbdiLeEOUby
-EOcLKvbdjEjgUoAO
-EPCkKvbdzitopDrt
-EPCjjvbdtcCuWvPP
-DncKjvbdZMRdUNlN
-DoDLKvbddZxoxZRC
-DoDKjvbdFVxoomKF
-DoCkKvbdSLYeuGkT
-DncLKvbdYSlBNTnx
-EObkKvbdeuzwoizs
-EPDKjvbdUQpoUuIN
-DoDKjvbdmpZxujyC
-EPCjjvbdDGlFgAzc
-EPCjjvbdkCkkRGuH
-DnbkKvbdvlvAMdFN
-DoDLKvbdatbHXkUI
-EPCjjvbdFWYoolie
-DnbjjvbdrEFJPnWB
-EObkKvbdpyOggQcx
-EOcKjvbdqwQMChxq
-EOcKjvbdqrVLNkAm
-EOcKjvbderBWzlCo
-DoDLKvbdRWmdDMHc
-EOcLKvbdZoNhdeZj
-DnbkKvbdunszpkPU
-EPDKjvbdGAnpxizm
-DoCkKvbdKCjCqKCx
-EOcKjvbdZshhyDrn
-DoDKjvbdddoSBvcK
-DncKjvbdcScKtEJa
-EOcLKvbdZjShQGbG
-DncLKvbdDncKkXDE
-EPDLKvbdrzMQTBHn
-EPDLKvbdIxUBglRQ
-EPDKjvbdcyxpXxpb
-EObkKvbdMSXMytpz
-EObkKvbdijGIKMwr
-EObkKvbdzdzOzdyp
-DnbjjvbdeATplwjG
-DnbkKvbdcIlikFwY
-DoDLKvbdsPunicVf
-EPDKjvbdmozYvLZC
-DoCkKvbdkyTSSxgU
-DncLKvbdRWnDcLhD
-DncKjvbdHELWJaij
-DncKjvbdZQmFIleR
-EOcKjvbdiCOcEvpq
-EOcKjvbdbrbkUEKB
-EOcLKvbdOFEThhjd
-EObkKvbdbBVdepPw
-EObkKvbdUxhTzKnn
-EObkKvbdzoPpdblY
-EOcLKvbdrbFllHLZ
-DoDKjvbdjggMGGOL
-DncLKvbdqceJQNua
-DoDKjvbdiHJbxvJu
-DoDLKvbdySnImSBg
-EPCkKvbdtTRrxzFD
-EOcLKvbdkVvnEBxX
-DnbjjvbdtcCtvvOo
-EPCkKvbdyzdmrHiI
-DoDKjvbdFjdrbhMu
-DoDLKvbdZyEKODLr
-DoDKjvbdURQnuVHm
-EPCkKvbdZyDimcMS
-EOcLKvbdNQXpunHT
-DnbjjvbdQlxCYmtz
-DnbjjvbdCDoaVimG
-EObjjvbdsPvOibvG
-DnbjjvbdgGLynGgA
-DncLKvbdCDoaWJmG
-EObkKvbdnCKXXnnV
-EOcLKvbdUxgtZkPO
-DnbkKvbdiMFDmuDZ
-DncKjvbdiGicZWKV
-DoDKjvbdcScKtEJa
-DoDKjvbdpssgRqkU
-DncKjvbdsBfNLgKy
-DoDLKvbdGYttaDwb
-DncKjvbdjvWnDaxX
-EPCjjvbdhgJcYuiu
-DnbjjvbdxUldpxlO
-DoDKjvbdUaCRSqSZ
-DnbkKvbdNwoVzdNt
-DoCkKvbdZnnIeEzK
-EPDKjvbdNeEUJIkE
-DnbjjvbdJbjDQjDY
-EPDLKvbdKVuFceGi
-EPCkKvbdKkBIWAJy
-EObjjvbdrafMlHLZ
-EOcLKvbdZLqctNkm
-EObjjvbdMgComPtk
-DncKjvbdjhHMGGOL
-DnbkKvbdJYUCIMQp
-DoCjjvbdhlEcnVCy
-DoDLKvbdxsOJNSBg
-EOcLKvbdRMxBxmtz
-EOcLKvbdHDjujCJj
-EObjjvbdZRMdhmFR
-EPDLKvbdUQpoUthN
-EPCkKvbdvlvANEFN
-EObkKvbdSCEEkhxk
-EPCjjvbdLBKfmCXq
-EPDKjvbdOStVfduQ
-EPCjjvbdGcjvJbKK
-DnbjjvbdVBBprpqy
-DoCjjvbdirziTLJz
-DncLKvbdFWYpQNKF
-DoDLKvbdjKGHjNYS
-DncKjvbdZnmiEdzK
-DoDKjvbdySmiMrBg
-DncLKvbdeAURNYKG
-EPDLKvbdemGWflik
-DoDKjvbdaMkBrtmH
-DoDKjvbdIxUBglRQ
-DoDKjvbdOEcshhjd
-EPCjjvbdpxnhGqDx
-DncKjvbdYSlBNToY
-DnbjjvbdGGKSOJUR
-EOcLKvbdZjTHpGbG
-EPCjjvbdIHGzZYXg
-DncKjvbddndsLTsr
-DnbjjvbdqAheAXIE
-EOcKjvbdVhXvXfxz
-DncKjvbdFyVVAdYC
-DnbjjvbdJvVFceGi
-EPCkKvbdoznDjwoA
-EPDKjvbdvPTzqLPU
-EObjjvbdiifIKMwr
-EOcLKvbdlZTSSxgU
-EObjjvbdQvnECkgc
-DncLKvbdjgfkfGNk
-DnbkKvbdCDoaWJmG
-DnbkKvbdxnTHwriD
-DncKjvbdoAKzshDn
-DoDKjvbdvAdZSndh
-DnbjjvbdRpTgKFcw
-EOcLKvbdiiegilwr
-EOcKjvbdGdLVjBjK
-EObkKvbdGFjRmhtR
-EPCjjvbdZsiJYdTO
-EPCjjvbdJJdAKPfd
-EPDLKvbdKfGHbBRV
-DncLKvbdjhHMFenL
-EObkKvbdbLMFnnDA
-DoCjjvbdUWMPisaR
-DnbkKvbdZjTHpHCG
-EObkKvbdbsCkTcjB
-EPCkKvbdSLYfUfkT
-DoDKjvbdZeYGzhIb
-DncKjvbdrovPJcVf
-EPCjjvbdePFSjtTr
-DncKjvbdJbibqJbx
-EPDLKvbdDxYMUUTl
-DnbkKvbdZHXEAPSi
-DncKjvbdVTmUFlVj
-EPDKjvbdzoQREcLx
-EPDKjvbdKfFhCAqV
-DoDKjvbduDDUwVoP
-DoDKjvbdgFlZmfgA
-EObjjvbdTAEiHbOd
-DoCkKvbdMowqVmgT
-DncKjvbduMXwBTaX
-DncKjvbdeYZssrFz
-DncLKvbdmfdxNNgZ
-DncLKvbdxLXDgzzG
-DoCjjvbdNsTvGduQ
-EPDLKvbdTpqOtuHm
-EObkKvbdZMRctOMN
-EPCjjvbdHEKuibJj
-EPCjjvbdBiKbLJGK
-DoCjjvbdUtNUFkvK
-EOcKjvbdVTltFkuj
-DnbjjvbdczYpXxqC
-EPDLKvbduWNxKQsA
-EOcKjvbddZyQYYqC
-DnbkKvbdyfyMAMdw
-DncLKvbdDihKWXjA
-EPCjjvbdoAKztIDn
-DoCjjvbdcTDLUDjB
-EPDKjvbdJcJcRKCx
-DncKjvbdIxTahLqQ
-DoDLKvbdTqROttgm
-DoDKjvbdjblLQgUg
-EOcLKvbdTppnuUhN
-EPCjjvbdrMyjZLgi
-EObjjvbdypnmIjXA
-DoCkKvbdczYoxZRC
-EObkKvbdFjeTDHmV
-EPCjjvbdZxcimbkr
-DoDKjvbdatbHXkUI
-EPDKjvbdvmWAMdEm
-DoCjjvbdqwQMCiYq
-DoDKjvbduWNwjQsA
-DncKjvbdACqwjZiQ
-DoCjjvbdOTTvGduQ
-EObkKvbdirzhsKiz
-EObjjvbdOTTugFUp
-EOcLKvbdKDJbqJcY
-DoCjjvbdiUyeXRtb
-EObjjvbdfMfXHNKL
-EOcKjvbdjhHMFfNk
-DncKjvbdRpUGjFcw
-EPCjjvbdfILVqnRH
-EOcKjvbdiHKCyWJu
-DoDLKvbdnPzYvLYb
-DnbkKvbdnGeYNOHZ
-DoDKjvbdtvOXjQsA
-EPCjjvbdmIctRVRa
-EOcKjvbdpyOhGpcx
-DnbkKvbdKQydoFnF
-DoDKjvbdkVvnDaww
-EObjjvbdbUbHXjsh
-EOcKjvbdCJLCLIfK
-EPDKjvbdZeYGzhJC
-DncKjvbdcScLUDia
-DoCkKvbdQmXbZOUz
-EOcLKvbdRadFMIxk
-DnbkKvbdziuPodSt
-EOcKjvbdEXxMUUTl
-DnbjjvbdegjvSOQg
-EObkKvbdZtJJYdTO
-EPDKjvbdVAbQsQrZ
-DnbkKvbdkHflFfOL
-EObkKvbdtcCuXWOo
-DnbjjvbdcTDLUEJa
-EPCjjvbdZjTIQHBf
-EObjjvbdTAEhhCPE
-EOcLKvbdbhlikFwY
-DoDLKvbdEPDKkWbd
-EOcKjvbdZtJJZESn
-EPDKjvbdZMRdUNlN
-EPCkKvbdhgJcZWJu
-DncKjvbdUaBqSprZ
-EOcLKvbdEJgiuxKA
-EObjjvbdSPtHKFcw
-DoCjjvbdFfKSOJUR
-EObjjvbdVrOXaeMD
-DoCjjvbdrXPkcIxq
-DoDKjvbdZjTHofaf
-EOcLKvbdVYgszLOn
-DncKjvbdIwsagkpp
-DncLKvbdTkvPBVni
-EOcLKvbdUtNUFkuj
-EObjjvbdZnmheEyj
-EPDKjvbdyYIjBoyk
-EPCkKvbdqlyiyMIJ
-EPCjjvbdYzbeqjVy
-EOcLKvbdUQqOuVIN
-EObkKvbdZMSDtOMN
-DncKjvbdVvhxWDdg
-EOcLKvbdiZuFlRNf
-EObjjvbdZtJJYcrn
-EPCjjvbdmuUzKirG
-DoDLKvbdVUMtGMVj
-EPDLKvbdhWyAzzAJ
-DoDLKvbdfIKvRmqH
-DnbjjvbdqdFIpOVa
-DnbkKvbdIwtCHkpp
-EOcKjvbdeEnrBvcK
-DnbkKvbdJuuFdFGi
-DoDKjvbdeOeTKtUS
-EObjjvbdKWUfDeGi
-EPCjjvbdiHJbyViu
-EOcKjvbdBraCsfWr
-DoCjjvbdGYuVBEYC
-DoCkKvbdnHEwmOHZ
-EPDKjvbdZisIQGaf
-EPCkKvbdmpZxvKyC
-DoDLKvbdmSYuZrdJ
-EObkKvbdKDJbqKCx
-EOcLKvbdZsiJZETO
-EPDKjvbdnCJvxOmu
-DoCkKvbdjgflGGOL
-DnbkKvbdRosfjFdX
-EPCjjvbdRECaQQcr
-DnbkKvbdNHComQVL
-EPCjjvbdrJAKEmOe
-DoDLKvbdqBJFAXIE
-DncLKvbdGLFTDINV
-EOcLKvbdhgJbxujV
-DnbkKvbdjSzhsKiz
-EOcKjvbdKWVGDdfi
-DoDKjvbdZnnIeFZj
-DnbjjvbdxxIiaoyk
-EObkKvbdczYpYZQb
-EPCjjvbdZxcjODMS
-EObkKvbdiHJbxvKV
-DoCjjvbdJzoexEAN
-DoCjjvbdaRfChTek
-DoDLKvbdxwhjCPyk
-DoDLKvbdVqnYBeLc
-DnbkKvbdRDcBPpdS
-EObkKvbdYqNFImFR
-EPDKjvbdsrrTYzFD
-EOcKjvbdqcdhpOWB
-EOcKjvbdaNLCTUmH
-DoDKjvbdnPzYukZC
-DncLKvbdKCjDRKCx
-EObjjvbdFkEsDINV
-EPDKjvbdMgDQMouL
-DncLKvbdOXnuzdNt
-EPCjjvbdpstGqrLU
-EPCkKvbdRbDdkhyL
-DnbkKvbdaogGdLzd
-DncKjvbdjlbLydgP
-DnbjjvbdUMVoAvPJ
-EPCjjvbdJqZeOfOF
-DoDLKvbdUsmTekvK
-DoCjjvbdpyOgfpcx
-DnbkKvbdJYUCIMRQ
-DncLKvbdjJfHjMwr
-DoCjjvbdRosgKGDw
-DoCkKvbddZxpYYqC
-DncKjvbdddnrBwCj
-EPDKjvbdijGIJlxS
-DoCjjvbdkWWnECYX
-EObkKvbdqlzJxlIJ
-EOcLKvbdzaAPHHBl
-DoDKjvbdlZTSSyGt
-DnbjjvbdatbHXkUI
-EOcLKvbdNdcshiKd
-DncKjvbdGdKujBjK
-DnbjjvbdRWnDcMID
-DoCjjvbdSxKlNzkY
-EPDKjvbdHDkWJbJj
-EPDLKvbdZxcjNcLr
-EOcKjvbdLYqKSzuG
-EPDLKvbdjuvmcaww
-EPDKjvbdxmrhYTJD
-EOcKjvbdZirhPfaf
-DnbjjvbdfIKurNqH
-EPCkKvbdYTLaNTnx
-DoDLKvbddtAUASlv
-EPCkKvbdZLrDtOLm
-DnbjjvbdnGdxMnHZ
-DoCjjvbdeFPSCXCj
-DncLKvbdYORAYUvU
-EPCjjvbdrXQMDJZR
-EPCkKvbdRpTfjGDw
-DoCjjvbdpssfrSKt
-EPCkKvbdKWUedFHJ
-DnbjjvbdVvhwvDdg
-DncKjvbdLrWlzUpz
-DncKjvbdwtmFQxkn
-EObkKvbdmIdTqUqa
-DnbkKvbdJutedFHJ
-EOcKjvbdVZITykPO
-DoDLKvbdhbPDFXQq
-DnbjjvbdmuVZjirG
-DncLKvbdieKgVPAO
-DncKjvbdEuyPpNJe
-DoDKjvbdiHJcYuiu
-EPDKjvbdmgFYNNfy
-DnbkKvbdOTUWGeUp
-DoCjjvbdZRNFJNFR
-EPDLKvbdYpmFJNEq
-EObkKvbdRMxBxnUz
-DncKjvbdNQYQvOHT
-EOcLKvbdMoxRVnHT
-DoDKjvbdpyOhGpcx
-EObjjvbdRyjITDWA
-EObjjvbdrykosAhO
-EOcLKvbdhaoDFXRR
-DoDLKvbdIryBSmYM
-DnbjjvbdlZSrTYft
-DncLKvbdegjurORH
-EOcKjvbdJYUCHlRQ
-EOcLKvbdREDApRES
-EObjjvbdmgFYMnHZ
-EPCkKvbdZyDimblS
-DoCkKvbdiCPCdwQq
-EObkKvbdbVBgYKtI
-DoDLKvbdNddUJJLE
-DoCjjvbdrpVnibuf
-EPDLKvbdKaLGlbYR
-DnbjjvbdTpqPVUhN
-DoCjjvbdcyxoxYpb
-EPDKjvbdhfibxvJu
-EPCjjvbdJpydnfNe
-DncLKvbduWOXipsA
-DoDKjvbdrRtkNkAm
-EObkKvbdNQXqVmgT
-EObkKvbdCIkBkJFj
-EPDLKvbdqUUHSRjt
-EOcLKvbdeYZtTqez
-EPCjjvbdqUUHRqkU
-DncKjvbdkWXODaxX
-EPCkKvbdaNKbTVNH
-EPCjjvbdvAcxroEh
-EOcKjvbdlZTSTZGt
-EOcLKvbdLAkHNCYR
-DoDLKvbdUtMselWK
-EPCjjvbdnVUzKjRf
-DoDLKvbdypoMiJwA
-EObjjvbdKDKCqKDY
-DoCjjvbdrWolDIxq
-DoDKjvbdwyhFfXeS
-EOcKjvbdnGeYMmgZ
-DoDLKvbdREDAopcr
-EPCjjvbdiUzFXRuC
-DoDLKvbdZQldhmEq
-EPCjjvbdtvNwipsA
-EPDKjvbdbrcLUDia
-DoDLKvbdegkVqnQg
-DoCjjvbdznopdcMY
-DoCjjvbdmfeXlmgZ
-DncLKvbdXrlBMsnx
-DoCjjvbdmgEwmOGy
-DoCkKvbdjmCLydgP
-DncLKvbdmJEUQuSB
-DnbjjvbdRbDeLiYk
-DnbkKvbdQdDBPqDr
-EObkKvbdjKGHjMxS
-DoCkKvbdyOTHxSiD
-EPCjjvbdQwNdCkhD
-EObjjvbdfNFwGljL
-EObjjvbdVqmxCElD
-EOcKjvbdeOeTKtTr
-DoDKjvbdUaBqSpqy
-DnbjjvbdmIdURUqa
-DoCkKvbdUWMQJtBR
-DnbjjvbdxnSgxSiD
-DncKjvbdwXMBVaVu
-DnbjjvbdvvkaVaWV
-EObkKvbdmaiwXnmu
-DoCjjvbdgQBzwEYI
-EOcKjvbdFVxpPmJe
-EObjjvbdKDJcQjCx
-DoCkKvbdYlRdUOMN
-EOcLKvbdZoOIddzK
-DoCjjvbdffMZnHHA
-DncKjvbdnQZxujxb
-EPDLKvbdwXMBWBVu
-DoCjjvbdLFfIBaQu
-DncKjvbdGQASwHFy
-DnbkKvbdauBfxKsh
-EOcLKvbdraelkgKy
-EObkKvbdnVUzLKSG
-DoDKjvbdANHxrwZx
-DncLKvbdqZPHfqEY
-EObjjvbdvPTzpjoU
-EObjjvbdrWpMDIyR
-DnbkKvbdCDpBWKNG
-DnbkKvbdyOSgwrhc
-DnbkKvbdeKKSVtzn
-DncKjvbdMowpumgT
-EOcLKvbdOFDtIhjd
-EPDKjvbdkDMLRGtg
-EPDKjvbdiiehJlwr
-EPDLKvbdBdQAvJlf
-DoDLKvbdZyEKODMS
-EObjjvbdJqZePFme
-DnbkKvbdKxqKSztf
-EObkKvbdmJEUQuSB
-DnbkKvbdREDAopdS
-EPDKjvbdwzHefYEr
-EPDKjvbdnHExMnGy
-EOcKjvbdmozZVjyC
-EPDKjvbdZHWdAPTJ
-DoDKjvbdjgfkfFnL
-DncKjvbdczZPxYqC
-DoDKjvbdEXwlUUTl
-DncKjvbdhuZdvrVC
-DnbkKvbdxKwDgzzG
-EPCkKvbdsZlQSaIO
-EOcKjvbdzRPMiKXA
-DoDKjvbdqvolDIxq
-DoDKjvbdQdCaPpcr
-EPCjjvbdJmADyfuB
-DnbjjvbdsCGNLgLZ
-DoDKjvbdKfGICAqV
-DoCkKvbdbiNJkGXY
-DncKjvbdiGicYvKV
-EPCjjvbdSxLLmzjx
-DncKjvbdLAjflaxR
-EPCkKvbdUyHsyjoO
-DnbjjvbdcyxoxYqC
-EObkKvbdxZgfGYFS
-EPDLKvbdZoNiEeZj
-DncLKvbdZtIhxcrn
-EPDLKvbdIwtCILqQ
-DncLKvbdQmXbYmtz
-EOcLKvbdmuUzKiqf
-EPDKjvbdsQVnibuf
-EObjjvbdOSsugEtp
-EOcLKvbdYlSETnLm
-EObkKvbdUtNUGMWK
-DoDLKvbdzeZnzeZp
-DoDKjvbdqTtHRqkU
-EObjjvbdmbJvxPNu
-DoDLKvbdliDsqUqa
-EPCjjvbdhanbdvpq
-DoDKjvbdiifHilxS
-DoDKjvbdmJDsptqa
-DnbkKvbdDncKkWcE
-EPCkKvbdaofgELzd
-DncKjvbdijGIJmXr
-EPCkKvbdRkYfUgLT
-EObkKvbdHEKuibKK
-DnbjjvbdVhXuwfxz
-DoDLKvbdiMEcmuCy
-DnbkKvbdJcJcQibx
-DnbkKvbdmfeYNOGy
-DoDKjvbdqUTgSSKt
-EPDLKvbdePErjtUS
-EObkKvbdaNKasUmH
-EObkKvbdiifIJmYS
-EOcKjvbdsPunjCvG
-EObkKvbdbrcKtDjB
-EPDKjvbdbhlikFwY
-EPCjjvbdrpVnjDWG
-EPCjjvbdaMkCStlg
-DncKjvbdMpXqVnGs
-EPDLKvbdZjShPfbG
-EPDLKvbdfHkVrOQg
-DoCkKvbdDnbjjvbd
-DoCkKvbdkySqsYft
-DoDLKvbdZRMeImEq
-DoDLKvbdYpleIleR
-DncKjvbdiHJbyViu
-EObkKvbdrMyixkgi
-EPDKjvbdqvokbiYq
-EOcKjvbdzitoodTU
-DnbjjvbdVYhTyjnn
-EPDLKvbdyYJJbPzL
-EObkKvbdeFPSCWcK
-EPDKjvbdIsZArlxM
-DnbjjvbdkIHLfGNk
-DoDLKvbdehLVqmqH
-EOcLKvbdvBEZTPFI
-DncKjvbdnUuZjirG
-EPCjjvbdakLfOnDA
-DnbkKvbdEzsqEkcJ
-DnbjjvbdVhXvXgYz
-DoCjjvbdIryBTNYM
-DncKjvbdZirgpHBf
-DoDKjvbdEYYLsstM
-DnbjjvbdZshhyETO
-DoCjjvbdOTUVgFVQ
-EObjjvbdZisHpGbG
-DoDLKvbdkDLkRGtg
-EObkKvbdegjvSNpg
-DncLKvbdfIKvRnQg
-DncLKvbdJKEAJpGd
-DncKjvbdrRtkNkBN
-EPCkKvbdjvWnDaxX
-DoCjjvbdmfdwmNgZ
-DnbjjvbdbrcLUEJa
-DncLKvbdnQZxujxb
-DoDKjvbdNsTugEuQ
-EOcKjvbdUVlPisaR
-EObkKvbdHDjujBij
-EPDLKvbdSBdFMJYk
-EPCkKvbdVvhxVdFH
-DncKjvbdIsYaTNXl
-EPDLKvbdIrxaSlxM
-EPDKjvbdfoazwDwh
-EPCkKvbddeOqbXDK
-DoCjjvbdJpzEnfNe
-DncKjvbdqiAKFNOe
-EPDLKvbduDCtwWOo
-DnbjjvbdZjShQGbG
-EObjjvbdVAbQsRSZ
-DncLKvbdtcCuWuoP
-DoDKjvbdTvLoitAq
-EOcLKvbdZQleIleR
-DoCkKvbduLxXAtAw
-DnbjjvbdqYoHfqDx
-DoDKjvbdJYTbHkqQ
-DncLKvbdGZUtaDxC
-EObjjvbdqFdEtWAh
-EPCkKvbdILaznWqL
-EObkKvbdQwNdCkhD
-EPCkKvbdmJDsqUqa
-EOcKjvbdvBEYrneI
-DoDKjvbdapGgELzd
-DoCjjvbdwWlAvAvV
-DoDLKvbdJbicQicY
-EPDKjvbdaaVdepPw
-DoCkKvbdsZkosAhO
-DoCkKvbdNeETiJKd
-EObkKvbdEObkLXCd
-EPCjjvbduCbuXVno
-DoCkKvbdrykpTBHn
-DnbkKvbdrEFIpNua
-DoCjjvbdlYrrSxft
-DoDLKvbdqdFIpOVa
-EObjjvbdrbFmMGjy
-DnbkKvbdRpUHKGDw
-EOcLKvbdzoPpdcMY
-DoDLKvbdfILVqnQg
-DoCkKvbdlZSqsZHU
-DncKjvbdrzMQSaIO
-DoCkKvbdhuZeWrUb
-EObjjvbdfSAvzkbo
-DoCkKvbdVZIUZjnn
-EOcLKvbdhlEdOUcZ
-DoDKjvbdbUagXkUI
-DoCjjvbdqUTgRqjt
-DoDLKvbdqTsfrRjt
-DnbkKvbdrouoKCuf
-EPDKjvbdmbKXXoNu
-DoDLKvbdhbPDEwRR
-DncLKvbduVnYKRTA
-DoCjjvbdcJNKKfXY
-EPCjjvbdeFOrCXDK
-EPCkKvbdczYoxYpb
-DnbkKvbdKfGHaaRV
-DoCjjvbdMuTRjmAX
-DoDKjvbdkMalZeGo
-DnbkKvbdbhmKLFvx
-EPDLKvbdjuwODbXw
-DoDLKvbdUMVoBVoJ
-DoCkKvbdRpTgJfDw
-EOcLKvbdajlFoNcA
-EPCjjvbdRMwaxnUz
-EOcLKvbdJcJbpjDY
-DoCjjvbdjhHLefNk
-EOcLKvbdcasNSATm
-DoDKjvbdyOTHwriD
-EObjjvbdKQydnenF
-EObjjvbdZirhPgBf
-EPCjjvbdBiKbLIfK
-EOcKjvbdNeDtIiKd
-EOcKjvbdkDLjqGtg
-DoDKjvbduDDVWuoP
-DncLKvbdePErjtTr
-EOcKjvbdJbicQjDY
-EPDKjvbdrylQTBHn
-DnbjjvbdkMbMZeGo
-DncLKvbdtlYWaUAw
-DoCjjvbdDwxMUTtM
-EObkKvbdjblKqGtg
-DoDKjvbdRMxCZNtz
-EObkKvbdqYoIGqDx
-EPDKjvbdmfeYNNgZ
-EObjjvbdTAFIhCPE
-DoCjjvbdjKGIKMxS
-EOcLKvbdMpYRWOHT
-EOcLKvbdMoxRVnGs
-DncKjvbdhaoDEwQq
-DnbkKvbdEXxMTtTl
-EPCkKvbdMgCpMpVL
-EObjjvbdRzKITDWA
-EOcLKvbdrzLosBHn
-EPCkKvbdBraCsfWr
-DoCkKvbdaaVeGPow
-EOcLKvbdIGgZyXxH
-EPDKjvbdliETptqa
-EOcLKvbdbKlGPODA
-DnbjjvbdRadElJZL
-EPDLKvbdjFLHVPAO
-DnbkKvbdiBnbdwRR
-EObkKvbdvBDyTOeI
-DnbjjvbdUyHtZjnn
-DnbkKvbdmgFYNOGy
-DnbkKvbdGKdsDHlu
-EPDLKvbdZRNEiMeR
-DoCkKvbdbLLeoODA
-EObkKvbdANIZSvzY
-DoCkKvbdziuPpDrt
-DnbjjvbdWHwvXgYz
-EPDKjvbdsBfNLgLZ
-DoCkKvbdWWiXudFH
-EPDLKvbdwzIGGYEr
-EOcLKvbdVTmUGMWK
-EObjjvbdMSXMytpz
-DncKjvbdZirhQGaf
-EObjjvbdCJLBjiGK
-EPCjjvbdZLrETnLm
-EObjjvbdelevfljL
-DncKjvbdGYuVBEYC
-EPCkKvbdkCkjpgUg
-DoCkKvbdbhljLFwY
-DnbjjvbdeEoSBvbj
-DncLKvbdvAcyTPFI
-DnbkKvbdjblLQgVH
-EPCjjvbdeEoSBvbj
-DnbkKvbdaMjbStlg
-EObjjvbdrDdhpOWB
-EOcKjvbdbKlFoODA
-EPDLKvbdZjTIQGaf
-EObjjvbdEzsqEkcJ
-DnbjjvbdZRNEiNEq
-EObjjvbdqlzJxlIJ
-DnbkKvbdkIHLfFmk
-EObkKvbdMtrrKmAX
-EPCkKvbdNQXpvNgT
-EPCkKvbdbrcKtEKB
-EObjjvbdSPtGjGEX
-DoDKjvbdxwiJaoyk
-DnbjjvbdVYhUZkPO
-DoDLKvbdXrlBNUPY
-DoDKjvbdZnmiEdzK
-DoCjjvbdWWiXvDeH
-DoDLKvbdyNsHwsIc
-DoDKjvbdwyhFfYEr
-EPDLKvbdNeDshhkE
-EPDKjvbdBiLBkJFj
-EOcKjvbdJqZdoGNe
-EOcKjvbdbAvEepQX
-DoCjjvbdaNLBsUlg
-EPDLKvbdvBDxsOdh
-DncKjvbdGFirNiTq
-EPDLKvbdZnmiEeZj
-DncLKvbdePFSjtTr
-EOcKjvbdnGdwlnHZ
-EOcLKvbduDDUvuno
-EObjjvbdZQmFIldq
-DoCkKvbdcyxpYYqC
-EOcLKvbdMRvlzVQz
-DoCjjvbdtcDUwVoP
-EPCkKvbdrXQLbhxq
-DoDKjvbdkVwODbXw
-DnbjjvbdnCJwYOmu
-DnbkKvbdqvpLbhxq
-DoDKjvbdKDJcQjDY
-DnbkKvbdvwMAvAuu
-EPDKjvbdtvNxKRTA
-DoDKjvbdYkqctOMN
-DoDKjvbdtcCuWvOo
-DoCjjvbdEObkLXDE
-DoCkKvbdbrbjtDia
-EObkKvbdDncKkXDE
-DnbjjvbdxxJKBozL
-EPCjjvbdbhlikGWx
-DncKjvbdJXtCIMRQ
-EOcLKvbdkVvmcaxX
-DoCjjvbdqwPkbhyR
-EObjjvbdySnImRbH
-EObjjvbdZQleImFR
-EObkKvbdmpZxujyC
-EPCjjvbdhbPDEvpq
-EObkKvbdpyPHgREY
-DoDLKvbdwzIGGXeS
-EObjjvbdaSGChUGL
-DoDKjvbdrbFmMGkZ
-EPCkKvbdxKwEHzyf
-DnbkKvbdJXtBgkpp
-EPCkKvbdlZTRrxft
-EOcKjvbdFVyPpNKF
-DoCkKvbdaRecHsek
-DoDKjvbdFfKRnJUR
-DoCjjvbdyOTIXrhc
-DoDLKvbdyOSgxShc
-DoDKjvbdEOcKjwCd
-DoCjjvbdzoPpeClY
-DoCkKvbdURRPVUhN
-DoDLKvbdVqmxCFMD
-EOcKjvbdNVSrKmAX
-EOcKjvbdTvLpKTaR
-EPDLKvbdCTAbtFwS
-EPDLKvbdZyEKNblS
-EOcLKvbdsCFllHLZ
-EObkKvbdjlbMZeHP
-EPDKjvbdMpXpunGs
-EObjjvbdaNLCSuNH
-DoDLKvbdkCkjqHUg
-EPCjjvbdTYKlNzjx
-DnbjjvbdNxOuzdOU
-DoCkKvbdegjvRmpg
-DoCjjvbdhfjCyWKV
-DncLKvbdjggMFfNk
-EOcKjvbduVmwjRTA
-DnbkKvbdDjHiuxKA
-EOcLKvbddePRavcK
-DnbkKvbdwkWcgzyf
-DnbkKvbdHlBznXQk
-EPCkKvbdatafxKsh
-EPCjjvbdcJMjKfXY
-DoDKjvbdrDdiQOWB
-DoDLKvbdVvhwvEEg
-EObjjvbdwjvdHzzG
-DncLKvbduMYXAtAw
-DoDLKvbdZQmFJNEq
-EPCjjvbdyOTIXriD
-DoCkKvbdbiNKLGWx
-DncKjvbdHEKvKBij
-EPDLKvbdYlSDtNkm
-DoDKjvbdTqROuVIN
-EPCkKvbddeOqbXCj
-EOcLKvbdCTBCsewS
-EPCjjvbdnUtykJrG
-DnbjjvbdlZTSSyGt
-EPCjjvbdjmBkyeGo
-DnbkKvbdVhXuwfxz
-DncLKvbdePFTLTsr
-EOcKjvbdemGWgMik
-EObkKvbdhuZeWquC
-EPCjjvbdEvYpQNKF
-EOcKjvbdpaJFAXHd
-DoDKjvbdJSyBSmYM
-EOcLKvbdSCDdlIxk
-DncKjvbdSLZGVGkT
-DnbkKvbdrbFlkgKy
-EObjjvbdJSyAsMwl
-EOcKjvbdEOcKkXDE
-EPCjjvbdMoxQumfs
-EPDKjvbdUQpnuUgm
-DncKjvbdaaWFFoow
-DnbkKvbdakMGPODA
-EObkKvbdrEEhomua
-EOcKjvbdmozZWLYb
-EObjjvbdVgwuxGxz
-EOcLKvbdCJLCKhej
-EPDLKvbdVUNUGLvK
-EOcLKvbdLGGHbBRV
-DoCkKvbdlqxtysEJ
-EOcLKvbdcScLTdKB
-DncKjvbdhtydwRtb
-DoCjjvbdcTCjscia
-DncLKvbdUslsekuj
-DoDKjvbdwuNFRYkn
-EOcLKvbdijGHjNYS
-DoCjjvbdJSyBSmYM
-DoDKjvbdEYXlUTtM
-EPDKjvbdUyITzKoO
-DnbkKvbdvBDyTPFI
-DoDKjvbdYlRcsmkm
-DoDKjvbddePRbXCj
-EPCkKvbdVZHtZjoO
-EPDLKvbdWXIxVceH
-EPCjjvbduDDUwVoP
-DncKjvbdQlxBxnUz
-DoDLKvbdfpBzvdYI
-DoCjjvbdMJBlRYAS
-EPCkKvbdZisHofaf
-DnbkKvbdkWXNdCXw
-EOcKjvbdEYXkstTl
-EOcKjvbdfekymgHA
-EPDKjvbdelfWflik
-EPCjjvbddCTNSAUN
-EPDKjvbdpfDeUVaI
-DncLKvbdiBnbeWqR
-EObjjvbdEuyPoljF
-EPCkKvbdRDcBQRES
-DncKjvbdhfibxujV
-EObkKvbdVqnYBeMD
-EPDKjvbdJKEAKQGd
-EOcLKvbdsQVoJbuf
-EOcKjvbdqcdhonVa
-EObjjvbdJcKCqJcY
-EOcKjvbdpfEEsuaI
-EPDLKvbdxnTIYShc
-EOcLKvbdxVMdqYlO
-EObjjvbdZyDimcMS
-DncKjvbdiGjCxvKV
-DoCkKvbdRbEEkiYk
-DoCjjvbdWIYVxHYz
-EPDLKvbdYzcFqjVy
-DncLKvbdTYLLmzjx
-DoDLKvbdwXLaVaWV
-DoDLKvbdMRvlyuQz
-DoCjjvbdajkeoNcA
-EPCjjvbdjEkHUoAO
-DoCjjvbdZoNiFFZj
-DncLKvbdlZTRryHU
-DoCjjvbdcTDLTdJa
-EOcLKvbdlhctRVSB
-EObjjvbduaEYroFI
-DncKjvbdzjUpQDsU
-DoDLKvbdyqPNIiwA
-DnbjjvbdhkdcnUby
-EObjjvbdVYgtZjoO
-DnbjjvbdCJLCLJFj
-EPCjjvbdzeZnzdyp
-DnbjjvbdqlyjZMIJ
-EOcLKvbdGAnpyJzm
-DoDLKvbdNGcQMpVL
-DncKjvbdADSXiyiQ
-DoCjjvbdLBLHNCYR
-DoCkKvbduVnXjRTA
-DncKjvbdtSqsZZeD
-EPDKjvbdpyOhGqEY
-EObjjvbdEuyPomKF
-EPDKjvbdyOSgxTIc
-EPDKjvbdGFiqnJTq
-EOcKjvbdyYJJbPzL
-DncLKvbdADRwjZiQ
-DncLKvbdCSaDUFwS
-DoDLKvbdEzsqEkbi
-EOcLKvbdssSTYyeD
-DnbkKvbdSBdEkiZL
-EObjjvbdFWZQPlie
-EObkKvbdbBVeFpPw
-DoDLKvbdBdQBVjMf
-EPDLKvbdptUHRqjt
-EPCkKvbdQwODcMID
-DoDLKvbdelevgMik
-DnbjjvbdVTmUFkuj
-DnbkKvbdLYqJrzuG
-DoCkKvbdCTAbsevr
-DoCjjvbdJpyeOfOF
-EPCkKvbdOStWHEtp
-EOcLKvbdKVtfEEfi
-DoCkKvbdmuUykJqf
-DnbjjvbdQZNAHSrK
-DnbjjvbdMgDPlpUk
-DnbkKvbdCIkBjhfK
-EObjjvbdBsBCsewS
-EOcLKvbdYzbfRivZ
-EOcLKvbdrzMQSaHn
-EOcKjvbdRosfjFcw
-EPDKjvbdANHyTXZx
-EPCkKvbdliDsptqa
-EOcLKvbdACrXizIp
-EPCjjvbdLFfICApu
-DoCjjvbdbAvEepPw
-EOcKjvbdTpqPVVHm
-DoCjjvbdsBemMGjy
-EPCkKvbduaEZTPEh
-DoCkKvbdOStWHEtp
-EPCjjvbdbBVeGQPw
-EObjjvbdOSsufeUp
-DoCkKvbdjAQHBPgK
-EPCjjvbdbBWEfPow
-EPDKjvbdtSqsZZdc
-EPCkKvbdegjuqmpg
-DoDLKvbdRotGifDw
-DoDKjvbdmJEUQtrB
-DoCjjvbdcIljKewY
-EObkKvbdbiMjKewY
-EObjjvbdcScKsdJa
-EPDKjvbdtSqsYyeD
-DnbkKvbdrpWOjCvG
-EPDLKvbdBiKbLIej
-EPCkKvbdBdPaWJmG
-EObjjvbdZRNEhmEq
-EOcLKvbdiUzFWrUb
-EPCkKvbdmIdUQtrB
-EPCkKvbdbUafxLTh
-EOcKjvbdnCKWxOmu
-DoCkKvbdsZkosBIO
-DnbkKvbdHDjujCJj
-DoCjjvbdWSOYCFLc
-EPDKjvbdmJETqVSB
-DnbjjvbdrXPkcJYq
-EObkKvbdMgDPlpVL
-DnbjjvbdZisHpGaf
-DoCjjvbdGGJqmiTq
-EObkKvbdIHGyyYXg
-EObkKvbdqTsgRrKt
-EObjjvbdmJDtRVSB
-DnbjjvbdddoSBvbj
-EPDKjvbddePSBvbj
-DnbjjvbdBcpAvJlf
-DncKjvbdezvYeItX
-DoDKjvbdmgEwmNfy
-EObjjvbdDigivXjA
-EOcLKvbdmJEURUrB
-EOcLKvbdePFTLTtS
-EPDKjvbdVTmUGMVj
-EPDKjvbdnBivwnnV
-EPCjjvbdZnmhddzK
-DncKjvbdZeXfzgiC
-DoDLKvbdEuyPpNJe
-DoDLKvbdqdEhpNua
-DoDKjvbdFWYpQMie
-DoCkKvbdMfcQMpVL
-EOcKjvbdmttykKSG
-DnbjjvbdlhcspuSB
-EPCjjvbdWSNwbFMD
-EPDKjvbdRbEElIyL
-EOcKjvbdyNsHwsIc
-EPCjjvbdrylQTAgn
-DncLKvbdADSYJyiQ
-EOcKjvbdZjTIPgBf
-EObjjvbdKDKDQibx
-EObkKvbdKDJcRJcY
-DoCkKvbdmSZUzSdJ
-EPCjjvbdaNKartlg
-DoDKjvbdIGgZyXwg
-EObjjvbdauCHXjsh
-EObkKvbdxUmEpyLn
-EPCjjvbdNsTugEtp
-EPDLKvbdZyDimblS
-DoDKjvbdbUagYKtI
-DncKjvbdliETpuSB
-EOcKjvbdDihKWXjA
-DncKjvbdZtIiZETO
-EObjjvbdygZMAMeX
-DoDKjvbdfNGWgMik
-DoCjjvbdZMSEUNkm
-EOcKjvbdsrqsZZdc
-EPCkKvbdACqxJzJQ
-EPDLKvbdNdcshiKd
-DoDKjvbdyqOmIiwA
-EOcKjvbdRMwbYmtz
-EOcKjvbdYpmEhleR
-DoDKjvbdjJfHimYS
-DoCjjvbdrbFmMHLZ
-DoCkKvbdBcpBWKNG
-DoDKjvbdIxTbHkqQ
-DoDKjvbdhuZdwSUb
-EPDLKvbdJYUBglQp
-EPCkKvbduCcUwVno
-DnbkKvbdwuNEpyMO
-DncKjvbdssSSxzEc
-DoDLKvbdGdLWJbKK
-EObjjvbdFjdsDIMu
-DncLKvbdfkGzbfAE
-EOcLKvbdrRtkOLBN
-EPDLKvbdajkfOmcA
-EPCjjvbdrMzJxkhJ
-DncLKvbdqZOhHREY
-DoDKjvbdmJEUQuSB
-DnbkKvbdRDbaQRES
-EPCjjvbdpyPHgREY
-DnbjjvbdMIalQxAS
-DncLKvbdiZuGMROG
-DoDKjvbdgFkymfgA
-DncLKvbdsCGMkgLZ
-EObkKvbdRotHJecw
-EPDKjvbdkClKpftg
-EPCkKvbdRjyGUgLT
-EOcKjvbdhuZdvqtb
-EOcLKvbdmttzKjSG
-EObjjvbdhlEdOVDZ
-DoDLKvbdZisHpGaf
-DnbkKvbdTqQntuHm
-EPDLKvbdNdctIiLE
-EObkKvbdWRnXbFLc
-EPDLKvbdKVtfDdgJ
-EPCkKvbdJSyBTMwl
-DnbkKvbduWNxKQsA
-DoCkKvbdqGEFUVaI
-EPDKjvbdhkdcnVDZ
-EPCjjvbdySnIlrBg
-EOcLKvbdYlRctNlN
-EObkKvbdvBDxroFI
-DoDLKvbdxwiJbPzL
-EPCjjvbdyNsHxTJD
-DoCjjvbdhfjDYujV
-DoDLKvbdcImKLFwY
-DnbjjvbdqwQMChxq
-DncLKvbdaaWEfQPw
-DnbkKvbdUQqOuUhN
-EOcLKvbdUaCRSqSZ
-DnbjjvbdRMxByOUz
-EPDKjvbdKCjCpjCx
-DncLKvbdrMzJyMIJ
-EPCjjvbdOEdThhjd
-EPDKjvbdrSUkOKaN
-EObkKvbdMowpunGs
-DoCjjvbdhzVGLpmf
-EOcLKvbdaMkBsVMg
-DoCjjvbdkIGkfFnL
-DnbkKvbdYpldiNFR
-EPDLKvbdZxcjNcMS
-EPDKjvbdGGKRnJUR
-EPCjjvbdbiNKKfWx
-EObjjvbdmRyUyrci
-DncKjvbdLrXNZtpz
-DncKjvbdZjTIPgCG
-DnbkKvbdypoNIiwA
-EPCjjvbdDihKVxKA
-DncKjvbdyfxlANFX
-DoDKjvbdiMFEOVCy
-EPCkKvbdtcDUvvPP
-DoCkKvbdEvYpQMie
-DnbjjvbdZLrDtOLm
-EPCjjvbdKQzFPGNe
-EPDKjvbdGdLVjCJj
-DoDKjvbdqYoHfqDx
-DoDLKvbdFVxoomJe
-DnbkKvbdKRZePFnF
-DoCjjvbdFVyQQMjF
-DnbkKvbdTulQJsaR
-EObkKvbdkHgMFenL
-DoDKjvbdVUMselVj
-EPDLKvbdrDdhonVa
-DncKjvbdkVvmcaxX
-DoDLKvbdrRuKnLAm
-EOcKjvbdJbibpjDY
-EPDKjvbdXrlAmToY
-DnbkKvbdZirhQGbG
-DnbjjvbdjgfkfFnL
-EOcKjvbdGFjSOJTq
-DoDKjvbdSCDeMJYk
-DoCkKvbdpecdtWAh
-EObjjvbdzeZnzdyp
-DoCjjvbdMJBlQxAS
-EPDKjvbdnBivwnmu
-DoDKjvbdRadElIyL
-DoDLKvbdsZlPsBHn
-EObjjvbdznopeDLx
-EOcLKvbdCJKbKiFj
-DncLKvbdmgExNNfy
-DnbkKvbdnPzYvKxb
-DncKjvbdrDdiPnVa
-DoCjjvbdAMgxrwZx
-DncLKvbdTfzmkwWF
-DncKjvbdqiAJdloF
-EPCkKvbdwuMeRZLn
-DoCjjvbdVUNUFkuj
-DoDLKvbdKQyePGNe
-DncKjvbdLqvlzVQz
-DoDKjvbdmgFYNNgZ
-DnbjjvbddxZtTrFz
-EObkKvbdqTsgSSKt
-DnbkKvbdZxcimcMS
-DoCjjvbdANHySvyx
-DoDLKvbdZQmFJMdq
-DoCkKvbdHDjujBij
-EPDLKvbdsPuoJbuf
-EPCjjvbdYpmEhmFR
-DncLKvbdZjTHpGaf
-EPDKjvbdEuyQQNKF
-DoCkKvbdmbKWxPNu
-DoCkKvbdRjyFtfjs
-DoCkKvbdiifHjNYS
-EPDKjvbdpyOhGpdY
-DoDKjvbdUVlPitBR
-DoCjjvbdEKIJuwjA
-EPCjjvbdFkFTDHmV
-EOcLKvbdySnJNSCH
-DncLKvbdRpUHJedX
-EPDKjvbdtvOYJpsA
-DoDKjvbdKDKDQjCx
-DoDLKvbdaMkCTUmH
-EOcKjvbdMpYRVnGs
-EOcKjvbdtSqsYzFD
-DncLKvbdKaKgNCXq
-DoCkKvbdsCFllGkZ
-EObkKvbdNrsvGeUp
-DoDKjvbdmaivxOnV
-EOcLKvbdOEctIhjd
-DoCkKvbdemGXGljL
-DoDLKvbdjvWmdBxX
-EPCkKvbdCIjbLIej
-EPCjjvbdkHfkfFmk
-DoDLKvbdwzIGFwdr
-EOcKjvbddBrlrAUN
-EPCkKvbdJutecdgJ
-DoCjjvbdWRmwaeLc
-DnbkKvbdiVZdwRuC
-DnbjjvbdGLEsDHmV
-EPCkKvbdxsOJNSCH
-EPCjjvbdIwtBgkqQ
-DncKjvbdbrbjtDjB
-EPCkKvbdjhGkeemk
-DncKjvbdWWiXvDeH
-EPCjjvbdnUtzKiqf
-DncKjvbdTukoitAq
-DncLKvbdCIkBjhfK
-DoCkKvbdhgKDZWJu
-EPDKjvbdBhkBjiFj
-DnbjjvbdMfbpNPtk
-DoDKjvbdnBjWxPOV
-DoCjjvbdEJhKWYKA
-EOcKjvbdTpqOtuHm
-DoCjjvbdwzIFfXdr
-EOcKjvbdrpVoKDVf
-EOcLKvbdEYYLtTsl
-DoCkKvbdLFfICBQu
-EOcKjvbdeXzTsrFz
-EOcLKvbdSQUHKFdX
-EOcLKvbdraemMHLZ
-EPDKjvbdkIGlFemk
-DncKjvbdOYOuzcnU
-DoCkKvbdIwtCILpp
-DncLKvbdZoNiEdzK
-DoDKjvbdsrqsZZeD
-EPDLKvbdzGyMANEw
-DncLKvbdBraCsewS
-EObkKvbdpyOgfpcx
-DnbjjvbdxmrgxTIc
-EOcLKvbdZjSgpHCG
-EPCjjvbdrWpMDIxq
-DncKjvbdZtJIyESn
-EPCjjvbdJSxaSmXl
-DoCjjvbdiMFEOVCy
-DoCjjvbdDwwlTstM
-DncLKvbdJYUCHkpp
-EPDLKvbdsrrSxzFD
-EObjjvbdkHgMFfNk
-EPDKjvbdOStVgFUp
-DnbjjvbdjhHMGGOL
-DnbjjvbdZyEJmcLr
-EPDKjvbdDihKWYKA
-DncLKvbdRosfiecw
-DoCjjvbdyTNhmSCH
-DnbkKvbdFeirNhsq
-DoDKjvbdrDeIpNvB
-EObkKvbdVAaqTRSZ
-EPDLKvbdLAkGlbXq
-EOcKjvbdVAaprqRy
-EPDLKvbdfIKvRnQg
-EPCjjvbdUQpoVUgm
-EObjjvbdxVNEpyMO
-EOcKjvbdsCFllGkZ
-DncKjvbdsBelkgLZ
-DoDLKvbdvlvANDeN
-DoCjjvbdnBivwoNu
-EObjjvbdsCGMkgLZ
-EObjjvbdsPvPJbvG
-EPDLKvbdxrnImRbH
-EPDLKvbdNPxRVnHT
-DoDLKvbdMtrqkNAX
-DoDKjvbdiGicZWJu
-EPDKjvbdOFEUJJLE
-EPDLKvbdoAKzshDn
-DoDKjvbdehKvRnQg
-EObjjvbdLLBIWAKZ
-EPDKjvbdeOdsLUUS
-DncKjvbdjvWmdBxX
-DncLKvbdezuyFJTw
-EPCkKvbdNPwpumgT
-EPCjjvbdkxsRrxgU
-EPDLKvbdptUHSSLU
-EPDKjvbdeATqNXif
-EPCkKvbdjlakzEgP
-EObjjvbdyXiKCPzL
-DoCjjvbdhlFDmuDZ
-DncKjvbdauCGxLUI
-EObjjvbdySmiNSBg
-EOcLKvbdfNGWfljL
-DncLKvbdVviYWDdg
-EPCkKvbdkIHLefOL
-EPDLKvbdRNYCZNtz
-DoDLKvbdmfdxNOGy
-DoDLKvbdcScKtDjB
-EOcLKvbdEPDLKvcE
-EPCjjvbdUaBprqSZ
-EObkKvbdddnqbXDK
-EPCkKvbdaaVeGQQX
-DoDLKvbduoTzqKnt
-DnbjjvbdqwPkbhxq
-EObkKvbduaEZTOdh
-EOcLKvbdKfFhBaRV
-EOcKjvbdVYgtZjoO
-EOcLKvbdrSVKnKaN
-DnbkKvbdsCFmMGjy
-DnbkKvbdSLYeuGkT
-DoCkKvbdwWlAvAuu
-EPCjjvbdRXOEClID
-EPCkKvbdCIkCKiFj
-EOcKjvbdGckViajK
-DoCkKvbdznpRFCkx
-DnbjjvbdxKwDgzyf
-DncKjvbdVAaprprZ
-DoDKjvbdOEctIhjd
-EObjjvbdmIdTptqa
-DnbjjvbdvwMAuaWV
-EObkKvbdEYXksssl
-EPCkKvbdiZtelQnG
-EOcKjvbdqdEhpOVa
-DnbjjvbdidjfuPAO
-DnbkKvbdnBivxPNu
-EObkKvbdrSVKmkBN
-DnbkKvbdiCPDFWqR
-DncKjvbdZisHofaf
-DoCjjvbdJvVFcdfi
-DoDLKvbdcyxpYYpb
-DoCjjvbdrykpTBHn
-EPDLKvbdqrUkOKaN
-DoCkKvbdGQATWgFy
-DncKjvbduaDxsPFI
-EPCkKvbdYkqdTnLm
-EObjjvbdQYmAGsRj
-DnbkKvbdZyEKOCkr
-DnbkKvbdOEdThhjd
-EPDKjvbdiCOcFWpq
-EOcKjvbdMfcQNPtk
-EPDLKvbdLGFhBaRV
-EPDLKvbdssSSyZeD
-EPCkKvbdTAFJIBoE
-EObkKvbdeFPRavbj
-DnbkKvbdjKFhKNYS
-DncLKvbdCJLBjiGK
-DncLKvbdqlzJyLhJ
-EOcLKvbdRyigsCvA
-DoDKjvbdYqMdhldq
-DnbjjvbdehKvSOQg
-EObjjvbdMgColouL
-DoCkKvbdehKuqnRH
-DoDKjvbdQvmdCkhD
-DoDKjvbdMSWlzVQz
-EObkKvbdbhlikGXY
-DoCjjvbdeAUQmYJf
-EPCjjvbdZyEJmcMS
-DoDKjvbdIGfzYxYH
-DoDLKvbdHDjvJbJj
-EOcKjvbdQwNdCkgc
-EPCkKvbdRWnDcMHc
-DnbjjvbdrMzJyMIJ
-DncKjvbdlhctQuSB
-DoDKjvbdbPgGdLzd
-EObkKvbdijFhJmXr
-DoCjjvbdbQGgDkzd
-EPDLKvbdDihJvXjA
-EObjjvbdaNKasUmH
-DncKjvbdZyEKOClS
-DnbjjvbdSLYfVHLT
-DoDLKvbdwzHfFweS
-EPCjjvbdfNFwHNJk
-DoDLKvbdelewHNJk
-EPCjjvbduaDxroEh
-DoDKjvbddwytURez
-DncKjvbdwtmEpyLn
-EOcLKvbdCIkBkIej
-EOcLKvbdiLddOUcZ
-EPDKjvbdiUydwSVC
-DncKjvbdrEEiQOVa
-DnbkKvbdYzbeqivZ
-DoCjjvbdkVwOECYX
-DoDLKvbdZLqcsmkm
-EObjjvbdVYgtZkPO
-EOcLKvbdHffyxwwg
-EPDKjvbdcIljLGWx
-DnbkKvbdMpXpvNfs
-EOcLKvbdFeirOJTq
-DncLKvbdWWhxWEFH
-DoCjjvbdZRMdhmEq
-DnbkKvbdULvPBWPJ
-EPDLKvbdZRMdiMdq
-DnbjjvbdTYLMNzkY
-DoCkKvbdZxcjNblS
-DoCkKvbdKCibpicY
-EPDLKvbddoFTKtUS
-DncLKvbdcImKLGXY
-EOcKjvbdKaLGmBwq
-EPCkKvbdnHFYMnGy
-EPDKjvbdUQqPUuIN
-EPDKjvbdeAURNYJf
-DoCkKvbdxwiKCQZk
-DnbkKvbdKVuGDeGi
-EPDKjvbdrovOicVf
-DoDLKvbdrylQSaHn
-EOcLKvbdySmhlrBg
-EOcLKvbdNrsufeVQ
-EOcKjvbdzoQREblY
-EPCkKvbdzaAOgHCM
-DoCjjvbdZLqdTmkm
-EObkKvbdNGbpNQUk
-EOcKjvbdZshiYdSn
-EPDLKvbdDncLKvbd
-EOcKjvbdqlzJyMHi
-DoCkKvbdBhkCKiFj
-EOcLKvbdRaceLhyL
-EPDLKvbdxsNiNRbH
-DoDKjvbdtcCtwWOo
-DnbjjvbdmfdwlnGy
-DncKjvbdREDBQQdS
-DncLKvbdnPzYvKxb
-EPCjjvbdjgfkefNk
-DnbkKvbdnUtykJrG
-EPDKjvbdSCEFLiYk
-EOcLKvbdGcjuiajK
-EPCjjvbdJYUCHlRQ
-EPDLKvbdYpleIldq
-EObkKvbdfMfWflik
-DncLKvbdwuMdpyLn
-DoDLKvbdEPDLLWcE
-DoDLKvbdZLrDtOLm
-DoCkKvbddZxoxYqC
-DncLKvbdTulQKUAq
-DncKjvbdqrUjnKaN
-DoCkKvbdGFjRmiTq
-EPCjjvbdpssfrRkU
-EPDKjvbdrXQLbiYq
-DoCkKvbdNQYQunHT
-DoCkKvbdNrtWHEuQ
-DncLKvbdjgflGGNk
-DncKjvbdBsBCsewS
-DoCkKvbdMpYRVmfs
-DnbkKvbdKfFhBaQu
-EObkKvbdGcjuiaij
-EObkKvbdakMGOnDA
-DnbkKvbdFyUuAcxC
-DnbkKvbdtSrTZZdc
-EPCjjvbdatafxLTh
-EPCkKvbdUGzmlXVe
-EObkKvbdZyDinClS
-DncKjvbdyzdnSIJI
-DnbkKvbdnPyxukZC
-DoDKjvbdkDMLQgVH
-EObjjvbdbVBfwjtI
-EPDLKvbdzRPMhiwA
-EObkKvbdhkeDmuCy
-DnbkKvbdZQleImEq
-EObjjvbdrDeJPnVa
-EPDLKvbdaNLBsVMg
-DnbkKvbdOEctIhjd
-EOcKjvbdatagXkUI
-DncKjvbdMowpunGs
-EObkKvbdtvNwiqTA
-DnbjjvbdyzdnSHiI
-EObkKvbdbhlikFvx
-EOcKjvbdaNKaruNH
-DnbkKvbdiVZdvqtb
-EObkKvbdVYgszKoO
-DoCkKvbdjJfIKMwr
-DncLKvbdezvZFJTw
-EObkKvbdcyxoxYqC
-EPDLKvbdFejSNiTq
-DncKjvbdIwsbIMQp
-DnbjjvbdTukpJsaR
-EPDLKvbdIsZArlxM
-EPDKjvbdTAEhgand
-EOcLKvbdfNGXHMik
-DoDKjvbdjcMLQgUg
-DncKjvbdSLYfVHKs
-DoCjjvbdnBjWwoOV
-EPCjjvbdnBjWwnnV
-EObkKvbdQvmccLgc
-EPDKjvbdwuMeRYlO
-DoDKjvbdNddUJIjd
-DoCkKvbdqUTgSRkU
-DoDLKvbdehLVqmpg
-DoDLKvbdrovOjCvG
-EObjjvbdzoPpdcMY
-EPDLKvbdZRNFIleR
-DnbkKvbdSLZGVGjs
-DoCkKvbdySmiMrBg
-DnbkKvbdwyhFfXeS
-DoDLKvbdWHwvYHYz
-DoCjjvbdIHHZyYYH
-EObjjvbdJSyArmXl
-DncKjvbdACqxJyiQ
-DncLKvbdmpZxujyC
-DoCjjvbdFkFScINV
-EPDLKvbdCDpAujNG
-DnbkKvbdhkeDnUby
-DncLKvbdFWYopNJe
-DoCjjvbdLAjfmCYR
-EPCjjvbdxrmiMrCH
-EObjjvbdcImJkGWx
-DoCjjvbdFejRnJTq
-EObkKvbdYTMAlsnx
-EPCjjvbdsPvOibuf
-EObjjvbdNeDshhjd
-EOcLKvbdBiKbLIej
-EObkKvbdauCGxLTh
-EPDKjvbdbBWEepQX
-EPCkKvbdVrNxBdlD
-EObjjvbdMIalRYAS
-EOcKjvbdJcKCpjCx
-EOcLKvbdLqwNZtpz
-DoCkKvbdZisHogBf
-DnbjjvbdEPDKjvbd
-DoDLKvbdFWZQQNJe
-EObkKvbdHgGzYwxH
-EOcKjvbdjbkkQfuH
-DnbjjvbdtkxXAtBX
-EPDLKvbdLAkHNCXq
-EOcLKvbdWWhxVdFH
-DncLKvbdCWzdIeQW
-DoDLKvbdVvhwvDdg
-EObjjvbdpfDeUWAh
-EOcLKvbdqmZixkhJ
-DncKjvbdyzdmrIJI
-DncLKvbdRpTgJecw
-DoDLKvbdGFjSOIsq
-EOcKjvbdwuNFQyLn
-DnbjjvbdIsZAsMwl
-DncKjvbdptTgRqkU
-DncKjvbdZQmEiNEq
-DnbkKvbdauCHYLTh
-EPDLKvbdyzdmrHhh
-EPCjjvbdZoOJFEyj
-EOcLKvbdUQqOttgm
-DoCjjvbdRNYCZNtz
-EPDKjvbdrRtkOLBN
-DncLKvbdmajWxOmu
-EPDLKvbdLBLHMbXq
-DoDLKvbdCIjajhfK
-EObjjvbdYkrDtOMN
-EOcLKvbdUtNUGMVj
-EObjjvbdaSFcHsek
-DnbkKvbdXrkaMtPY
-DoCkKvbdZQmFImFR
-EOcLKvbdcJMijewY
-EPDLKvbdGLErbhNV
-DnbkKvbdiUydwSVC
-EPDLKvbddndsKssr
-DoDLKvbdxwhjCPzL
-DoCkKvbdxVMeQxkn
-DncKjvbdiBoCdwRR
-EPDLKvbdnPyyVkZC
-EPCjjvbdmuUzLKRf
-DoDLKvbdSQUGiecw
-DoDKjvbdRbDdlJZL
-DncKjvbdqrVKnLAm
-DoDKjvbdVBCQsQrZ
-DoDKjvbdmbKWxPNu
-EObjjvbdFVyQPmKF
-DnbjjvbdiiehJlxS
-EOcKjvbdIrxaSmYM
-EOcKjvbdsZkosAgn
-EOcLKvbdnCKWxPOV
-EPDLKvbdKWUecdfi
-DncLKvbdhgKDZWKV
-EPDLKvbdySnImSCH
-EObkKvbdJKEAKQGd
-EOcLKvbdZMSETmkm
-DoCjjvbdhgJcYujV
-EOcLKvbdehLVqmpg
-DoCkKvbdezuyFItX
-DncLKvbdvBDxsOeI
-EObkKvbdTulPisaR
-DnbkKvbdajkfPODA
-DoDKjvbdYkrEUOLm
-EPCkKvbdfIKvSNpg
-EPCkKvbdiBncEwQq
-EOcKjvbdKWUecdgJ
-EObkKvbdYlRcsmkm
-EPCjjvbddwzUTqez
-DnbjjvbdeYZstRez
-EPDLKvbdxVNEqZLn
-DncLKvbdFjeScINV
-EObjjvbdxUleQxkn
-DncKjvbdKWUfDdfi
-DoDLKvbdssRrxzEc
-EObjjvbdRpUGiedX
-EOcLKvbdZQleJMdq
-DnbkKvbdqdFIpNua
-EPCjjvbdYzberKWZ
-DoDKjvbdxxIjBoyk
-EOcLKvbdEObkKwDE
-DoDLKvbdqquLNjaN
-DncKjvbdwuNFRZLn
-DoCjjvbdqUTgRrKt
-EObkKvbdVwIwvDeH
-DnbkKvbdVwJYWEEg
-DnbjjvbdYlSETnMN
-DnbkKvbdqTsgRqjt
-DoDKjvbdiGicZVjV
-DnbjjvbdxnTHxTJD
-EObkKvbdqUTfrSKt
-DoCkKvbdFyVVBEXb
-EOcKjvbdqGDdsvAh
-EPCkKvbdTkunaVni
-EObkKvbdMRvlzVQz
-EPDKjvbdDncKkWbd
-EObjjvbdqqtkNkBN
-DncLKvbdfHkWRnRH
-DnbjjvbdiLdcnUby
-EOcKjvbdVYgsyjnn
-EPCjjvbdUtNTfMWK
-EPDKjvbdqYoHgREY
-DncKjvbdGZUuAdYC
-DnbjjvbdDnbjjwDE
-EOcKjvbdTqQntthN
-EOcLKvbdUyITzLPO
-EOcLKvbdjblLRHVH
-DoCkKvbdLGFhCBQu
-DncLKvbdliEUQuSB
-EObkKvbdRacdkiZL
-EOcLKvbdaSFcHtFk
-DoDKjvbdJYTahLpp
-EPDLKvbdUQqOuVIN
-EPCjjvbdqmZjYkhJ
-DoCkKvbdRjyGUgKs
-EObjjvbdyNrhYSiD
-EPCkKvbdBhkCKiFj
-EObjjvbdYlSDtOLm
-DoCjjvbdTAFIhBoE
-DncKjvbdNdctJIjd
-DoDLKvbdGdKvJaij
-EObjjvbdJpydnfNe
-EPDLKvbdCDpAvKNG
-DoDLKvbdeEoRavbj
-DoCkKvbddoFSjssr
-EPCjjvbdqYoHfqEY
-EPCkKvbdFkFScHmV
-EObjjvbdcyyQYZRC
-DoDKjvbdyzdmrHhh
-DoDKjvbdUWLojUAq
-EObkKvbdiCPCdwRR
-DoCkKvbdCTBDTevr
-EOcKjvbdLAkGlbXq
-EPDKjvbdcyyQXyRC
-EPDLKvbdyNsHxSiD
-EPDKjvbdqUTgRrKt
-DoDKjvbdJuuFdEfi
-DoDLKvbdEXwktTtM
-EObkKvbdeJirVtzn
-EObjjvbdYTMBMsnx
-DnbkKvbdNQXpumfs
-EPDLKvbdzitopDrt
-DncLKvbdDxXlUUUM
-EOcKjvbdADSXiyhp
-DoCjjvbdqTsgSSKt
-DoCkKvbdZtIhxdTO
-EOcKjvbdUyHtZjnn
-EPDLKvbdcSbkTdKB
-DncLKvbdxZgfGYEr
-DncKjvbdeATplxJf
-DoDLKvbdnCJwXnmu
-DnbkKvbdbKlFnnDA
-DoCkKvbdrDeIpNua
-EPCjjvbdmttzKirG
-DoDKjvbdbrbkUDjB
-DnbkKvbddZxoxZRC
-EObkKvbdhgKDZWKV
-DnbjjvbdGFiqmhtR
-EPDKjvbdULvOaWPJ
-EOcLKvbdygYlANFX
-DnbjjvbdIHGzZYYH
-EOcKjvbdhkeENuCy
-EOcLKvbdNddTiJLE
-EObjjvbdGFiqnJUR
-EOcLKvbdjvWnEBxX
-EPCjjvbdVBCRTRSZ
-DncKjvbdVBCRTRSZ
-EObkKvbdBdQAvJlf
-EObkKvbdJYUCHkpp
-EOcKjvbdGckVjCJj
-EObkKvbdBsAcUGWr
-DoDLKvbdIxUBhMQp
-DoDKjvbdMgDQNPtk
-EOcLKvbdHEKujCKK
-DoCjjvbdLhalQxAS
-EObkKvbdULuoBVoJ
-EPDKjvbdhfjDZVjV
-DoCkKvbdKDJbqJbx
-DoCkKvbdbKlGPNcA
-DncKjvbdrpVnicWG
-EPDKjvbdvAdZSneI
-DnbkKvbdFyVUaEYC
-EOcKjvbdHDjuibJj
-DnbjjvbdbiMjLFvx
-EPCjjvbdUsltGLvK
-DoCjjvbdkNBkzEgP
-DncLKvbdFxtuBEYC
-EOcKjvbdnBjWxPNu
-DnbkKvbdqUTfrRjt
-EPCjjvbdZHXEAPSi
-DoCjjvbdxxJJapZk
-DncKjvbdZyDimcLr
-DnbjjvbdiBnbeWpq
-EObjjvbdjbkkQftg
-EObjjvbdqvokbhyR
-EOcLKvbdeYZtTrFz
-EPCkKvbdLqvmZtpz
-DoDKjvbdNeDsiIjd
-EPCkKvbdeXystRez
-EOcKjvbdAMhZSvzY
-EPCjjvbdSwkMNzkY
-DoDKjvbdtlYXAtBX
-EPCjjvbdBvzdIdov
-DoDLKvbdVBBqSqRy
-EOcLKvbdTvMQKUAq
-EOcLKvbdxVMeQyMO
-EPDLKvbdBsAbtGWr
-DoCkKvbdKefHaaRV
-DncLKvbdCTBDTewS
-EPCjjvbdTIyjRAAl
-DoDKjvbdkxsSSxft
-EObjjvbdjvXOECXw
-EPDKjvbdVTlsfLvK
-EOcKjvbdjJfHjNXr
-EObjjvbdfMfWflik
-DnbkKvbdYqNFImEq
-DoDLKvbdcJMikFvx
-DoCkKvbdrXPlDIyR
-EObjjvbdeOdsLTtS
-DncLKvbdJSyArmXl
-EObjjvbdkNBlZeHP
-EObkKvbdfHkVqnRH
-DncLKvbdKCjCqKDY
-DoDLKvbdUyHsykOn
-DncKjvbdWWiYWEEg
-EPCkKvbdKWVFdEfi
-EObkKvbdFpATWgFy
-EOcKjvbdrzLpTAgn
-EPCjjvbdhuZeWrVC
-EPCkKvbdraellGjy
-DncLKvbdGKeTCgmV
-DoDLKvbdCEQAvJlf
-DoDLKvbdJvUfEFGi
-EOcKjvbdHDkVjCJj
-EPCjjvbdZxdJnClS
-DoCjjvbdcImJjewY
-DoDLKvbdkDMLRHUg
-DoDLKvbdqZOggREY
-DoCkKvbdkMakyeHP
-DoCkKvbdEvYpPmJe
-DncLKvbdJJdAJpHE
-DoDKjvbdEPCjkXCd
-DnbjjvbdlAmOmALA
-DoDLKvbdsBfNLgLZ
-DncLKvbdKyQjSzuG
-EPDLKvbdeAURMxJf
-EPCjjvbdkHflGGOL
-EOcKjvbdEuxpPlie
-DncKjvbdcyyPxYqC
-DoCkKvbdRDbaPqES
-DncLKvbdaaVeFpQX
-EOcLKvbdMuTSLNAX
-EPCkKvbdbiMjKfWx
-EOcKjvbdSCEEkiZL
-DncKjvbdbhmJkGWx
-DncKjvbdWXJYVcdg
-EOcLKvbdvBDxrndh
-DoCkKvbdCEQBVjNG
-EPDLKvbdxUmFQyMO
-DnbkKvbdznpRFCkx
-DoCjjvbdKDJbpjDY
-EOcLKvbdREDBQRDr
-DoDLKvbdZtIhyETO
-EObjjvbdKfGHbBQu
-DnbjjvbdnUtzKirG
-EPDLKvbdyNsHwsIc
-DoCjjvbdIrxaSlxM
-DoCkKvbdRjyFuHLT
-EPCkKvbdJvUfDdgJ
-DnbkKvbdgQBzvcwh
-DnbkKvbdpyOgfqEY
-DnbkKvbdmRxuZsEJ
-EObkKvbdmRyUysDi
-DnbjjvbdrzMPraIO
-EPDLKvbdDxXksssl
-EPDLKvbdqUUGrSKt
-EPCjjvbdZisIPfbG
-EPDLKvbdiGicZVjV
-DnbjjvbdqcdiPnVa
-DoDLKvbdGKdsCglu
-EPCkKvbdYSlBNUOx
-DoCkKvbdjmBkyeHP
-EObjjvbdKDJcRKDY
-EPDKjvbdiLdcmuCy
-DoCjjvbdbAvEfQQX
-EPDKjvbdegjvRmqH
-EOcLKvbdrounibvG
-DoCkKvbdliEUQtrB
-DoCkKvbdrXPlChyR
-DnbkKvbdcyxoxZRC
-DoCkKvbdWIYWYHYz
-DnbkKvbdmJETptrB
-EObjjvbdbBVeGPpX
-DoCkKvbdypnliKXA
-EOcLKvbdatagXkTh
-EPDKjvbdrounjDWG
-EPDKjvbdUyHsyjnn
-EPDKjvbddZxoxZRC
-DnbjjvbdKCjCpjDY
-DoCjjvbdKkBHvAJy
-DnbjjvbdjbkkRGuH
-DoCjjvbdrafNMGjy
-DncKjvbdxnTHwsJD
-DncKjvbdemFvfmJk
-DnbjjvbdIwsbILqQ
-EObjjvbdUMWPAvOi
-EOcLKvbdGKdsChMu
-DoCjjvbdWXIxWEEg
-DoCjjvbdvPTzqKnt
-DoDKjvbdILazmwRL
-EPCkKvbdjlakzFHP
-EPDLKvbdKDJbqKCx
-EOcLKvbdHELWKBjK
-DoCkKvbdOFDshhkE
-EPDKjvbdBhkCKhej
-DoDKjvbdNddTiJKd
-EPCkKvbdVqmwadkc
-EPCkKvbdFfKSOItR
-EPCjjvbdZshiYcrn
-DncLKvbdvAcxsOeI
-EObkKvbdKVtfEFHJ
-DncLKvbdXsMBNUPY
-DoDLKvbdCTAbtGXS
-DoDKjvbdRyjHsDWA
-DoCjjvbdJcKDRJcY
-EOcKjvbdEuxpPljF
-DncLKvbduWNxKQsA
-EOcLKvbdhuZeXSUb
-EObjjvbdjvWnDaxX
-EObjjvbdwWlAvAuu
-EObkKvbdqquKnLBN
-DoDLKvbddCSmSATm
-DoCjjvbdwtmEpxlO
-DnbjjvbdDoCkLWcE
-DncLKvbdwyhGFxEr
-EOcKjvbdrykosAgn
-DnbjjvbdNeEUJJLE
-DoDKjvbdjuwNdCYX
-EPDKjvbdiGibyVjV
-DnbjjvbdYqNEhmEq
-EPDLKvbdxVNEpyLn
-DoCjjvbdZeYGzgiC
-DoCjjvbdZjTIQGbG
-DnbkKvbdSPsfjGEX
-EObjjvbdBsBDUGXS
-DoCkKvbdsBfNMGkZ
-EOcLKvbdLBLGmCXq
-EPDKjvbdJTZBTNYM
-DnbjjvbdJTZBSmYM
-DoDLKvbdjKFgjNYS
-DoDKjvbdqlzKYkhJ
-EPCkKvbdkWXOECYX
-EObkKvbdFkEsDINV
-EObjjvbddndsKstS
-DoCjjvbdauBfwjsh
-DnbjjvbdFjeTCglu
-EOcLKvbdfMfWflik
-EObjjvbdlYsRryGt
-EPCjjvbdtbcVWuoP
-DnbjjvbdMgDPmQVL
-DoDLKvbdjhHLefNk
-EOcLKvbdUsmTfMWK
-DoCkKvbdptTfqqjt
-EObkKvbdrRuKmjaN
-EPCjjvbdzoQQdcMY
-DoDKjvbdrpVoKDVf
-DoCkKvbdlZSrTYft
-DoCjjvbdBhjajiFj
-EOcLKvbdzoQQdbkx
-EObkKvbdOhAYZAYa
-EOcKjvbdjvXNdBww
-DnbjjvbdEXwlTtTl
-DoCkKvbdzjVPocsU
-DoDLKvbdZQldiMeR
-DncKjvbdYNqAYVVt
-DnbjjvbdtvNxKRTA
-EPCjjvbdqceIonWB
-EOcKjvbdyXiKCPzL
-DoCkKvbdfIKurNpg
-DoDKjvbdFxuVAdYC
-EOcLKvbdeOdrjssr
-DncLKvbdxnShYTIc
-EPDLKvbdoznEKwoA
-DoDLKvbdptTfrRkU
-DncLKvbdkWWnDaxX
-EPCjjvbdKWVGDeHJ
-EPCjjvbdtumwipsA
-DoCkKvbdZxcinDMS
-EObjjvbdCWzdIeQW
-EPDKjvbdHgGzYwwg
-EOcKjvbduDCtvvOo
-DnbjjvbdqvokbiZR
-DnbjjvbdmIcsptqa
-DncLKvbdrJAJdmPF
-EPCkKvbdKjaHvAJy
-DoCkKvbdhuZdwSUb
-EOcKjvbdnPzZVjyC
-DoDKjvbdYSlAmUPY
-EOcKjvbdffLzNgHA
-DncLKvbdptUHRqjt
-EPCjjvbdyTNiMqag
-DoCjjvbdauBgXkTh
-EPCjjvbdbiMikGXY
-EOcLKvbdIHGzZXwg
-DncKjvbdrXPkcIxq
-DnbjjvbdOTTugEuQ
-DnbkKvbdjcMKqHUg
-DoDKjvbdffMZnHHA
-DoCjjvbddijSWUzn
-DncKjvbdBhkCKiGK
-DncKjvbdJYTbHkqQ
-DnbkKvbdqwPlCiZR
-DoCkKvbdxUmFRYkn
-DoDKjvbdmSZUzTDi
-EPDLKvbdkyTSSxft
-DoCjjvbdmajXYPOV
-EPCkKvbdMowqVnHT
-DncLKvbdTppoUuHm
-EPDLKvbdgFkymfgA
-EObjjvbdhgJcYujV
-DncKjvbdtAGqIABS
-DoDLKvbdqZOhGpdY
-EObkKvbdjbkkRGuH
-DoCjjvbdGLEsChNV
-DnbjjvbdZoOIeEyj
-DncLKvbdbrbjsdJa
-EPCjjvbdGGJqmiTq
-EPCkKvbdNPxRWNgT
-EPCjjvbdJpydnfOF
-EOcKjvbdcyxoxYpb
-EPDKjvbdmozZWLYb
-EObjjvbdVTmUFlVj
-DoCjjvbdNrtWGduQ
-DncKjvbdqUTfqqkU
-DoDKjvbdTfznMWue
-EOcLKvbdNsTugEuQ
-DoDLKvbdjhHLfGOL
-EObjjvbdZtJJYdSn
-DoDKjvbdZjTHofbG
-DncKjvbduCbtwVno
-EPCkKvbdZtIhxcsO
-EOcLKvbdnUuZkJqf
-EObkKvbdiCPCeXQq
-EOcKjvbdZtJIxcsO
-EOcLKvbdZRNEhmFR
-DnbkKvbdFjdsDINV
-DncKjvbdsZlQSaIO
-EObjjvbduLxXAtAw
-DncKjvbddoFSjtTr
-DoCkKvbdmbKXXoOV
-DoDKjvbdOAIsTirA
-DncLKvbdMfcQMpVL
-EPDKjvbdsrqrxzFD
-EOcLKvbdZRMdiMdq
-EObkKvbdCTAbsfXS
-EPDLKvbdtunYJpsA
-EObkKvbdYSkaNToY
-DoCkKvbdZMRdUOMN
-EPCkKvbdIsYaSmYM
-DncLKvbdVYgtZkPO
-EObjjvbdaNLBsUmH
-EOcLKvbdZyEKOCkr
-DoDLKvbdOSsufdtp
-DoDKjvbdhbPCdvqR
-DnbkKvbdiZuFkpnG
-DoDKjvbdHDjujCJj
-EPDKjvbdCDpBVjMf
-EObkKvbdeFOrBwDK
-DoDLKvbdhgJbxvJu
-EObjjvbdiZuFlQmf
-EPDKjvbdeuzwpJzs
-EPDKjvbdezuyEhsw
-EPCkKvbdJYTbIMQp
-DnbkKvbdkIHLeenL
-DoCkKvbdAMgyTXZx
-DnbkKvbdfIKvRnQg
-EPDLKvbdJqZePFnF
-DoCjjvbdRjxfVGkT
-EOcLKvbdySmhlqbH
-DnbjjvbdEYYMUTtM
-DoDLKvbdhtydvquC
-EObjjvbdZRMdiMdq
-EPCjjvbdVZITzLOn
-DoCkKvbdmuVZjjRf
-DoCjjvbdzoQREbkx
-DnbkKvbdkyTSSxgU
-DoCjjvbdzRPNIjXA
-EPDKjvbdnPyxvLZC
-EOcKjvbdSZjHrbvA
-EPCkKvbdShyjRABM
-EObjjvbdYpmEiMeR
-DoCjjvbdFaOqYizm
-DncLKvbdEvZQQMjF
-DncKjvbdNrtWGeVQ
-DoDKjvbdqdFJPmvB
-DnbjjvbdRXODblID
-DoDLKvbdyzdnRhIh
-EPCkKvbdcTCjsdKB
-DncLKvbdJcKCqKCx
-EObjjvbdmfdwmNgZ
-EPDLKvbdqUTgSSLU
-EObjjvbdZyEKODLr
-EPDKjvbdTppoVVIN
-DnbjjvbdFVyPpNJe
-EPDKjvbdJYUBhLqQ
-EPDLKvbdqceIpOWB
-EPDLKvbdiBnbeXQq
-DnbkKvbdGZVVBEYC
-DncKjvbdGLFTDINV
-EObjjvbdUGzmlXWF
-EOcLKvbdxrmiMqbH
-DoDLKvbdJpzEnenF
-EObjjvbdEvYoomJe
-DoDKjvbdJqZdoFme
-EObjjvbdEuyPpMie
-EOcKjvbdmtuZjjRf
-EPDKjvbdjKGHilwr
-EPCkKvbdpaIeAWgd
-DoDKjvbdGZVUaDxC
-DoCjjvbdFkErcHlu
-EOcKjvbdrbFllGjy
-DnbkKvbdMRwMzUpz
-DoCkKvbdDxYLtTsl
-EOcLKvbdLBKfmBxR
-DoCjjvbdVwJYWDeH
-DoCkKvbdZoOIdeZj
-EPDLKvbdpfEFUWAh
-EOcLKvbdKWVGDdfi
-EObkKvbdtvNwipsA
-DoCjjvbdwuNEqZMO
-EObkKvbdfSBWzkbo
-EPDLKvbdFxuVAdXb
-DnbkKvbdRWnEClHc
-EOcKjvbdkCkjqHUg
-DoCjjvbdbsDKscia
-EPDLKvbdzQoMiKXA
-DnbkKvbdRDcApQcr
-DoDKjvbdZtIiYcrn
-DoDLKvbdqZPHgQdY
-EObjjvbdyfxlAMeX
-EObjjvbddjJrWUzn
-EPDKjvbdjcMLQgVH
-EOcLKvbdozmckXoA
-EPDKjvbdcJMjLGWx
-EPCkKvbdbhlijewY
-EObjjvbdrEFJPnWB
-EOcKjvbdmuVZjirG
-DncKjvbdnBjXYOmu
-DncLKvbdjcLjqHUg
-EPDLKvbdlhdUQuRa
-DoDKjvbdVwIwvEFH
-EObkKvbdZMSDsnLm
-DoDLKvbdzHZMAMdw
-EOcKjvbdZMSDsnLm
-DncKjvbdZshhyDsO
-DncKjvbdCEPaWJlf
-EOcKjvbdxxJKCQZk
-EPCkKvbdezvZEiTw
-EPDLKvbdypoMiKXA
-EPCkKvbdnUuZjjRf
-DnbkKvbdFfJqnJUR
-DoCjjvbdTpqPUthN
-DncKjvbdcyxoxYpb
-EObkKvbdCSaCsfXS
-DnbkKvbdRacdlIyL
-DoCjjvbdTIzKRABM
-EPCkKvbdatbGwjsh
-EObjjvbdUsltGMWK
-DoDLKvbdtvOXjQsA
-DnbjjvbdYSlAmUPY
-EOcKjvbdwuNEpxkn
-EObkKvbdYqMdiMdq
-EOcKjvbdnGeXlmgZ
-DnbkKvbdqwQLcJYq
-EObkKvbduVmxJqTA
-EObjjvbdmoyyVkYb
-DoDKjvbdBdPaWKMf
-DncKjvbdVvhwvEFH
-EObkKvbdauBfxLUI
-EOcLKvbdMgDQNQUk
-EOcKjvbdsQVnjCuf
-EObkKvbdjuvnEBww
-DoCkKvbdkWXODbXw
-EPCkKvbdZyDjNblS
-DoDKjvbdZLqdUNlN
-DoDKjvbdbLMFoNcA
-DoCkKvbdFVyQPmJe
-EOcKjvbdhkdcmuCy
-EPCkKvbdmtuZjiqf
-DnbjjvbdRbEFLiYk
-EPCkKvbdySnJMqag
-EPDLKvbdhlFDnVCy
-DoCjjvbdzoQREblY
-EPCjjvbdvBEYroFI
-EPCjjvbdJbjCqJcY
-DnbkKvbdliEURUrB
-DoDKjvbdOTUWGdtp
-EOcLKvbdZnmhddzK
-EPDKjvbdSBcdkiZL
-DoCjjvbdZMRctOLm
-DoDLKvbduCcUwVno
-DoDLKvbdEzspeMDJ
-EPCjjvbdULunaWOi
-DoDLKvbdIwsaglQp
-EObkKvbdJuuFdFGi
-EPCkKvbdQccBQRDr
-EPDKjvbdNrsugEtp
-EPDLKvbdEXxLtUUM
-DoDKjvbdVBCQsRRy
-DncKjvbdeFPSCWcK
-DoDLKvbdhficYvJu
-DncKjvbdkClLRHVH
-EOcLKvbduWNxKRTA
-EObjjvbdNPwpumgT
-DoCjjvbdjmCLzFGo
-DncKjvbdZtIhxdSn
-EObkKvbdKQyePFme
-EPCjjvbdEuxpPljF
-DoCkKvbdZtIhyDrn
-EPDLKvbdJpzFOfNe
-EPDKjvbduaEZTPFI
-EPDLKvbdSQTgKFcw
-EOcLKvbdBcpAujMf
-EPCjjvbdfHkVrOQg
-EPCjjvbdKaKflaxR
-EObkKvbdZjTIQGaf
-EOcLKvbdijGIKMwr
-EPDLKvbdvBEZTOdh
-DnbkKvbdZRNEhleR
-DnbkKvbdijFgimXr
-EObjjvbdEASIlywX
-DoCjjvbdKaKgNCXq
-EPDLKvbdTppoUuHm
-EPCkKvbdwzHefYEr
-EPCkKvbdhtyeWrUb
-DnbkKvbdPyNAGsRj
-EPDKjvbdmttzKiqf
-DnbjjvbdRacdkhyL
-EOcLKvbdeJjRvUzn
-EObjjvbdNHCpNQVL
-EPCjjvbdgLGzcGAE
-DoCkKvbdidkGtoAO
-DnbkKvbdKDJcRKCx
-DnbjjvbdSQTgKGEX
-EPDLKvbdyqPMiJwA
-DnbkKvbdLrWlytpz
-DnbjjvbdmgExNNgZ
-EPCkKvbdlYsRrxgU
-DnbjjvbdTkuoAvPJ
-EOcKjvbdgFkymgHA
-EPDLKvbdmaivxOnV
-DnbjjvbdEztQeMDJ
-EObjjvbdWfYzUAPT
-DnbkKvbdiMEdNuDZ
-DoDKjvbdgQBzwEXh
-EOcLKvbdSBcdlIyL
-DnbjjvbdrMzJxkhJ
-DnbjjvbdddnrCXDK
-DncLKvbdmbKXXnnV
-DnbjjvbdYzbfSKWZ
-EPCjjvbdUMWPBVoJ
-EPDKjvbdBraDUGWr
-DoCkKvbdFkFTDINV
-DncKjvbdYkqdTmkm
-DncKjvbdmpZyVjyC
-DoCjjvbdZisIQHCG
-DncLKvbdYqMeJMeR
-EPDKjvbdZjTHpHBf
-EOcLKvbdcJMikFwY
-DoCkKvbdFpATXHGZ
-DnbjjvbdVBBqSpqy
-DoCkKvbddZyQXxpb
-EOcLKvbdqlyiyMHi
-EPDLKvbdfMfWgNJk
-DoCjjvbdrNZjZLgi
-EPCkKvbdeOdsKtTr
-EPDKjvbdLrXMytpz
-DncLKvbdQvnDcMHc
-DoDLKvbdyYJJbPyk
-DnbjjvbdrylPsBIO
-DnbkKvbdTqROuUgm
-DoCjjvbdcyyQYZRC
-EObjjvbdbLMFnmcA
-EObjjvbdbVCGxKsh
-EObjjvbdelfWgMjL
-EPDLKvbdnGdwmOGy
-EPCkKvbdcTDLTdKB
-DncLKvbdUxhTyjoO
-EPCjjvbdwzHfFxEr
-EPCjjvbdkxrqryHU
-DncLKvbdDihJvYKA
-EPCkKvbdRzJhScWA
-EObjjvbdZHWdAOri
-DoDLKvbdjbkkRGuH
-DncKjvbdNVSrLNAX
-DncKjvbdVqnYCElD
-DnbjjvbdFWZPpMjF
-DoCjjvbdZMRctNkm
-EPCjjvbdRNXaxmtz
-EOcLKvbdLZQjSztf
-EObjjvbdePFSjssr
-EOcKjvbdjbkkRHUg
-EPDKjvbdcSbjtEJa
-EObkKvbdKQzFPFme
-DoCkKvbdnUtzKjRf
-DncLKvbdeOeTKtUS
-DoCjjvbdpstGqqjt
-EOcKjvbdrpWPJcWG
-EPCkKvbdwkXDgzyf
-DncKjvbdnPyxvLYb
-DoCkKvbdpxoIHRDx
-DnbjjvbdLFegaaRV
-EPCjjvbdrXQLcJYq
-DncKjvbdWXJXvDdg
-DnbjjvbdQdCaQRDr
-EOcLKvbdWWiXuceH
-DoCjjvbdbiNJkGXY
-EPDKjvbdijGHjMxS
-DoDLKvbdTfzmkwVe
-EObkKvbdmSZUzTEJ
-DnbjjvbdKefHaaRV
-DncLKvbddoFSjstS
-DncLKvbdSLYfUgKs
-EPCkKvbdCIjbLJGK
-DncKjvbdKNADzGuB
-DoDKjvbdBcpBVjMf
-DnbjjvbdpxoHfqEY
-DoCjjvbdANHyTWyx
-DoDKjvbdFjeSbgmV
-DnbkKvbdxwiKCPzL
-DncKjvbdqceIpNvB
-DnbjjvbdLFfHbAqV
-EPDLKvbdtTSTYydc
-EPCjjvbdezvYdiTw
-EObjjvbdWWiYVdFH
-EOcLKvbdZyDjNbkr
-EObkKvbdwzIFeweS
-EPCjjvbdjmBkzFGo
-EObjjvbdGAoRYizm
-EObjjvbdjcMLQgVH
-DoCjjvbddePRavbj
-EOcKjvbdlhcspuSB
-EPCjjvbdSCEFMJZL
-EObkKvbdEYYLsssl
-EObkKvbdpstGrSLU
-DoDLKvbdIGgZxwwg
-EObkKvbdWIYWYGxz
-EPCjjvbdfILWSNqH
-DnbkKvbdFWYpPljF
-DoCjjvbdVAbRSqRy
-EOcKjvbdeEoSCWcK
-EOcKjvbdSBceMIxk
-DoCjjvbdgFkzOGgA
-EObkKvbdbPfgELzd
-DnbjjvbdmtuZkJqf
-EPCkKvbdYgWdAPSi
-EObkKvbdmaiwXoOV
-EOcKjvbdjuvnDbXw
-DncLKvbdiBoCdvpq
-DnbkKvbdZxcjNbkr
-EPDKjvbdKfFgaaRV
-DoDKjvbdNGcPlouL
-EOcKjvbdHlBznXQk
-EPCjjvbdKQydoFme
-EPCjjvbdDxYLsssl
-DoCjjvbdHbLydzAD
-DnbkKvbdZisHofbG
-DnbkKvbdvvkaWBWV
-DncLKvbddxZtUSFz
-EPCjjvbdBcpBWJlf
-EObkKvbdVBBprpqy
-DoCkKvbdaSFcITfL
-DoCkKvbdZLqctOMN
-EPDKjvbdFWYpQMie
-DncKjvbdOEctJIjd
-DoCkKvbdEuyQPmJe
-DncLKvbdZGwEAOsJ
-DncKjvbdlqyUzSci
-EOcKjvbdKCibqKCx
-DnbjjvbdEOcLKvbd
-DncKjvbddneTLUUS
-EPCjjvbdhbPDFWpq
-DoCjjvbdeAUQmXjG
-EPDKjvbdVwJYWDeH
-DncKjvbdePFTKstS
-DoCjjvbdjggMFemk
-EPCjjvbdcScLUDjB
-DoDKjvbdZjTIQGbG
-EObjjvbdehKurNpg
-DncLKvbdbsDLUEJa
-EOcLKvbdEJgjWXjA
-EPCkKvbdqquKnKaN
-DnbjjvbdZjShQHCG
-DoCjjvbdCEPaVilf
-EObjjvbdzjUpQDrt
-EOcLKvbdUVlPjUBR
-DnbjjvbdeFPSCWbj
-DoCkKvbdKxpirzuG
-DncLKvbdrykpTAgn
-DoDKjvbdemGXGljL
-DncLKvbdTYKlNzkY
-DncKjvbduaDyTOeI
-EObkKvbdnBjWwoOV
-EPCkKvbdGdLWKCJj
-EPDKjvbdKeegaaQu
-EObkKvbdxnShXrhc
-DoCkKvbdsBemLgKy
-EPCjjvbdrzLoraHn
-EPDLKvbdrRuKmjaN
-DncLKvbdmajWxPOV
-DncKjvbdKVuGDeGi
-EObjjvbdziuQPdTU
-DnbkKvbdZxcinCkr
-EPCkKvbdlqxtzTDi
-EPCkKvbdyzeOSHiI
-DnbkKvbdqmZiyMIJ
-EOcLKvbdIwtBgkqQ
-DncLKvbdfekzOHHA
-EPCkKvbdKNADzGuB
-EOcLKvbdUaBqSqRy
-EPDKjvbdddnrBvbj
-DncLKvbdmuVZjirG
-EOcKjvbdbBWEepPw
-DncLKvbdwjvdHzyf
-EPDKjvbdmgFXlmgZ
-EPCkKvbdtSqryZeD
-EObkKvbdOFEUIhkE
-EOcKjvbdiBncFXRR
-DncLKvbdxZgeeweS
-EPDLKvbdxwiKCPyk
-EPDKjvbdHEKvJajK
-DncKjvbdrafMlGjy
-EOcLKvbdwWlBWBWV
-DncLKvbdegjvRmqH
-EObkKvbdehKvRmqH
-DoDLKvbdUaBpsQrZ
-EPDKjvbdRaceMJYk
-DnbkKvbdZRNEhldq
-DnbjjvbdKCibpjDY
-DoDLKvbdKaLGmCXq
-DncLKvbdKaKflbYR
-DoCjjvbdZQleJNFR
-EPCjjvbdZHWdAOsJ
-EObkKvbdpxnggRDx
-EPDKjvbdiUzFXSVC
-DncKjvbdhfjDZWJu
-DoCjjvbdYkrDtNlN
-EOcLKvbdkVvmdBxX
-DnbjjvbdFkFScHlu
-DoCjjvbdlrYuZrci
-EOcKjvbdrDdiPnWB
-DoCjjvbdfoazvcwh
-EPCkKvbdtkxWaUAw
-EObjjvbdVYgsyjoO
-EPCjjvbdssSTZZeD
-DoCjjvbdbVBfwjsh
-EPCjjvbdVgwuxGxz
-EOcKjvbdZoNhdeZj
-EPCkKvbdGYttaDwb
-DncLKvbdvAcySoEh
-DoDKjvbdIGfzZYYH
-DoDKjvbdtcCtvvPP
-EObjjvbdkxsRryHU
-DnbkKvbdJSyBTMwl
-DoCjjvbdsPuoJbuf
-DnbjjvbdZxcimcMS
-DoDKjvbdNGbpMouL
-DnbjjvbdSZjHrbvA
-DoCkKvbdmRxtysDi
-EOcLKvbdZQmEiMeR
-EPCjjvbdpfEEtVaI
-EPCjjvbdtTRrxzEc
-DoCkKvbdZdxGzghb
-DncKjvbdrykpTBIO
-EPCkKvbdxxIjCPyk
-DncLKvbdCEQAujNG
-EOcLKvbdrWokbhyR
-EPDKjvbdjJehKMwr
-DncLKvbdSxLMNzjx
-DnbjjvbdZyDinDMS
-EObjjvbdZirhQGaf
-DncLKvbdkClKqHVH
-EObkKvbdfIKvRmqH
-DoDLKvbdQvmcblID
-EPDKjvbdNsTufdtp
-EObkKvbdZRMeIleR
-DnbkKvbddwytTrFz
-EObjjvbdZxdKODMS
-EPCkKvbdSLZFtgKs
-EPDKjvbdrovPJbuf
-EPCjjvbdHgHZxxYH
-EPCjjvbdddoSBvbj
-DoDKjvbdegkVqmpg
-DoDKjvbdCfkfHAzc
-EObjjvbdtvNxJqTA
-EPDKjvbdhtyeXSVC
-EPDLKvbdUtMtGLvK
-EPCjjvbdFaPRYizm
-EPCkKvbdVZIUZkOn
-EPDKjvbdFeiqnIsq
-EObkKvbdddoRbWcK
-EOcLKvbdaNLCSuMg
-EObjjvbdFpATXGfZ
-DncLKvbdrXPkcJYq
-EPCjjvbdFjdrcHlu
-EObkKvbdUQqPVUhN
-DoDLKvbdpxoHfqDx
-DncLKvbdypoNIjXA
-EPCjjvbdmRxuZrdJ
-EPDKjvbdqZPHgREY
-EOcLKvbdZGwEAPTJ
-DncLKvbdjuwNcbXw
-DoCkKvbdTlWPBVoJ
-DoCjjvbdRzKIScWA
-EPDLKvbdZnnJFEzK
-EPDLKvbdqvokbhyR
-DnbkKvbdAMhZTWyx
-EPCkKvbdqYoHgRDx
-EPDKjvbdZtJJZETO
-EObkKvbdWRmxBdlD
-DnbkKvbdwWkaWBWV
-DncKjvbdgKfzcGAE
-DncLKvbdtbcUwVno
-EOcLKvbdcImJjfWx
-DncLKvbdSwjlNzjx
-EObkKvbdjblLQftg
-DncLKvbdQmYByNtz
-DnbjjvbdhlFDmtby
-DnbjjvbdcTDKsdJa
-EPCkKvbdqUTgSRkU
-EOcKjvbdZQleImEq
-EOcLKvbdtTRrxzFD
-EPCkKvbdUVkpKUAq
-DncLKvbdmbJvwoNu
-EPDKjvbdrJAKFMne
-DncKjvbdpyOhGqEY
-EOcLKvbdLrWlzVQz
-DnbjjvbdvAdYsPFI
-EPCkKvbdDoDKjvbd
-DoDLKvbdelfWgMjL
-EObkKvbdaMjbTUlg
-EObjjvbduVmwjRTA
-EPCjjvbdHffyxwwg
-DnbkKvbdXrkaNToY
-DoCjjvbdZshhyDrn
-DoDKjvbdunszqKoU
-EPCkKvbdmJDtRVSB
-DnbkKvbdcImKLFwY
-DoCjjvbdpedEtVaI
-DnbjjvbduMXwAtBX
-EPDLKvbdhbPDFWpq
-EPCjjvbdrDdiQNua
-DnbkKvbdKxpirzuG
-EObkKvbdcTCjtEJa
-DncLKvbdZQmFIldq
-DoCkKvbdqUUGrRkU
-DnbkKvbddZyQXyRC
-DncLKvbdIryBTNXl
-EPDKjvbduaDxrneI
-DoCkKvbdZMSDsmlN
-DoDKjvbdrovOjCvG
-EOcLKvbdhyuFkpmf
-DoDLKvbdddnrBwDK
-DncKjvbdDwxLstTl
-EPDLKvbddZxpXxpb
-DoDKjvbdCSaDTewS
-EPCkKvbdVqmxBeLc
-DoCkKvbdZMSEUNkm
-DnbkKvbdznopdcMY
-EPCjjvbdqYoHgQcx
-EPCkKvbdlhdUQuRa
-EObjjvbdauBgYLUI
-EObjjvbdySnJMrCH
-EObjjvbdkIGlGGOL
-DoCkKvbdwXMAvBWV
-DnbjjvbdiCOcFXRR
-EPCkKvbdIHGzZYXg
-EPDKjvbdiMFDmuCy
-EOcKjvbdtlXvaUBX
-DoDLKvbdhfibxuiu
-EPCkKvbdqwQMChxq
-EObkKvbdRkYeuGjs
-DoDKjvbdYkrEUNlN
-EPDKjvbdZshiYcsO
-DnbkKvbdQlxBxnUz
-DncKjvbdSPtGifEX
-DoDLKvbdmajXXoNu
-EObjjvbdHbMZdzAD
-EPCkKvbdZyEKNblS
-EObkKvbdKfFgbBRV
-EOcLKvbdOTUVgFVQ
-DoCkKvbdfMevgMik
-EPDKjvbdptTfrSKt
-DnbkKvbdxZhFexFS
-DncLKvbdUaBqTQrZ
-DoCjjvbduDDUwWPP
-DoDKjvbdNsUVfduQ
-EObkKvbdvOszpjoU
-EObkKvbdNsTvGdtp
-EPDKjvbdxwhiapZk
-DoDKjvbdiGjCxvJu
-DoDLKvbdxxIibPyk
-DncKjvbdvAdYroFI
-EOcLKvbdLAkGmBwq
-DncLKvbdIsYaTMxM
-EPDLKvbdFejRmiUR
-DoCkKvbdbrbjscia
-DoDLKvbdiHJbyWJu
-EOcKjvbdIwtBhMQp
-EObkKvbdpfDdtVaI
-EObjjvbdfMevfmJk
-EObjjvbdptUHRrLU
-EPDLKvbdYgXEAOri
-EObkKvbdZoOJEeZj
-DoDKjvbdqUUGqqjt
-DnbjjvbdxnTHwriD
-EPDKjvbdfHkWRmpg
-EPDLKvbdePEsLUUS
-EPCjjvbdEPCkLXDE
-DoCjjvbdgQBzvdYI
-DoCkKvbdZjSgogBf
-EObkKvbdtunYKQsA
-EPDKjvbdezvYdiTw
-EPDLKvbdLBLGmCYR
-EObkKvbdSLYfVHKs
-EPDKjvbdfILWSNqH
-EObjjvbdqlyixkhJ
-DoCkKvbdjKFgjNXr
-DoDLKvbdyzdmrHhh
-DoDLKvbdYpleImEq
-DoDKjvbdUxgtZkPO
-EPDLKvbdJKEAKPgE
-DoDKjvbdRXODblHc
-DoCkKvbdmozYujxb
-EOcKjvbdMgCpMouL
-DncKjvbdZsiJZESn
-EPCkKvbdzROmIiwA
-DnbkKvbdEOcLKvbd
-EPCjjvbdpxoIHRDx
-DnbkKvbdEJgivXjA
-DoDKjvbdfHjurOQg
-EObjjvbdyYIjCPzL
-DoCjjvbdvlvANEEm
-DncLKvbdOXoVzdOU
-EObkKvbdatagYKtI
-DnbkKvbdGYtuAcwb
-EObkKvbdegjuqnRH
-DnbkKvbdtumxKQsA
-DnbkKvbdIxTbILqQ
-DncKjvbdIsZBTMxM
-EPCjjvbdRjyFuHLT
-EOcKjvbdJXtCIMQp
-DoDKjvbdYkqdUOLm
-EObjjvbdZsiIyESn
-DnbkKvbdhtyeWrUb
-EPCjjvbdEuyQPmKF
-EOcLKvbdeFOrCWcK
-DoDLKvbdEvYpPlie
-DoCjjvbdZtJIyETO
-EPCjjvbdrWokcJYq
-DoDLKvbduaDySneI
-DncLKvbdsPunjCuf
-EObkKvbdpyOhGpcx
-EObkKvbdliDsqUqa
-DoDLKvbdhaoCeXQq
-DncLKvbdaRfChUFk
-EOcKjvbdYTMAlsoY
-EPCkKvbdfkGzbfAE
-EOcKjvbdURQnttgm
-DoDLKvbdDoCjjvcE
-DncLKvbdCJKbLJGK
-EPDKjvbdhlFEOVDZ
-DnbkKvbduCcVWvOo
-EPCjjvbdQdDBPpcr
-EObkKvbdbBVdeopX
-DnbkKvbdWHwuwfxz
-DoDLKvbdsrqrxzFD
-DoDKjvbdCSaCsfXS
-DoCkKvbdNPxQunGs
-EPDLKvbdyzeNrHhh
-EObjjvbdWXIwudFH
-EPCjjvbdKWVFceHJ
-EOcLKvbdqwPlCiZR
-DncLKvbdyOTHwsJD
-DncLKvbdxUleRZMO
-DnbjjvbdZHWdAPTJ
-DoDLKvbdePEsKstS
-EPDKjvbdHDkVjBij
-EObjjvbdSPtHJecw
-EObjjvbdyTOJNRag
-EOcKjvbdhfibxuiu
-EOcKjvbdRDbaPqES
-DnbjjvbdemGWflik
-DoDKjvbdwjwEHzzG
-EObjjvbdsCGNMGjy
-DnbjjvbdssRsYyeD
-DoDKjvbdJvVFceGi
-EPCkKvbdLZQjSzuG
-DoDLKvbdqUUHSSLU
-EPCjjvbdaaWEeoow
-EPCjjvbdDjHiuxKA
-EPDKjvbdZQmFIleR
-DoDKjvbdRDbaPpdS
-EPCjjvbdZoOJFFZj
-EObjjvbdQmYBxnUz
-EPDKjvbdKCibqKDY
-DoDLKvbdsCFmMGjy
-DncKjvbdKaKgMaxR
-DoCjjvbdrMzJxkhJ
-EObkKvbdeKKRutzn
-EPCkKvbdcTCjscjB
-EPCkKvbdZsiIyDrn
-EObjjvbdnBjXXoOV
-DoDKjvbdBiKakIfK
-EOcKjvbdRpTfjGEX
-DoCkKvbdtSqrxydc
-EObkKvbdHDkVjBij
-DncLKvbdqTsgSSLU
-DncLKvbdzdzOzdzQ
-DoDLKvbdVrNwadlD
-DncLKvbdSQUGifEX
-DncLKvbdxxJKBoyk
-EPCjjvbdrzLpSaIO
-DnbkKvbdhtyeXRuC
-DoDKjvbdyTOImSBg
-EPDLKvbddZxpXxqC
-DoCkKvbdZMSDsnLm
-DncLKvbdEARhlzXX
-EPDKjvbdkWXOECYX
-EObkKvbdSLYetgLT
-EPDKjvbdTfznLvvF
-DoCjjvbdSZjHrcWA
-DncKjvbdmJDsptqa
-EOcLKvbdZxdJmblS
-DnbjjvbdKWUfDeHJ
-EPCkKvbdLiBkpxAS
-EObkKvbdePFSkTtS
-DoDKjvbdYzbfSKWZ
-EPCjjvbdvAdYsPFI
-EObkKvbdTAFJIBnd
-DnbkKvbdsZkpSaHn
-DoDLKvbdczZQYZRC
-EPDKjvbdTvMQKTaR
-DnbkKvbdyYJKCQZk
-EPCkKvbdVAaqTQqy
-EOcLKvbdbPfgDkzd
-EObkKvbdePErjssr
-EPDLKvbdyTOJNRag
-EPDLKvbdyTNiNSBg
-DoCjjvbdqvpMCiYq
-DoDKjvbdRpUHKGEX
-DoCjjvbdDoCkLWbd
-DncLKvbddCTNSATm
-DoCkKvbdcSbkUEJa
-EPDLKvbdzjVPocrt
-DnbkKvbdxVNFQyLn
-DnbkKvbdSKyFtfkT
-DoCkKvbdmpZxukZC
-DncLKvbdGFjSOJTq
-EOcKjvbdhkdcmtcZ
-DoCjjvbdyzeORghh
-EPCkKvbdRbDeMJZL
-DoDLKvbdZMRctOMN
-EObjjvbdAMgySvyx
-EOcLKvbdTYLMNzkY
-DnbjjvbdmuVZjjSG
-DnbkKvbdZsiIyDrn
-EPDLKvbdjEjfuPAO
-DoCjjvbdkxrrSxgU
-DncKjvbdSLYfUfkT
-DnbjjvbdBcpAvJmG
-DoDLKvbdSPsgKFcw
-DoCkKvbdrXQMDIyR
-EObkKvbdKVuFdEfi
-DnbkKvbdrSVLOLBN
-DoDKjvbdZnmhdeZj
-DoDKjvbdNHDQNPuL
-DoDKjvbdpyOggREY
-DoCkKvbdQvmcblID
-EPCkKvbdMfbomQVL
-EPCjjvbdNVTRjmAX
-EOcKjvbdbhlijevx
-EObkKvbdWWiXvEFH
-DncKjvbdlqyVZrdJ
-DnbjjvbdrSUkNjaN
-DncLKvbdmSZUzTDi
-EObjjvbdZQmEhmEq
-EOcKjvbdiLdcnVDZ
-EObkKvbdySmhlqag
-DnbjjvbdbUagYLTh
-DncKjvbdBdQAvKNG
-DncLKvbdyzdnRghh
-EObkKvbdLZRKSztf
-DoDLKvbdRXOEDMHc
-DncKjvbdFkFSbgmV
-EPCjjvbdZQldiMeR
-EPDLKvbdFfJqmiTq
-EOcLKvbdpssgRrKt
-DnbjjvbdKRZeOeme
-DnbkKvbdnPzYvLZC
-DoDLKvbdUVlQJsaR
-EPCjjvbdqFceTvAh
-EPDKjvbdEARhlyvw
-EPCjjvbdNGbolotk
-DoCjjvbdVhYWXgYz
-DoCjjvbdUtMtFkvK
-DncKjvbdZQldhleR
-DnbjjvbdCEPaWKMf
-EObjjvbduWOXjQsA
-EOcKjvbdIjEAKPfd
-DoCjjvbdURRPUuIN
-EObkKvbdbhmKKfWx
-DoDKjvbdxrnJMrCH
-EObjjvbdGFirNiTq
-DoDLKvbdtSqsZZeD
-EPDLKvbdKkAhWAJy
-EPCkKvbdbVBgYKsh
-DoCjjvbdKWVFdFGi
-EPDKjvbdwXMAuaWV
-DoCkKvbdRXNdCkhD
-EPCjjvbdZRMdhmEq
-DncLKvbdcJMijfWx
-DnbkKvbdZRNEiNFR
-EObjjvbdAMhYrvyx
-EPDLKvbdijGIJmXr
-DoCkKvbdbhmJjfXY
-EOcLKvbdrzMQTBHn
-DnbkKvbdKVtfEEfi
-EPCkKvbdxVNFRZMO
-EPDLKvbdjcMLQgUg
-EObjjvbdjuwODbXw
-EObkKvbdZeXfzhJC
-EPCkKvbdUyITyjoO
-EPCkKvbdGFjRnIsq
-DnbjjvbdIwsbHlRQ
-DncKjvbdtTSTYzEc
-EPDKjvbdhfjCyWKV
-DoCjjvbdhytelQnG
-DoDKjvbdxnTHxTIc
-EOcKjvbdUQqPUtgm
-EPDLKvbdkNCMZdgP
-DnbkKvbdGKeTDINV
-EOcLKvbdZMRcsmlN
-DnbjjvbdRXNdCkgc
-DoCjjvbdRXNccMHc
-EObkKvbdRjyFuGjs
-EPDLKvbdmJDtRUrB
-DoDLKvbdpyPIGpdY
-EPCjjvbdkNCLzEgP
-DoDLKvbdZoNiFEzK
-DoDKjvbdKVuFcdfi
-DoDKjvbdqZOggQdY
-EPCkKvbdSQTgJecw
-EOcKjvbdrRuKnLAm
-EObkKvbdbUbHYLUI
-EOcLKvbdyNrgwsJD
-DoDKjvbdegkVqnQg
-DnbkKvbdGBOpxizm
-EObkKvbdJbjDQicY
-DncLKvbdSLZFuGjs
-DoCkKvbdGckVibJj
-DoCkKvbdzeZnzdyp
-EObjjvbdxxJKCQZk
-EObjjvbdJpzFPGNe
-EPCkKvbdUsltGLvK
-DoDLKvbdziuQQDsU
-DncLKvbdRzKIScWA
-DoCkKvbdSLYfVGjs
-EPCjjvbdhgKDYujV
-DoDKjvbdtunXjQsA
-EPDKjvbdqceJPnWB
-DncKjvbdUQqOuUhN
-EOcKjvbdJvVFceHJ
-EPCkKvbdMfcPmQVL
-EObkKvbdNrsufdtp
-DncLKvbdUQpnuUhN
-DncKjvbdYkqdUOMN
-EObkKvbdqceJQNvB
-EPDLKvbdCWzdJFPv
-DncKjvbdauBfxLTh
-DncKjvbdZnnJEdyj
-DncLKvbdEvYpPlie
-DoDLKvbdhaoCdvpq
-EObkKvbdCEQBVimG
-EOcKjvbdBiKbKhfK
-DnbkKvbdeuzwpJzs
-DncLKvbdhlEcnVDZ
-EObkKvbdkCkjpftg
-DncKjvbdZQldhmEq
-DoDKjvbdFyVVBEXb
-DncKjvbdZirgogCG
-EPCkKvbdWXJXvEFH
-DnbkKvbdOStVfduQ
-DnbkKvbdNGbpMouL
-EObkKvbdcIljKfXY
-DoDLKvbdXrlBMsnx
-EOcLKvbdfNFwGmJk
-EObjjvbdUQqPUuHm
-DnbjjvbdEXxLtUTl
-EPDKjvbdLGFhCBQu
-DncKjvbdTYLLmzkY
-DoCkKvbdkaNPNALA
-DoCjjvbdFxtuBDwb
-EPDLKvbdGGJrNhsq
-DoCkKvbdZyEJnDLr
-EObkKvbdDxXlTssl
-EPCkKvbdGKdrbglu
-EOcLKvbdmoyyVjxb
-DnbkKvbdRNYByNtz
-EObjjvbdGFirOItR
-DoCjjvbdxUmFRZLn
-EPCkKvbdsQWPJcWG
-EPCjjvbdegkWSORH
-DncLKvbdYzcGRjVy
-DoCkKvbdRXNcblHc
-EObkKvbdwtldqYkn
-DnbkKvbdZisHpGaf
-EPCkKvbdGQASvfey
-DnbjjvbdeFPRavbj
-EOcLKvbdGZVVBEYC
-EPCkKvbdKDKDQicY
-EPCkKvbdUsmUFkuj
-DoCkKvbdatbHXjtI
-EObkKvbdlrYtyrdJ
-DnbjjvbdjKGHilwr
-EOcKjvbdjlakyeGo
-DoDLKvbdnPzZVkZC
-DnbjjvbdCIjbLJFj
-DoCkKvbdegkWSORH
-DoDLKvbdjvXODbYX
-EPDKjvbdaaVeFoow
-DncKjvbdwtmFRZLn
-EObkKvbdkNCLzEfo
-DncLKvbdrbGMlGkZ
-EObjjvbdczZQXxqC
-DoCkKvbduaEZTOdh
-EObjjvbdZxcjNbkr
-EOcKjvbdCJKbKiFj
-DnbjjvbdjEkGuPAO
-DnbjjvbdZshhyDsO
-DoDLKvbdbsCkUDjB
-DoCkKvbdNddUIhkE
-EPDLKvbduVnYJpsA
-DnbjjvbdQvmccMHc
-DoDKjvbdDjIKWXjA
-DoDLKvbdxZhGGYEr
-EObkKvbdqquKmkBN
-EObjjvbdLBLHMawq
-DoDLKvbdrbFmLgLZ
-EPDLKvbdddnrBwCj
-DoCkKvbdbrcLUEKB
-DoDKjvbdqlyjYlHi
-DncKjvbdQwNdDMID
-EObkKvbdBiLCKhej
-EPCkKvbdSZigsDWA
-DnbkKvbdwuNFRYlO
-EPDLKvbduCbtvvOo
-DnbjjvbdaaWFFpPw
-EObkKvbdRECaQQdS
-DncKjvbdyOShXsJD
-EPCkKvbdFVyPomJe
-DoDLKvbdcJMijevx
-EObkKvbdSZigsCvA
-EObjjvbdrNZjYlHi
-DnbkKvbdKfFhBaRV
-EPDLKvbdSLZFtgKs
-EPDLKvbdrbGNMGjy
-EPCjjvbddwzTtSFz
-DoDLKvbdnGdxNNgZ
-DncLKvbdTfzmlWue
-EOcKjvbdbLLfOmcA
-DoDLKvbdNGcQNPuL
-DncLKvbdUaCQsQqy
-EPCjjvbdCfkfHAzc
-EPDKjvbdlrYuZsDi
-EPDLKvbdmajXYPOV
-EObjjvbduCcUvvOo
-DoDLKvbdJXsahLqQ
-EPCkKvbdOSsugEuQ
-DnbkKvbduaDyTOeI
-DncLKvbdYqNEhldq
-EOcLKvbdeOdsKtUS
-EOcKjvbdkHgLefOL
-EPCkKvbdrpVoKCuf
-EObjjvbdShzJqAAl
-DnbjjvbdgPazwDxI
-EPDLKvbdEztQdlDJ
-DoDKjvbdYpmFImFR
-DncLKvbdsBellHLZ
-DoCjjvbdatbHYKsh
-DoCjjvbdptTgRrLU
-EOcLKvbdznpRFCkx
-EPCjjvbdWWiYWEFH
-EPCjjvbdRosgJedX
-DnbjjvbdkIGkefOL
-DnbjjvbdiZuGLqNf
-EPCkKvbdANIZTWyx
-EObjjvbdZQmFJMdq
-EObkKvbdjvWmcbYX
-DncLKvbdRbEFMJYk
-EOcKjvbdpfDdtVaI
-EPDKjvbdJqZePFnF
-DnbjjvbdeFOqavcK
-DoCjjvbdnHFXlnHZ
-EPCjjvbdTvLpKTaR
-EPDLKvbdVgxVxHYz
-EObkKvbdZRNFJMdq
-EPDLKvbdbUafwkUI
-EObjjvbdKCjDQibx
-EPDLKvbdrXPlChyR
-DoCjjvbdxsNhlqbH
-DoDKjvbdNGbomPtk
-EPDLKvbdLBLGmBwq
-DncLKvbdIsZBTNYM
-EPDLKvbdOXnuzcmt
-EPDKjvbdKDJcRJcY
-EObkKvbdiBncFWqR
-DncLKvbdlhcsqUrB
-DncKjvbdrylQTAgn
-DoDLKvbdTlWOaWOi
-EPCkKvbdegjurNpg
-EObjjvbdyTNhmSBg
-EPCjjvbdQccBPpcr
-EPDKjvbdeOeSkTtS
-DoCjjvbdGYuVAdXb
-EObjjvbdrzMPsAhO
-DncLKvbdrEFJQOVa
-EPCjjvbdbhmKKfWx
-EPCkKvbdeYZssqez
-DnbkKvbdURQntuHm
-EPDLKvbdkDLkRHVH
-EOcKjvbdlZSrSxft
-EObkKvbdijGHimXr
-EOcLKvbdpxnggQdY
-DncKjvbdJKEAJpGd
-EPCjjvbdMowpumfs
-DoCkKvbdmSYtysDi
-DoDLKvbdBsBDTfWr
-EPDLKvbdrMzKZMHi
-DnbkKvbdBraDUGWr
-DnbjjvbdDxYMTtTl
-DncKjvbdFyUuBEYC
-EPCkKvbdVZITzKnn
-DnbkKvbdTkvPBWPJ
-EObkKvbdSQTfjFdX
-DoCjjvbdZisIPgBf
-EPCkKvbdLGFhCAqV
-DoCjjvbdNGcQNPuL
-DoCkKvbdqlzJyMIJ
-EObjjvbdZtIiZDrn
-DnbjjvbdeEoRawCj
-DoDKjvbdUaBqSqRy
-EOcLKvbdmfdwmOGy
-DoDKjvbdptTfqrKt
-DoDLKvbdvAcxsPEh
-DoCkKvbdySmhmRbH
-EOcLKvbdhfjDZWKV
-EOcKjvbdHffzZXxH
-DoDKjvbdLFfHaaQu
-EPCjjvbdgFlZmfgA
-EOcKjvbdtcCuXVno
-DoDLKvbdZirgpGbG
-EObjjvbdNsUWHEuQ
-DoDLKvbdsBfNLgKy
-DoDKjvbdGGKRnJUR
-DoDLKvbdKkAhWAKZ
-DnbjjvbdOFDtJJKd
-EPCjjvbdMuSrKmAX
-DnbjjvbdyXiKBpZk
-DncLKvbdOFDtIhjd
-DoDKjvbdNPxQumgT
-DnbjjvbdrSVLOKaN
-EPCjjvbdmJDtRVRa
-EPCkKvbdZeXfzgiC
-DoDKjvbdhaoCdwRR
-DncKjvbdiBncFXRR
-EPDLKvbdvBEYrndh
-DnbjjvbdBiLBkIfK
-EPDLKvbdhgJbyVjV
-DncKjvbdzRPNIiwA
-DnbjjvbdegjvRmpg
-DncLKvbdyYIibQZk
-EPCkKvbdxnTIXrhc
-EPCkKvbdhkeEOUby
-DnbkKvbdjJehKMxS
-DoDKjvbdkVwODbYX
-EPCkKvbdFWYpQNKF
-EPCjjvbdXrkaMsnx
-EPDKjvbdRjxetgLT
-DoDKjvbdEztRFLbi
-DnbkKvbdqdFJQNua
-EPDLKvbdTqQntthN
-DoDLKvbdYORAXtvU
-DnbjjvbdEYXksstM
-EPDKjvbdkMbMZdfo
-DncLKvbdJKEAKQGd
-EOcKjvbdFejSOJUR
-DoCjjvbdYlRdTmkm
-DoDKjvbdlYrqrxgU
-EPDKjvbdKVuFdFGi
-EOcLKvbdJqZeOfNe
-DnbkKvbdzoPpdcLx
-DoDKjvbddePSCXCj
-DoDKjvbdEASIlywX
-DoCjjvbdrEEiPmua
-EPCkKvbdidkGuPAO
-EObjjvbdKRZdnfNe
-DncKjvbdhgJcZWJu
-EPDLKvbdZxcimbkr
-EPDKjvbdNeEUIiKd
-EOcKjvbdvAdZSndh
-DncLKvbdjggMGGNk
-EObkKvbdOStVgFUp
-EPCkKvbdRaceMIxk
-DncKjvbdDwxMUUUM
-DncKjvbdWeyZtAPT
-EPCjjvbdEYXkstTl
-EOcKjvbdxsOJNSBg
-EPCkKvbdKQzFPFnF
-EOcLKvbdJXtCHkpp
-DoCjjvbdtlYXBUBX
-EPCjjvbdwuNFRYkn
-DoDLKvbdkDLjpfuH
-EPDKjvbdxrmhlqbH
-EOcLKvbdjmCLzEgP
-DoCjjvbduaEYsPFI
-EPCkKvbdCEPaWJmG
-DncKjvbdwtmEpxlO
-EPCkKvbdJbjCpjCx
-DnbjjvbdhzVGMRNf
-EPCkKvbdZxcinDMS
-DoCkKvbdrNZiyLgi
-EOcLKvbdIHGyyYYH
-EObkKvbdYNqAXuWU
-EPDKjvbdtvNwjRTA
-EPCkKvbdcJMjLFvx
-EPCjjvbdNrsvHEuQ
-DoCjjvbdnGeYMmgZ
-DoDLKvbdSLZGUfjs
-EPDKjvbdtvOYKRTA
-DoDKjvbdziuPpESt
-DoCkKvbdMgDPlotk
-DoCkKvbdeFOrCXDK
-DnbkKvbdMgColpUk
-EPCkKvbdKVuFdFGi
-DoDLKvbduCcUvuoP
-DoCkKvbdRDcAopdS
-EPDLKvbdehKvSNpg
-EOcKjvbdDoCjjvbd
-DoCjjvbdOSsufdtp
-EObjjvbdGQASwGfZ
-DncLKvbdiHJcYujV
-DncKjvbdRadFMJZL
-EPDLKvbdZxcinDLr
-EPDLKvbdhaoDFXQq
-DoDKjvbdcJNJkGXY
-DoDLKvbduaDySoEh
-EOcKjvbdUxhUZkPO
-DncLKvbdVYhTzKoO
-DnbjjvbdehKvRnQg
-DnbkKvbdOhAXyAYa
-DncLKvbdxsNiNRag
-DoDLKvbdTppoVUgm
-EObkKvbdURROuVIN
-EOcLKvbdNsTugFVQ
-DoCkKvbdrXPlChxq
-EPDKjvbdHDkWJajK
-DoCkKvbdxnTHxTIc
-EPDKjvbdEvZPoljF
-EPDKjvbdrzMQTBIO
-EPCjjvbdqZPHgQcx
-DoCkKvbdVqmxCFMD
-DncLKvbdSPsgKGEX
-DoCkKvbdzjVPodSt
-DoDKjvbdnUtyjiqf
-DnbjjvbdIBkydzAD
-DoDKjvbdcTDKscjB
-EOcKjvbdiHKDYuiu
-DncKjvbdBraDUFvr
-DoCjjvbdQmYCZOUz
-EPCkKvbdySnIlqbH
-DnbkKvbdkDLjqGuH
-DnbjjvbdVqnYCFMD
-DncLKvbdGKeTCglu
-DncKjvbdlZSqrxft
-DncLKvbdrEEhpNvB
-EOcLKvbdrDeJQNvB
-EPCkKvbdQmXbYmtz
-DoCkKvbdQlxCYnUz
-EPCjjvbdEObkLWbd
-EPDLKvbdehKuqmqH
-EPCkKvbdkCkjpfuH
-DncKjvbdRXNcblHc
-EPCjjvbdsrqrxydc
-EPDKjvbdddoSBvcK
-EPCjjvbdADRxJzIp
-EPDLKvbdvAcxsPEh
-EPDKjvbdSLYfUgLT
-DoCkKvbdsrrTYyeD
-DoCkKvbdLFegbApu
-EPCjjvbdyqOliJwA
-EPDKjvbdqTtGrRjt
-EPCkKvbdhbObdvqR
-EPCjjvbdcScLUEJa
-DoDLKvbdRWnDblID
-EObkKvbdZLrETnLm
-DoDKjvbdiBoDEvpq
-DoDKjvbdMpXqVmfs
-EPCjjvbdpxngfpcx
-DncKjvbdsCGNLfjy
-DncKjvbdRjyGVHLT
-EPDKjvbdkHflGFmk
-DoDKjvbdlhdUQuSB
-EPCjjvbdKaLGlbXq
-EPCkKvbdVhXvXgYz
-EOcLKvbdKyQirztf
-EOcLKvbdliDsqVRa
-DncKjvbdJutfDdfi
-DoDKjvbdEXwksssl
-DncLKvbdxxIjCPyk
-EObkKvbdKaKgMaxR
-EPDKjvbdkCkjpgUg
-EOcLKvbdZLqctNlN
-EPDKjvbdNddThhjd
-EOcKjvbdYlSDsmlN
-EPDLKvbdmgExNOGy
-DoDKjvbdePErjstS
-DnbkKvbdZQleIldq
-DncKjvbdpssfrRkU
-EOcKjvbdDxYMTtTl
-EPCjjvbdySmhmSBg
-EPDKjvbdiiehJlxS
-EOcLKvbdFkFTDINV
-EPCjjvbdVqmxCFMD
-DncLKvbdIsZAsMwl
-DncKjvbdBraDTfXS
-EPDKjvbdmuUykJqf
-DnbkKvbdFyVUaEXb
-EObjjvbdzROmJJwA
-DncKjvbdEYXlUUTl
-EPDKjvbdBhjbKhfK
-DoCjjvbdJpzEneme
-DncLKvbdVwIwuceH
-EPDKjvbdhfjDYuiu
-EOcLKvbdFpASwHGZ
-EPDKjvbdZoOJEdyj
-DoDKjvbdqdEiPnWB
-DoDKjvbdnBjXYPNu
-DoCjjvbdiHKCxuiu
-EOcKjvbdGLFTChMu
-EOcKjvbdiMEdNtby
-DnbkKvbdGdKujBij
-DncKjvbdKQydneme
-DnbkKvbdziuPocsU
-DoDKjvbdmfdxNNgZ
-EObjjvbdDxXlUTtM
-EObjjvbddePSBwCj
-EOcKjvbdNPxQvOHT
-DnbkKvbdZHWdAOsJ
-EPDLKvbdyqPNIiwA
-DoCkKvbdpyPHfqDx
-EPDLKvbdUslsekuj
-EPCjjvbdiZtfLpnG
-DoCkKvbdmSZVZsDi
-EPCjjvbdpyOhGpcx
-EPDLKvbdzitoodSt
-DoDKjvbdVYhUZkOn
-EObkKvbdBsAbtGWr
-EPDKjvbdvBEYsOdh
-EObkKvbdGcjuibKK
-DncKjvbdeATqNYKG
-DoCjjvbdKNAEZgVB
-DncLKvbdqUUHSRjt
-EOcLKvbdGcjuibJj
-DoDLKvbdnBivxPOV
-DnbkKvbdKCjDRKCx
-DnbkKvbdrykosAgn
-EOcKjvbdUaBqTRRy
-EPCjjvbdcSbkTcjB
-DoDLKvbdIxTbILpp
-DoCjjvbdHDjuibJj
-DncKjvbduaDxroFI
-DoDKjvbdpedEtWBI
-EOcKjvbdXsLaNTnx
-EPCjjvbdYORAYVWU
-DoCjjvbdYpleIleR
-DoDKjvbdCDpAujMf
-EPCkKvbdpxoHfpcx
-DoCkKvbdUWMPisaR
-EPCjjvbdmuUzKjSG
-EPDKjvbdkxsRsYgU
-EPCkKvbdZxcjNblS
-DnbkKvbdbPffckzd
-EPDKjvbdUVkpJtBR
-DoCkKvbdvlvANEFN
-EObkKvbdShyjRAAl
-EPDKjvbdxrmhmSCH
-DoDKjvbdjvXNcaww
-EPDKjvbdkDLjqGuH
-EObkKvbdhfibxuiu
-EPCjjvbdlqyUyrci
-EPDLKvbdFVxopMjF
-EOcKjvbdqdEiPnWB
-DncKjvbdrXPlChxq
-DoCkKvbdxVMeRYkn
-EPCjjvbdlhdUQtqa
-EObjjvbdRotHKFcw
-EObkKvbdwjvcgzzG
-EPDLKvbdBhkBjiFj
-EObjjvbdlZTSTZGt
-DoCkKvbdkIHMFemk
-EObjjvbddndrkTsr
-DoDLKvbdFVxpQNKF
-EPCjjvbdZsiJZETO
-EObjjvbdiMFEOUby
-DoCkKvbdhlFEOUby
-EPCkKvbdrWolDIyR
-EObjjvbdmajWwoOV
-DoCkKvbdypoMiJwA
-DoDKjvbdCDpAvKMf
-EPDLKvbdzjVQQDrt
-EObjjvbdjlakydfo
-EObkKvbdJpyeOeme
-DoDLKvbdiHJcYvJu
-EOcLKvbdbsDKtEKB
-EOcLKvbdrpWOjDVf
-EObjjvbdelfWfmKL
-EObjjvbdxnSgwriD
-DnbkKvbdqlyjZLhJ
-EPCkKvbdQdDBPqDr
-EPCkKvbdRkYfUfjs
-EObjjvbdhtydwSVC
-DnbjjvbdWWhwvDdg
-DoDLKvbdypnliKXA
-DncLKvbdhfibxvKV
-DncLKvbdxrmiNSCH
-DncKjvbdUaBqSqRy
-DoDKjvbdZMSDsmkm
-DncLKvbdFjeScHmV
-EPDLKvbdQYmAHSrK
-DoCkKvbdUVlQJsaR
-DoDKjvbdGKdsDHmV
-EPCkKvbdkHgLfGNk
-EPDKjvbdCIkCLJFj
-DoCkKvbdrpWOicVf
-DncLKvbdqmZiyMIJ
-EObkKvbdNGcQMpUk
-EOcLKvbdhfibxuiu
-DoCjjvbdjcLjqHVH
-EPDLKvbdZxdJnDMS
-DncLKvbdHDkViajK
-EPDKjvbdhytelRNf
-EPDKjvbdZRNFIleR
-EObjjvbdNQYRWNgT
-EPCjjvbdNdcsiIkE
-DoCkKvbdajkfOnDA
-EPCjjvbdRNYCZOUz
-EPCkKvbdBcpAvKNG
-DncKjvbdqTsfqrLU
-EPCjjvbdsZlQSaHn
-EOcKjvbdqdFIpNvB
-DoCjjvbdtbcUwWPP
-EObjjvbdEYYMTtTl
-EOcLKvbdgGLzNfgA
-DoDLKvbdzdynzeZp
-DnbjjvbdajlGPNcA
-EPCjjvbdEJhJuxKA
-EPCjjvbdLLBIWAJy
-DnbkKvbdwzIFewdr
-DoCkKvbdBvzciEpW
-DoDKjvbdaNKasVNH
-EPDLKvbdVviXudEg
-EPDKjvbdcbSmSAUN
-EPDKjvbdqcdiQNua
-EPCkKvbdbBVdfPpX
-EOcLKvbdrEFIpOVa
-DoDKjvbdDigivXjA
-DoDKjvbdYSlBMtPY
-DoDKjvbdrRtjnLAm
-DoDKjvbdKeegbApu
-DnbkKvbdHgHZyXxH
-EPCkKvbddwzUTrFz
-DnbjjvbduDCtwWPP
-EOcLKvbdaRfDHsfL
-EPCjjvbddeOqbWbj
-DncLKvbdOFDsiJLE
-EObkKvbdSBceMIyL
-EOcLKvbdrylQSaIO
-DncLKvbdJcJcQjCx
-EPCkKvbdaRfCgsek
-EOcKjvbdzitoocsU
-DoDKjvbdyzdnSIJI
-EObkKvbddndsLTsr
-DoDLKvbdcTDKtEKB
-EPCkKvbddZyQYYpb
-EPDLKvbdCIjakJFj
-DncLKvbdLrWlzVQz
-EOcKjvbdxrnIlqag
-DncLKvbddeOrCWcK
-DoCkKvbdRaceLiZL
-EPCkKvbddePSCXCj
-DoDKjvbdJpzFOeme
-DoCkKvbdiMFEOUby
-DncKjvbdUQqPVVHm
-EOcLKvbdcSbjscjB
-DnbjjvbdvPTzpjoU
-EPDKjvbdEPDLKvbd
-DncKjvbdvBEYsPEh
-DnbjjvbdIxTbIMQp
-DoDLKvbdZLrETnMN
-EPCkKvbdZxdJmbkr
-EPCjjvbdIidAKQHE
-DncKjvbdrSUjmjaN
-DnbkKvbdkaNOmALA
-DnbkKvbdiGjCyViu
-EPCjjvbdYkrDsmlN
-EOcKjvbdypoMhjXA
-DoCkKvbdiGjDZViu
-DoDLKvbdZxcinClS
-DoCjjvbdqUUGrSLU
-DnbkKvbdYTLaNUPY
-EObkKvbdehKurNpg
-EOcKjvbdmRyVZrdJ
-EObkKvbdZirhPgBf
-EOcKjvbdpyOggQcx
-DnbkKvbdfoazwEXh
-DnbkKvbdmuUzLJqf
-EPDLKvbdYlRdUOLm
-DncKjvbdRjyFuGjs
-DoDLKvbdQdDAopdS
-DoCkKvbdmSYtysEJ
-EObjjvbdQdDApRDr
-DoDKjvbdyOTHxShc
-EPDKjvbdptUHSRkU
-EOcKjvbdLGGHaaRV
-EOcLKvbdaaWFFopX
-DoCjjvbdlBMnmALA
-DnbjjvbdZnnIdeZj
-DoCjjvbdZMRdUNkm
-DoDLKvbdRMxByNtz
-EPCkKvbdJYTahMRQ
-DncLKvbdpyPIHQdY
-DoCkKvbdVBCRTRRy
-EOcLKvbdZyEKODLr
-EObkKvbdRadEkiYk
-EOcKjvbdcyyQXyRC
-DnbkKvbdVqnXadkc
-EPCkKvbdGKeTDIMu
-DnbkKvbdrRtjnKaN
-EObkKvbdFVxooljF
-DoDKjvbdDoCjjvcE
-DnbkKvbddneTLTsr
-EPDKjvbdGcjvKCKK
-EObjjvbdgPazvdYI
-DoDKjvbdSLYfVHKs
-DoCkKvbdEPCjkWbd
-DnbjjvbdmaivxPOV
-EObjjvbdJJdAJogE
-DoDKjvbdhkddNtby
-DoCkKvbdiCPDEwQq
-EOcKjvbdmajXYOmu
-DnbkKvbdqYngfqEY
-EOcKjvbdTppoUuIN
-EPDKjvbdNddThhkE
-DncKjvbdDnbkKvbd
-DnbjjvbdZRNEiNFR
-EPCjjvbdaaWFFopX
-EPDLKvbdBhjbKhej
-DoCkKvbdfpBzvcwh
-DoDKjvbdmSZVZrdJ
-EObkKvbdbAueGQQX
-EOcKjvbdNQXqWOGs
-EPCjjvbdvAcySndh
-EOcLKvbdySnImRag
-EObkKvbdSxLLmzkY
-DnbjjvbdcJMjLGXY
-EObkKvbdBsBDUFwS
-DoCjjvbdqlyjZLhJ
-EPCjjvbdliEURVRa
-DoDKjvbdptTgRrLU
-DncKjvbdiBoCdwQq
-EOcKjvbdEOcLLXDE
-EObjjvbdEYYLtTsl
-EPDKjvbdVTmTekuj
-DncLKvbdLFegbBQu
-EPCjjvbdmttzLKRf
-EPDLKvbdpfEFTuaI
-DncKjvbdiiegjMwr
-EObkKvbdxVNEqYlO
-DoCjjvbdRWnDblHc
-EPCjjvbdaSFbgtGL
-DnbkKvbdozmcjwoA
-DoDKjvbdPyNAHSrK
-DncLKvbdVqnXbEkc
-EPCkKvbdFWYpQNJe
-EOcLKvbdlYsRsZHU
-EOcLKvbdQvmcblID
-EObjjvbdRkYetfkT
-DoCjjvbdFjdsDINV
-EPCjjvbdrafNMGkZ
-EPDKjvbdczZQXxqC
-EPDLKvbdDwxLtTsl
-DoCjjvbdFpASvffZ
-DoCjjvbdiMEdOVCy
-DoCkKvbdelevfljL
-DnbjjvbdaSFcHtFk
-DncKjvbdBhkBkIfK
-EObjjvbdGKdsDHmV
-DncLKvbdhzUekqOG
-EOcLKvbdZshiZDrn
-DncLKvbdDjIJuwjA
-EPCjjvbdpxoHfqEY
-EPCjjvbdOAIrsjSA
-EPDLKvbdEuyPolie
-EPDKjvbdssRrxydc
-EPDKjvbdjlakzEgP
-DncKjvbdiUydwRuC
-DoCkKvbdZMSDtNkm
-EPDLKvbdbBVeGQPw
-EObkKvbdNHDPlpVL
-DoDLKvbdDjHiuxKA
-EPDKjvbdatbGwkUI
-DnbjjvbdeqaWzkbo
-DoDKjvbdvvlBWAuu
-EObjjvbdZirhQHBf
-EPCkKvbdDncLKvcE
-DnbjjvbdehKvSNpg
-DncKjvbdVwIwudFH
-DoCjjvbdNQYRVmgT
-EOcKjvbdNrtWGeUp
-DncKjvbdvvlAvAuu
-DnbkKvbdjKGHimXr
-EObjjvbdhkddNuDZ
-EPCkKvbdNddThhkE
-EPCjjvbdsPunjDVf
-EPDKjvbdxZgfFwdr
-DncKjvbdZyDjNblS
-EPDKjvbdjcMLQfuH
-DncKjvbdwtmFRZMO
-DncKjvbdVhXuwgYz
-DoCkKvbdVZITyjnn
-EPCkKvbdNrtWHEtp
-EPCjjvbdMfbomQUk
-EObkKvbddwyssqez
-EPCkKvbdhfjCyVjV
-DoDKjvbdtvOYJpsA
-DoDKjvbdiLdcnVCy
-EObkKvbdLrWlzUpz
-DoCkKvbdSPsgKFdX
-EPCjjvbdkNCLyeGo
-DncKjvbdCSaCtGWr
-DnbjjvbdRkZFtgLT
-DoCkKvbdVAaprprZ
-DnbjjvbdyXhibQZk
-DoCkKvbdsQVnibvG
-EPCjjvbduaDyTPFI
-DncLKvbdUaCRSpqy
-DoDLKvbdnPzYukZC
-DoDKjvbdRWnDcMHc
-EOcKjvbdxVNFRZLn
-EOcKjvbdRkZGUfkT
-DnbkKvbdvmWAMdEm
-EOcKjvbdmbKXYOmu
-EPCkKvbdyXiKCPyk
-DnbkKvbdkHgMFfOL
-DncKjvbdVYgtZkPO
-EPCkKvbdDnbkKwCd
-EObkKvbdKfGHaaRV
-EPCkKvbdqZOggQdY
-EOcLKvbdTlVnaVoJ
-DoCkKvbdhanbeWqR
-DnbkKvbdypoMiJwA
-DnbkKvbduMXvaUBX
-DoDKjvbddiirWUzn
-EObkKvbdqYoHgQcx
-DnbjjvbdFyUuBDwb
-DoCkKvbdKCicQjDY
-EPDLKvbdezvYeJTw
-EPCjjvbdSxKlNzkY
-DoDKjvbdQmYByOUz
-DnbjjvbdIGgZxxXg
-EPDKjvbdqmZjZLgi
-DncKjvbdmfeYMmgZ
-DncLKvbdGdLVibKK
-DoCkKvbdZGvdAOsJ
-EObkKvbdjSzhrkJz
-EPDLKvbddePRbWcK
-EObjjvbdDxXkstUM
-DoCjjvbdvlvANDeN
-EOcKjvbdrDdiQOWB
-DoCkKvbdmajXXoOV
-DncKjvbdUtMsekvK
-EOcLKvbdxxJKBoyk
-EPDKjvbdqYnhGpcx
-EObjjvbdatafwkTh
-DncLKvbdajkenmcA
-DnbjjvbdZQleImEq
-EPCjjvbdDncLKwCd
-EObjjvbdHELWKBij
-EPDLKvbdxrmhmRag
-DoCjjvbdwXMBWBVu
-EObjjvbdsPvOjCvG
-EOcLKvbdssSTZZdc
-EPCkKvbddndrkUUS
-EOcLKvbdNGbolotk
-EObjjvbdZMSDtNlN
-EObkKvbdZshiYcsO
-DncKjvbdDwxLsstM
-EOcLKvbdqZPIGqEY
-EOcKjvbdZRNFImFR
-EOcKjvbdrDeIonVa
-DnbjjvbdYzberKWZ
-EObjjvbdegjvRnQg
-DoCkKvbduDDUwWOo
-EPDKjvbdRotGjGEX
-EOcKjvbdKQyeOeme
-EPCjjvbdDwxMTtUM
-EObjjvbdpedFTvAh
-EPDLKvbdFxtuBDxC
-DoCjjvbdlqxtzSdJ
-DncKjvbdZLrDtOMN
-EPCkKvbdGdKujBjK
-DoCkKvbdezvYdiTw
-DnbjjvbdrEEiQOVa
-DncKjvbdOYPVzdOU
-DnbjjvbdxwiKCPzL
-EObkKvbdRpTgJecw
-DoCkKvbdwtmEpxlO
-EPDKjvbdqFceTuaI
-DncKjvbdsPuoJcWG
-DncLKvbdRyjHsCvA
-EPCkKvbdyXiJaoyk
-EPDLKvbdJvVFcdgJ
-DncLKvbdrXPlChxq
-EObjjvbdvBEZTOdh
-DoDKjvbdqvokcJYq
-EOcKjvbdlqxtzSci
-EPDKjvbdFkErbglu
-DoDKjvbdEPDLKvcE
-EObkKvbdijFhJlxS
-DoCjjvbdOFDtJJKd
-DnbkKvbdyXhiapZk
-DncKjvbdEXwlTtTl
-DncLKvbdZyEKOCkr
-DnbkKvbdqlyjYlIJ
-EObkKvbdIGfyxwxH
-DnbjjvbdyNrgxTIc
-DnbkKvbdeOeSkTsr
-EPCjjvbddZyPxZRC
-DncLKvbdkDMKpgUg
-EPDKjvbdfIKuqnQg
-EPCkKvbdhlFENuDZ
-DoDLKvbdiBoCdvqR
-EPCkKvbdySnImRag
-DnbjjvbdIxTahLqQ
-DoDKjvbdZnmhddyj
-EOcKjvbdgQBzwEXh
-EPDLKvbdfILWSNqH
-DncKjvbdjcMKqGtg
-EObkKvbdKQzEnfNe
-EPDKjvbdUQqPVVHm
-EObjjvbdREDBPpcr
-EObjjvbdnHExMnGy
-DnbkKvbdvBDxrndh
-DncKjvbdCEPaVimG
-DnbkKvbdGBPQxizm
-EPDKjvbdLqwMzVQz
-DnbkKvbdEPDLLXDE
-EPDKjvbdwWkaWBVu
-EObkKvbdxrnImSCH
-DncKjvbdsrqrxzEc
-DnbkKvbdpfDeUWAh
-EPDKjvbdjAQHApGj
-DoCkKvbdaSGChTfL
-DoDKjvbdiHJbxvKV
-EPDLKvbdlhdURUqa
-EPCjjvbdIwsahMRQ
-EObjjvbdGYtuBEYC
-DncLKvbdNeEThhkE
-EObkKvbdBvzdIePv
-EPCjjvbdbAueFpQX
-EOcLKvbdjAQGaQGj
-EPCjjvbdNHDQNPuL
-DncLKvbddoFSkUUS
-DncKjvbdACqxJzIp
-DnbkKvbdxLWcgzyf
-EPCkKvbdTlVnaWPJ
-DoCkKvbdCJKbLIfK
-DoCkKvbdDwxMUTtM
-EPCkKvbdEPDLKwDE
-EOcLKvbdTvMQKTaR
-EOcLKvbdeXytTrFz
-EPDKjvbdNUrrLNAX
-DnbkKvbdZjShPgBf
-EObjjvbdjAPfaQGj
-EPCkKvbdYlRdUNlN
-EPDKjvbdzjUoocsU
-DoDLKvbdKDKCqJbx
-EPCjjvbdQvnECkhD
-DnbkKvbdGckVjBij
-EObjjvbdXmqAXuVt
-EPCjjvbdeFPRavcK
-DoDKjvbdEYXlUTsl
-DoCjjvbdXrlBNToY
-DoDLKvbdrRuLNkAm
-DncLKvbdDxXlUTtM
-EOcKjvbdwuNEqZLn
-EPDKjvbdEOcLLWbd
-DoCkKvbdpfDdtVaI
-EOcKjvbdmpZyVjyC
-EOcKjvbdtSrSxzFD
-EObkKvbdsBemLfjy
-DoCjjvbdUGznMWue
-DncLKvbdbAvEfPpX
-DnbjjvbduCcUwVno
-DoDLKvbdTppoUuIN
-DncKjvbdYqMeImEq
-DoCkKvbdrDdhomvB
-EObjjvbdgFkzOGgA
-EPDKjvbdSwjkmzjx
-DoCjjvbdREDBPpcr
-EObjjvbdYkrDtNlN
-EObjjvbdZisHogCG
-DncKjvbdUtMselWK
-DoDKjvbdkHfkeemk
-DncLKvbdSLYeuHLT
-EOcLKvbdeFOrBwCj
-EObjjvbdHDjvKCJj
-DnbkKvbdkIGkeemk
-DoCkKvbdZQmFJMeR
-DoCkKvbdqTtGrSKt
-DncLKvbdcIljKfWx
-DnbjjvbdRjxfUgKs
-DnbkKvbdhyuFlROG
-EObkKvbdpxoHfpdY
-DoDKjvbdhuZdwRtb
-DnbkKvbdBdQAvKMf
-DoCkKvbdVTlsekuj
-EObkKvbdCJLBkIfK
-EOcKjvbdmgFYNNgZ
-EPDLKvbdxrnImRag
-DoCjjvbdbKlGPODA
-DoCjjvbdMoxRVmgT
-EPDLKvbdKfGIBaRV
-DoDKjvbdSCEElJZL
-EPCkKvbdmRxtzSdJ
-EPDKjvbdjKGIKNXr
-DnbkKvbdlhdTptrB
-EPDKjvbdBcoaVilf
-EPDKjvbdRzKIScWA
-EOcKjvbdnHFXmOGy
-EPCjjvbdFfJrNhtR
-DnbkKvbdzaAPHHCM
-DnbkKvbdwXLaWBWV
-DoDKjvbdKeegaaQu
-EPCjjvbdRotHKFcw
-EOcKjvbdnGeXmOGy
-DoCjjvbdmIdTqVRa
-DncLKvbdfNGWgMik
-EPCkKvbdrovPJbuf
-EObkKvbdEvYpPljF
-DncLKvbdOYPVzdOU
-EObjjvbdrzLosAhO
-DnbjjvbdyzdnSIJI
-EOcLKvbdIsZArmYM
-DoDLKvbdvAdZTPEh
-DoCkKvbdQvnDcMHc
-EObjjvbduMYWaUBX
-DncKjvbdUyHszLOn
-EPCkKvbdbrbjscia
-EObjjvbdTkunaVni
-EObkKvbdeATpmYKG
-EOcKjvbdqUTfqrLU
-EPDLKvbdGYttaDxC
-EPDKjvbdRNYByNtz
-DncLKvbdADRwizJQ
-DncLKvbdKfFgaaQu
-EPDKjvbdxZhGGYFS
-DncLKvbdwtmFRYlO
-EOcLKvbdehLVrNqH
-DnbkKvbdKxpirztf
-DoCjjvbdZxdKNcLr
-DoDLKvbdrbFmMGjy
-DoDLKvbdqYnhHQcx
-EPCjjvbdGKeTDIMu
-EPCjjvbdZRNEhleR
-DnbkKvbdfMfXGmJk
-DnbjjvbdRjyGVHKs
-EPDKjvbdZHXEAOri
-EObjjvbdxnTIYTIc
-DnbjjvbdTpqOttgm
-EOcLKvbdWXIwuceH
-EOcLKvbdzROmJKXA
-EPCkKvbduCbtwWOo
-DncLKvbdJTZBTMwl
-EObkKvbdlqyUysDi
-DnbjjvbdrpVoJcWG
-DoCjjvbdHDjvKCKK
-EObkKvbdVwJXvDeH
-EPDKjvbdZsiJZDrn
-DoCkKvbdhfjDYvJu
-DoDLKvbdZyEJmcLr
-DnbjjvbdmajXXoOV
-DoCkKvbdelewGmKL
-DoDLKvbdUtMsfMVj
-EOcKjvbdegjuqmpg
-DnbkKvbdZMRctNkm
-DncKjvbdhlEdOUcZ
-DoDLKvbdqAiFAXIE
-EObjjvbddBsMrAUN
-EPDKjvbdaSGDHtGL
-DnbjjvbdbVCGwjtI
-DncLKvbdzdzOzeZp
-EPDKjvbdKQyePFnF
-EPDLKvbdauBgXjtI
-EPDLKvbdCSaCtGWr
-DnbkKvbdbsCjtEKB
-DoDKjvbdCWzdIeQW
-EPCkKvbdRbDeLhxk
-EObjjvbdOEctJIkE
-DoCkKvbdSPtGiedX
-DncKjvbddZyPxZRC
-DnbjjvbdTukpKUBR
-DoCjjvbdpstHRqkU
-DncKjvbdNdctIhjd
-EOcKjvbdUWMPjTaR
-DoCkKvbdLGGHbApu
-EObjjvbdmozZWLZC
-EObjjvbdULvPAvOi
-EPDLKvbdcJMikFvx
-DncLKvbdjJfHjMxS
-EPCjjvbdqYoIHREY
-DoCjjvbdiifHjNXr
-EObkKvbdZLrETnMN
-DnbkKvbdtSqsYydc
-EPDLKvbdCIkCLJFj
-DoCkKvbdliDsqUrB
-DnbkKvbdNPxQumgT
-EPDKjvbdACrYJyiQ
-EOcLKvbdYTMBMtOx
-DoDLKvbdNGcQNPtk
-DncKjvbdtbbtvuno
-DncKjvbdZLrEUNlN
-DoCkKvbdaogHELzd
-DoCjjvbdgFlZmfgA
-EPCjjvbdvPTzpkOt
-DoCjjvbdjKGHjMxS
-EPDLKvbdauBgXjsh
-EOcLKvbdiBoCeWpq
-EObkKvbdSPsfjGEX
-DnbkKvbdzGxlAMeX
-DoDLKvbdqFcdtWAh
-EPCkKvbdOYOuzcmt
-DoCjjvbdDwxLtUTl
-DnbkKvbdOTUVgFUp
-DnbkKvbdiGibyWJu
-EPCjjvbdUyITzLOn
-DoCkKvbdbLMFnnDA
-DoCjjvbdDwxLsssl
-DncLKvbdBiLBjhfK
-EPDKjvbdNPwpvOGs
-EObkKvbdzQnliKXA
-DoCjjvbdeYZssqez
-DoCjjvbdeATplxKG
-EOcLKvbdRyjIScWA
-EPDKjvbddeOqbWcK
-EPDLKvbdACrXjZhp
-DnbjjvbdmuVZkKSG
-EPDKjvbdVqmwbFLc
-EPCkKvbdCSaCtFwS
-DnbjjvbdVZHszLPO
-DoDKjvbdVrNxCFLc
-EOcKjvbdegjuqnQg
-EPCjjvbdZMSETmlN
-EOcKjvbdHDjvKBjK
-EPCkKvbdyOTIXsJD
-DoDKjvbdnQZyWKxb
-DncLKvbdxwhiaozL
-DncLKvbdNdcshhkE
-EPCjjvbdXnRAYUut
-DoDLKvbdNsUWGeUp
-DncKjvbdWHwuwfxz
-DnbkKvbdRpUGifEX
-DnbjjvbdEOcLKwCd
-EPDKjvbduaEYsOeI
-DnbkKvbdjhHLfFnL
-DncLKvbdZoOJEeZj
-EPCkKvbdEPCjjvcE
-EObjjvbdxUldqYkn
-EObkKvbdOEdThiLE
-DnbkKvbdjcMKpgVH
-EObjjvbdkIGkeenL
-DncKjvbdZsiJZDrn
-EPCkKvbdxnShXsIc
-DoDKjvbdZnmiEdzK
-DoCkKvbdVTmUGLvK
-EOcLKvbduCcVXVno
-EObjjvbdZQleJNFR
-EObjjvbdFejRmhsq
-EPDLKvbdaMkBruNH
-DoCkKvbdNQXqWNgT
-DoDKjvbdjuwNcbXw
-EPCjjvbdSBceLiYk
-DoCjjvbdMgColpVL
-DoDLKvbdVZHtZkPO
-DoDKjvbduMYXBUAw
-EPDKjvbdNeDshiKd
-DoDKjvbdTAFJICPE
-EObjjvbdJvVFceGi
-EObjjvbdNHCpMpUk
-DnbkKvbdijGIKNYS
-DoDLKvbdDncKkXCd
-DncKjvbdkMakyeGo
-EObkKvbdjKFgilwr
-DoCkKvbdOhAXyAZB
-DoCkKvbdUGznMWvF
-EOcKjvbdRosfifEX
-EPDLKvbdfNFvgMjL
-EObkKvbdxxJJbPzL
-EPCjjvbdQlxCYmtz
-EOcLKvbdgPazwEXh
-DoDLKvbdkySrTYft
-DoDLKvbdhgKDYuiu
-DoDKjvbdYkrETmkm
-EObjjvbdNPwpunHT
-EOcLKvbdYlRdUNlN
-DnbkKvbdZLrDtOLm
-EObjjvbdxrnJMrCH
-EObjjvbdZnnIeFZj
-DoCjjvbdzRPMhiwA
-DncKjvbdssSSxyeD
-EOcLKvbdjAPgAofj
-DncKjvbdRosfifEX
-DoDKjvbdEXwktUTl
-DnbjjvbdWRmwadkc
-EPDLKvbdeEoRavbj
-DoDKjvbdXsMBNToY
-DnbkKvbdVqmxCFLc
-EOcKjvbdkVwOEBww
-DoCjjvbdfNGXGmJk
-EOcLKvbdmtuZjiqf
-DoCkKvbdnPyyWKyC
-EObjjvbdJpydoGNe
-DnbkKvbdjJfHimYS
-DoCkKvbdyXhjBozL
-DoCjjvbdkIHLeenL
-EOcLKvbdTAEiIBoE
-DnbkKvbdvBDxsPFI
-DncKjvbdlhdTpuRa
-EObjjvbdFfJqmiUR
-EPCjjvbderAvzkbo
-DncLKvbdwygeexEr
-EObjjvbdSBdElJZL
-EOcKjvbdySmiMrBg
-EPDKjvbdatbGwkTh
-DncKjvbdnBivwnmu
-EPDKjvbdFxuVAdYC
-EPDLKvbdqlzJyMHi
-EPDKjvbdZRMdhldq
-DoCjjvbdNeDtIhkE
-DoCkKvbdfMewGlik
-EOcLKvbdhaoDEwQq
-DnbjjvbdIwsagkqQ
-DncKjvbdkIHMGFnL
-DoDLKvbdGdKuibKK
-DnbjjvbdTAEiICOd
-DncLKvbdNeEThiKd
-EObkKvbdYpmEiNFR
-EPDLKvbdFkFTDHlu
-DoCkKvbdkDLkRHUg
-DnbkKvbdyYIjCPyk
-DncLKvbdFVyQPmKF
-DnbjjvbdZQldhldq
-DoDKjvbdVqnYBdkc
-EPDKjvbdSKxeuGkT
-EPCjjvbdiZuGLqNf
-DnbjjvbdJTZArmXl
-DnbkKvbdyNrgwrhc
-EOcLKvbdrNZiyLgi
-DncKjvbdSBdFMJZL
-EPCkKvbdfMfWfmKL
-EPDLKvbdfMevfljL
-DoCjjvbdmIcsqVRa
-DoDLKvbdrEEhpOVa
-EPDLKvbdZRMeImEq
-DoDLKvbdyTNiMrBg
-EPCjjvbdsQVnibvG
-EOcKjvbdvBDxsPFI
-DoDKjvbdqquKnKaN
-DncLKvbdqGDeTuaI
-EPCkKvbdZdxGzgiC
-DoDKjvbdkDLkQftg
-DoDKjvbdePEsKtUS
-DoDKjvbdUxgtZjoO
-DncLKvbdxUmFRYlO
-DnbjjvbdwuMeRYkn
-DoCkKvbdRWmdClID
-EPDLKvbdCDpBWJlf
-DncKjvbduaEYrneI
-DnbjjvbdfHkVqmpg
-EPDKjvbdKxpirzuG
-DoDLKvbdZLqdUNkm
-DoDLKvbdDwxMTstM
-EOcKjvbdrzLosAhO
-DnbjjvbdqZPHgQdY
-EObkKvbdjggMFfNk
-EPCjjvbdZMRcsmkm
-EObjjvbdEJgiuxKA
-DncLKvbdZtJJZDsO
-EObkKvbdRjxeuGkT
-DncKjvbdqdFJPmua
-DoCkKvbdGYtuAcxC
-DoCjjvbdZnmheEzK
-DoCkKvbdKWUfEFGi
-DoCkKvbdfMfXGmKL
-DnbjjvbdjvWmcbXw
-DnbkKvbdyzeORhJI
-EPDLKvbdpstHRqjt
-DoDKjvbdTukpKUAq
-DoDKjvbdSPtGjFcw
-DncKjvbdWSNxCFMD
-DnbkKvbdjlalZdgP
-EOcLKvbdkxsRsYgU
-EObjjvbdLFfICApu
-DoDKjvbdCEQBWKMf
-DoDKjvbdbAvFFpQX
-DoCkKvbdhgKCxvKV
-DncLKvbdjcMLQgVH
-EPCkKvbdzitpQDrt
-EOcKjvbdNVTRjmAX
-EPDKjvbdkxsRsZHU
-DoDKjvbdKDJcRKCx
-EPDKjvbdFjeScHmV
-EPCkKvbdZjTIQHBf
-DnbkKvbdlqyUyrdJ
-DoDKjvbdehKurORH
-EObjjvbdbKlFoODA
-DoCkKvbdwtmFQyMO
-DoCjjvbdXnRAYUut
-DoDKjvbdxsOIlqbH
-DncLKvbdyNsIXrhc
-DoDLKvbdCEQAvKNG
-DncKjvbdRotHJedX
-EPDLKvbdVZHsyjoO
-DnbjjvbdkCkkRHVH
-DoDKjvbdRWmcblHc
-DncLKvbdqvokbiYq
-DoDLKvbdRkZGVHLT
-EObjjvbduCbuXVno
-DoCkKvbdEJgivYKA
-DoDKjvbdkWWnDbYX
-EPDKjvbdnGdxMmfy
-DoDLKvbdIHGzYxYH
-DoDKjvbduCbtwVno
-EObkKvbdqlyjYkgi
-EObjjvbdVwIwudEg
-DnbjjvbdfRaWzkcP
-EPCkKvbdEARhlzXX
-DnbkKvbdfMevfmJk
-DncLKvbdZyDjNcLr
-EOcKjvbdtAHQhABS
-DncKjvbdkClKqGtg
-DoCkKvbdEObkLXCd
-EObjjvbdFkFTDINV
-EOcKjvbdEztQdkcJ
-DoCkKvbdKaLHNBxR
-EPDLKvbdhaoCdvqR
-EObkKvbdrJAJdmOe
-EObjjvbdrpVnjCuf
-EPCkKvbdFjeTCglu
-DoCjjvbdqdEiPnWB
-EPDKjvbdGFirOJUR
-EPCkKvbdJmADzHUa
-EPCjjvbdWWhwucdg
-DncLKvbdBhkBjiFj
-DoCkKvbdSZihSbvA
-DncKjvbdZtIiZETO
-EPDLKvbdCTAcUGXS
-DoDKjvbdVqmxCFLc
-DncLKvbdmajWwoOV
-EPDKjvbdVhYVxHYz
-DoDLKvbddoFSjtTr
-DoDLKvbdrzMQTAgn
-DoCjjvbdUVlPjUBR
-EPDLKvbdtvOXipsA
-DoCjjvbdrouoKCvG
-EObkKvbdOSsufdtp
-EPDLKvbdIGfzZXxH
-EObkKvbdbQGgDkzd
-DoCkKvbdOFDtJIkE
-EPCjjvbdiHJbyWJu
-DnbjjvbdLAkHMaxR
-EPCkKvbdJTZBTMwl
-DncLKvbdSQTfjGEX
-EOcLKvbdlrZVZrci
-EObjjvbdkyTSTZHU
-EPCjjvbdxUleQxkn
-EPDLKvbdEKIKWYKA
-DoCkKvbdZHWdAPSi
-EPDLKvbdxVNFRZMO
-EPDLKvbdcSbkTcjB
-DoCkKvbdlYsSTZGt
-EPDKjvbduaDxroFI
-EObkKvbdNHDQMouL
-DoDLKvbdxrnJMqbH
-DnbjjvbdmfeXmOGy
-DoDKjvbdidkGtoAO
-DnbjjvbdGYtuBEXb
-DnbjjvbdRECaQQdS
-DoCkKvbdmajXXnnV
-DncKjvbdZMSEUNlN
-EPCkKvbdZtJIxcrn
-DncLKvbdJpydneme
-DncKjvbdVviYWEEg
-DoDLKvbdyXhjBoyk
-DoCjjvbdbhlikGXY
-DnbkKvbdVviXudFH
-EPCkKvbdYTMAlsnx
-EPCjjvbdxZhFeweS
-DoCjjvbdyNsIXriD
-DoDKjvbdznoqEcMY
-DnbjjvbdauCHXjtI
-DncKjvbdIsZAsMwl
-EPCkKvbdZMSDtOLm
-DnbkKvbdJqZePFme
-EPDKjvbdkHfkeenL
-DoDLKvbdaNLCStmH
-DncLKvbdIwsbHkqQ
-EObkKvbdfHjvRnRH
-EPCjjvbdlqyVZsDi
-EObkKvbdEuxoolie
-DoDKjvbdjAPgAofj
-EOcLKvbdjcMLRHVH
-DncKjvbdjKFgjNXr
-EPCkKvbdmIctQuRa
-DncLKvbdJpyePGOF
-DncLKvbdNGbpMouL
-EObkKvbdpfDdsuaI
-EPCjjvbdyzeORhIh
-DoDKjvbdrDdhpNua
-DoCjjvbdFfKRmhtR
-EPDLKvbdpfEEsuaI
-EPDLKvbdqcdhpOVa
-EPCjjvbdVYgsykPO
-DoDLKvbdDncLLXCd
-EObkKvbduaEYroEh
-EOcLKvbdkNBlZeHP
-EObjjvbdGcjvJajK
-DncLKvbdrpVoJbuf
-EObjjvbdEKIJuxKA
-DncKjvbdZxcjODMS
-DncLKvbdmgFXmOGy
-DoCkKvbdUMVoAuoJ
-DoDKjvbdqcdiQNua
-DnbkKvbdbrcKtDia
-DnbkKvbdKfFgbApu
-DncKjvbdezvZEiTw
-DnbkKvbdlqxtzSdJ
-DoCjjvbdOTUWGeUp
-EPCkKvbdJXtBhMQp
-EOcLKvbdOAJTTjSA
-EOcKjvbdfILVrNpg
-EOcLKvbdnQZxvLZC
-EPDKjvbdyYJJaoyk
-DnbjjvbdkMakzFHP
-DnbjjvbdjbkjpfuH
-DoCkKvbdgGLymfgA
-DoDLKvbdJYUBhLpp
-EPCjjvbdJSyBTMxM
-DnbjjvbdyTNiMrBg
-DnbkKvbdqYoHfpdY
-EOcKjvbdZyEKNcLr
-DoCkKvbdZtIiYcsO
-EPCkKvbdZQmFJNFR
-DncKjvbdSPsgKFdX
-DoCjjvbdvwMAuaWV
-EPDKjvbdHfgZxxYH
-EObkKvbdrSUjnKaN
-DnbjjvbdKWVGEFGi
-DncKjvbdsPvOjDWG
-EPDKjvbdhzVFkqOG
-DoDKjvbdssSSyZdc
-DoDKjvbdYkqcsmlN
-EPCjjvbdYpldiNFR
-DncLKvbdemFwGlik
-DoDLKvbdjuvmdBxX
-DoDKjvbdCTBDTewS
-DoCkKvbdKeehBaQu
-EObkKvbdwyhFexEr
-DoDKjvbdQvmccMID
-DoDKjvbdVviYVceH
-EPCkKvbdmRxtyrdJ
-EPDLKvbdYqMeJNFR
-EPCkKvbdRbDeMIxk
-EPCkKvbdcJMjKfXY
-DnbkKvbdVwIwvDdg
-DnbjjvbdIwtCHkpp
-DncLKvbdczYpYYqC
-EPCkKvbdKaLGmBxR
-DncKjvbduLwwAsaX
-DncLKvbdssRrxzEc
-EObjjvbdrXQMCiZR
-DnbkKvbdZRNFImFR
-EOcKjvbdACqwjZhp
-DnbjjvbdbKlGOmcA
-EObjjvbdGFirOJUR
-EPDLKvbdqvokbiYq
-EOcKjvbdJmAEZgUa
-DoCkKvbdbhljKevx
-EPCjjvbdbKlGPNcA
-EOcKjvbdRMxByOUz
-EOcKjvbdbsDLUEJa
-EPCkKvbdRacdlJZL
-EObkKvbdmuUyjjSG
-EObkKvbdjKFgjNXr
-DoDLKvbdlhctQuRa
-DoCkKvbdjKFhKMxS
-EObjjvbdpedEtVaI
-EOcKjvbdIwtBhLpp
-DnbjjvbdZHWdAPSi
-EOcLKvbdiLdcmuCy
-EOcLKvbdjcMLRGuH
-EPCjjvbdRbDdkiZL
-EOcKjvbdiHJbxvKV
-EOcLKvbdaSGDHsfL
-DoCkKvbdjKFhJlwr
-DncKjvbdiBoCeWqR
-EOcLKvbdegjvSNpg
-EOcLKvbdrbGMlHLZ
-DnbjjvbdBraDUGXS
-DncLKvbdFeirOIsq
-EPDLKvbdhytekpmf
-EOcKjvbdIsYaTMwl
-DnbkKvbdrSVLOKaN
-DoCkKvbdTIyjRABM
-EOcLKvbdsBfNMGkZ
-EPDLKvbdUtNTfMWK
-EObkKvbdRjxeuGjs
-EObkKvbdTqQnuVIN
-EObjjvbdhuZdwRuC
-EOcLKvbdqTtHSSKt
-DncKjvbdmpZxvLZC
-DoDLKvbdlAloNALA
-EPDKjvbdiLddOUby
-EPDLKvbdwuMdpxlO
-DncKjvbdNrsvHEuQ
-EPCkKvbdyOSgxTJD
-EOcLKvbdIryArlxM
-EPDLKvbdZHXEAPSi
-EPCjjvbdSCDdlIxk
-EOcKjvbdySnJNSCH
-DnbjjvbdijGIKNXr
-EPDKjvbdVAaqTRSZ
-EObjjvbdkxsSSxft
-EPCkKvbdnUtzKiqf
-EPCkKvbdlqxuZsEJ
-EObjjvbdEXxMUUUM
-EPCkKvbdLFfIBaQu
-DnbjjvbdrRtkNjaN
-DoCjjvbdNHCpMpUk
-EPDKjvbdZjTIQGaf
-EPCkKvbdHELWJbKK
-DoDKjvbdJbibpjCx
-DnbjjvbdJSyArmYM
-EPCjjvbdfNFwGmJk
-EOcLKvbdYTMBMsnx
-DoDLKvbdyTOJMqbH
-EObjjvbdEPDLLXDE
-DncLKvbdkyTSTZGt
-EObjjvbdGBPRYizm
-DoCkKvbdVviXvDeH
-DncKjvbdsQWOicVf
-DoCkKvbdfHjvSNqH
-DncKjvbdlZTSSxft
-DncKjvbdFVyPolie
-EPCjjvbdRXODblID
-DoCjjvbdlhcsqVSB
-DncLKvbdqYnhGqDx
-EObjjvbdFeiqmiUR
-DnbjjvbdKefHaaQu
-DoDKjvbdRNXbYmtz
-EOcKjvbdNwnuzcmt
-DoDLKvbdXFxytAPT
-EPDLKvbdOTUVfdtp
-DoCjjvbdraelkfkZ
-DncKjvbdXsMAltPY
-DoDKjvbdVUMsfLuj
-EPDLKvbdZisIPfbG
-EPDKjvbddZxpYYqC
-DnbkKvbdzjUopESt
-DnbkKvbdVUMtGMVj
-DncLKvbduCbtwWOo
-EObkKvbdaaVeFpPw
-DncKjvbdKNADzGta
-DncKjvbdeEoSCXCj
-EObjjvbdhancEvqR
-EObkKvbdKCicQibx
-DncLKvbdijGHjMwr
-DoCkKvbdziuPpETU
-DoCjjvbdiBnbeXRR
-DoCkKvbdZQmEiMdq
-EObkKvbdrMyjZMHi
-EOcKjvbddoErkTtS
-DoCkKvbdtkwvaUAw
-EPDLKvbdTlVnaVoJ
-DncKjvbdfHjurOQg
-DoDLKvbdWWiXvEEg
-EPCkKvbdqdEhpNua
-EOcLKvbdYSkaMtPY
-EPCkKvbdxmsHxTIc
-DnbjjvbdJqZdnenF
-EPDKjvbdWexzUAOs
-EOcLKvbdrovPKCuf
-DoDKjvbdkxsSSyGt
-Dnbjjvbdzdynzdyp
-EOcLKvbdHEKvJbJj
-EObjjvbdOStWHEuQ
-DnbjjvbdkyTRsZGt
-DoCkKvbdcJNKKevx
-DoDKjvbdSPtGifDw
-EObkKvbdGdLVibKK
-DnbjjvbdbBVdfPow
-DncKjvbdhtyeXSVC
-EPDLKvbdptTfrSLU
-DncKjvbdjvXODaww
-DncKjvbdqZOgfqDx
-DncLKvbdTJZjRABM
-EOcLKvbdTpqPVUhN
-EOcKjvbdRWmdClID
-DoCjjvbdqquLOLAm
-DoCjjvbdFfJqmiUR
-EOcKjvbddBsMrATm
-EOcKjvbdYzcFrKVy
-EPCjjvbdsZlQSaIO
-EPCkKvbdkHfkeenL
-EOcKjvbdiHJcYuiu
-DoDKjvbdCEPaVilf
-DoCjjvbddBrmSAUN
-EPDLKvbdSPtGifDw
-EOcLKvbdAMhYrvyx
-DncLKvbdTIyjRAAl
-EOcLKvbdZtIhyESn
-DnbjjvbdVUNUFlWK
-EOcKjvbdyXiJaoyk
-EPCkKvbdDncLKvbd
-EOcLKvbdKWVFcdgJ
-EPDKjvbdnQZxvKyC
-DncKjvbdjJehJlxS
-DoDKjvbdRkYfVHKs
-EPDLKvbdirzhsLJz
-EObkKvbdVUMtFkuj
-DnbjjvbdqwPkbiYq
-EPCjjvbdIGfzZYXg
-DoCkKvbdlYsRryGt
-EObjjvbdpfDeUWBI
-EOcKjvbdwtldpxkn
-DoCkKvbdzitopETU
-DoDKjvbdJuuGEEfi
-DnbkKvbdnPzZVkZC
-EOcKjvbdmfeYMnGy
-EPDKjvbdkIGlGGNk
-DncKjvbdezvZEhtX
-EPDKjvbdqqtjmkAm
-EPDLKvbdzRPNIiwA
-DoCkKvbdGKeSbgmV
-EPDLKvbdmJETqVSB
-EPDKjvbdbVCGwkTh
-DoCjjvbdBhkBkIej
-EOcLKvbdbBWFFopX
-DncLKvbdjggLfGOL
-EPCkKvbdzQnmIiwA
-EOcLKvbdhbPDFWpq
-EPDLKvbdkClLQgVH
-EObkKvbdrWpMChyR
-DncKjvbdMfbpNPuL
-DnbjjvbdNsUVfeVQ
-EOcKjvbdaRfDHtFk
-DoDKjvbdRbEFLhyL
-EOcKjvbdmIcsqUqa
-DncKjvbdFVyPpNJe
-DoCjjvbdLAjgMaxR
-EOcLKvbdypoNJKXA
-DncLKvbdEztRFMCi
-DoCkKvbduVmwiqTA
-EObkKvbdUyHsykPO
-DoCkKvbdhzUfLqNf
-EPCjjvbdiUzEvqtb
-EPDKjvbdpfDeTuaI
-EPCkKvbdSwjkmzjx
-DncLKvbdjKFgjMwr
-EOcLKvbdRWnECkhD
-EOcKjvbdZoOJFEyj
-DnbkKvbdvvlAvAvV
-DncKjvbdZLqcsmlN
-DncKjvbdyqOliJwA
-EPCkKvbdKWUedEfi
-DoCkKvbdePEsLTtS
-DnbkKvbdtcDVXVoP
-EPCjjvbdKCjCpicY
-EObkKvbdZdwfzhJC
-EPDLKvbdBhjajiGK
-EOcKjvbdJXsahMRQ
-DoCkKvbdZxdKNcLr
-EPDKjvbdnBjWwoOV
-DncLKvbdapGgDkzd
-EPDKjvbdjmCLzEgP
-EPCkKvbdWRmwbFMD
-DnbjjvbdBdQAujMf
-EObkKvbdzjUpPcsU
-DoDLKvbdwtmFQyMO
-DoCkKvbdiMEcmtby
-DncKjvbdSBcdkiYk
-EPCkKvbdfSBWzkbo
-EOcLKvbdxVMeRZLn
-DnbjjvbdCSaDUGXS
-DncKjvbdZtJIyETO
-EPCkKvbdTkvOaVni
-DnbkKvbdkySqsYft
-EPCjjvbdxsOJMrCH
-EPCjjvbdCWzdJEov
-EPCjjvbdEARiMywX
-EObkKvbdxsNiNSCH
-DncLKvbdhbPDFWqR
-EObkKvbdVUNUFlVj
-EObjjvbdXrlBNToY
-EOcLKvbdfHjvSOQg
-EPCjjvbdwWkaWAuu
-DncKjvbdbKlFnnDA
-EPCkKvbdRkZFuGkT
-EPCjjvbdMowpvNfs
-DncLKvbdmtuZjjSG
-DnbkKvbdiCPDEvqR
-DncLKvbdbAudfPow
-DnbjjvbdFjeSbhMu
-DncKjvbdSQTfjGEX
-EPDKjvbdbAueGQQX
-DnbkKvbdjKGIJmXr
-EOcKjvbdIryBTNYM
-EPDLKvbdmgEwlnGy
-EObjjvbdSBdEkhxk
-DoCjjvbdfMfWgMjL
-EPDLKvbdEObjjwCd
-EObjjvbdhzUekqOG
-EObjjvbdWSNwbElD
-DoDKjvbdrNZjYkhJ
-DoCkKvbdRkYfUgKs
-EObjjvbdczYpYZRC
-DoCkKvbdzoQQeDMY
-DncKjvbdFxuVBEXb
-DoDKjvbdSiZjRABM
-DoDLKvbdYzbfRivZ
-EPDLKvbdlqyUyrdJ
-EOcLKvbdtbbuWvOo
-DncKjvbdSKxfVGkT
-DoCjjvbdEXxLtUTl
-EOcLKvbdEPCjkWbd
-EPDLKvbdEObkLXDE
-EPCkKvbdxKvdHzzG
-EPDKjvbdpfDdtVaI
-DoCjjvbdbAueGPpX
-DoCjjvbdZMRdUOLm
-DoDLKvbdwtmFRYkn
-DoCjjvbdNPwpumgT
-DoCkKvbddijSWUzn
-DoDKjvbdJXsbHkqQ
-DnbjjvbdxZhFexEr
-DoCjjvbdSQUHJedX
-EPDLKvbdjmCMZdgP
-DncLKvbdMfbomPtk
-EOcLKvbdqTtHRqjt
-EPCkKvbdqceIpNvB
-DncLKvbdFxtuBDxC
-EPCkKvbdxVNEpyLn
-EOcKjvbdYzbeqivZ
-DoCjjvbdNdcsiJLE
-DoDKjvbdzjVQQDsU
-EObjjvbdvBDySneI
-DoDKjvbdBhjbKhej
-EPDLKvbdWSOYBdlD
-EOcKjvbdOYOuzcnU
-EPCkKvbdkCkkQgVH
-DnbkKvbdtlXwBTaX
-DnbkKvbdTppoVUgm
-DoCjjvbdQmXaxnUz
-DncKjvbdkHfkfFmk
-EPCjjvbdmgEwlnHZ
-EPDLKvbdZdxGzhJC
-EPCkKvbdmIdTqUqa
-DoDKjvbdzGyMAMeX
-DnbkKvbdTppnuUhN
-DoCjjvbdSLYfUgLT
-DnbkKvbdZsiJZETO
-EObkKvbdNUrqjmAX
-EObjjvbdZyDimcLr
-DoCkKvbdRDbaQRDr
-DnbjjvbdbAudfPow
-EPDKjvbdZjTHpGaf
-DoDKjvbdqwQLcIxq
-DnbjjvbdZLqdTmkm
-DoDKjvbdyXiKCPzL
-EObjjvbdssSTYyeD
-DoCjjvbdddoRawCj
-DoCjjvbdkMbLydfo
-DoCjjvbdVTmUFkvK
-DoCjjvbdhyuFkpmf
-EObkKvbdlYsSSyGt
-EPCjjvbdtvNxKQsA
-DoDKjvbdRpTgKFdX
-EObjjvbdjbkkQgVH
-DnbjjvbdaNLCStlg
-EOcKjvbdDxYLsssl
-DoCjjvbdfNFvgMjL
-DncLKvbdrovPJcWG
-DnbkKvbddoFSjssr
-DnbjjvbdSQTgKGDw
-DoCjjvbdQvnEDLhD
-EOcKjvbdUxhUZkOn
-EPCjjvbdEzsqFMDJ
-DoDKjvbdGdKuiaij
-EOcKjvbdxrnJMrCH
-DnbjjvbdUWMQJtBR
-EObkKvbdEKHivYKA
-EPDLKvbdYSlAltOx
-DnbjjvbdbVCHXjtI
-DnbkKvbdtkwwAtBX
-DoCjjvbdZQleJNEq
-EPDKjvbdEPCjjvcE
-EPCjjvbdCSaDUFwS
-EPDKjvbdHELViajK
-DoDLKvbdijFgjNXr
-DncLKvbdjmCLydfo
-EObkKvbddZyQXxqC
-DnbkKvbdySnImSCH
-EPCjjvbdqmZjYkgi
-EPCjjvbdGFirNiTq
-DoDKjvbdRXNdDMID
-DncLKvbdMfcQNQUk
-EOcLKvbdZdwfzghb
-EPDLKvbdULuoBWOi
-EObjjvbdFyVUaDwb
-DoCjjvbdNQXpumfs
-DnbkKvbdrWolDIxq
-EPCkKvbdBvzdIeQW
-DnbkKvbdfIKuqmpg
-EOcKjvbdnBiwXoNu
-EObjjvbdiHKDZWKV
-EPCjjvbdZLqdTnLm
-DoCjjvbdlYsSTYgU
-EPDLKvbdsBfNMHKy
-DnbkKvbdjuvmdCXw
-EPDLKvbdRDcBQQdS
-EOcKjvbdySmhmRbH
-EPDLKvbdbrbjscia
-EPDLKvbdkxrrTZGt
-DoDKjvbdcJMjLGWx
-EPDKjvbdKeegbBQu
-DnbjjvbdvPTzqKoU
-EOcLKvbdIidAKPgE
-DoDLKvbdVrOYBdkc
-EObjjvbdeFOqawDK
-EOcLKvbdZRNEhmFR
-EObjjvbdKfFgbBRV
-DoCjjvbdiLeEOVCy
-EPCkKvbdqmZjYkgi
-EPDKjvbdHffyxxXg
-EPDKjvbdZLrDsmlN
-DnbjjvbdTkuoBVoJ
-EOcKjvbduDDUvvOo
-DoDKjvbdZdwfzhJC
-EPCkKvbdfMfWgNKL
-EPCjjvbdRXOECkgc
-EOcKjvbdMowpvNfs
-DoDLKvbdiBoCeWpq
-EObkKvbdNwoVzdOU
-EPDLKvbdDoDKjvbd
-EObjjvbdLFehCBRV
-EOcLKvbduCcVWuno
-EOcKjvbdXsMBMtOx
-DnbkKvbdcIljKewY
-DoDLKvbdEzspdkcJ
-DncKjvbdqcdhomua
-EPDKjvbdiifHjNXr
-EObkKvbdVqnXbFLc
-EPCkKvbddwyssrFz
-DncKjvbdrSVKmkAm
-EPCjjvbdTlVoBVni
-EObjjvbdOhAYZAYa
-EPCjjvbdRadEkiZL
-DoCkKvbdSCEEkiYk
-EObjjvbdGZVVAcxC
-DnbjjvbdZyEJnDMS
-EOcKjvbdzitoodSt
-EPDKjvbdXFxzUAPT
-DnbjjvbdziuQQESt
-EPCjjvbdEARhmZvw
-DncLKvbdatbHXkTh
-DncKjvbdbsCjtDjB
-EPCjjvbdKWVGDdgJ
-EPDKjvbdrafNLfkZ
-EObkKvbdFkEsChMu
-DnbkKvbdVgxWXfxz
-EObjjvbdJbjDRJbx
-EObkKvbdwyhFfYFS
-EPCjjvbdMfbpNPtk
-EObkKvbdbsDKtDia
-EPCkKvbdkxsRsZHU
-DnbkKvbdvAdZTOdh
-DncKjvbdptUHRrLU
-DncKjvbdvPTzqKnt
-DncLKvbdTppoUthN
-DnbkKvbdrbFlkgLZ
-EPCjjvbdGdKvJajK
-EPDLKvbdACqxKZiQ
-DoCkKvbdbPffckzd
-DoCkKvbdhbOcEvqR
-DnbjjvbduCcVWvOo
-DoCkKvbdmuUzLKRf
-EPCjjvbdbUbHYLUI
-DoDKjvbdbKkeoNcA
-DoCjjvbdcScKtEJa
-DoCjjvbdyzdnRgiI
-EPCjjvbdkIGlFfOL
-EOcLKvbdzjUpPcsU
-DoDLKvbdJuuGEEgJ
-DncLKvbdTqROtthN
-EOcLKvbdpstGqqkU
-EPCkKvbdtSrTYzEc
-EPDKjvbdezvYdiUX
-DoDKjvbdtTRrxzFD
-DoCjjvbdrovOjDWG
-DoDKjvbdUQpoUthN
-EOcKjvbdKDJbpicY
-DnbjjvbdaSGCgtFk
-DoDKjvbdGZVVAcwb
-DnbjjvbdEvYopNJe
-EObjjvbdSQTgKFdX
-EPDLKvbdrXPkbhyR
-DoDLKvbdhyuGMROG
-DoDKjvbdzoQRFClY
-EPCkKvbdKWUeceHJ
-EObkKvbdZnmiFFZj
-DnbjjvbdtcDUwVoP
-DoCkKvbdjlakyeHP
-EPCkKvbdBvzdIdpW
-EPCjjvbddePRawCj
-DoDKjvbdmfeYNNfy
-DnbkKvbdSLYetgKs
-DncKjvbdFejRnJTq
-EPDLKvbdIGfzZXwg
-DncKjvbdJvVFdFHJ
-EOcLKvbdIHHZyYYH
-EPDLKvbdyXhiaoyk
-DoCjjvbdADSYJzIp
-EObjjvbdNPxQunHT
-EPCkKvbdxnTHwrhc
-DncKjvbdTppnuVHm
-EObkKvbdjlbLydfo
-DoDLKvbdVBBpsRRy
-DnbjjvbdACqwiyhp
-DoCkKvbdZRNFJNEq
-EOcLKvbdaRfDHtFk
-DoCkKvbdKfFgbBQu
-DnbjjvbddCTNSAUN
-EPDLKvbdTfznMXVe
-EOcKjvbdeOeSkUTr
-DnbkKvbdqdEiPnVa
-EOcLKvbdsBemMHLZ
-DoCkKvbdNPxQvOGs
-EPDLKvbdOTTufeUp
-DncKjvbdraelkfjy
-DoDLKvbdZoOIeFZj
-DnbkKvbdptTgRrLU
-DncKjvbdACrXiyhp
-EPDLKvbdIGgZxwxH
-DnbjjvbdZnmiEeZj
-DnbkKvbdWRmxCFLc
-DoDLKvbdyYIiaozL
-EPCjjvbdOTTvGeUp
-EPCkKvbdNUsSKmAX
-EPCjjvbdDigiuwjA
-DoDKjvbdIrxaTMxM
-DoDKjvbdZyDimcLr
-EPCjjvbdjbkkRHVH
-DoCjjvbdWXJYVceH
-EOcLKvbdlZTSSyHU
-DncLKvbdwuNEqYlO
-EPCkKvbdrpWPJbuf
-DncKjvbdtbcUwWPP
-EOcKjvbdGKeScINV
-DncKjvbdZeXfzhJC
-DncKjvbdUQqPVVIN
-DoDKjvbdxsNhmSBg
-DoDKjvbdURROuVHm
-DncKjvbdRMwbYmtz
-DoDKjvbdZRMeImEq
-EOcLKvbdWHwvXgYz
-EPDLKvbdIwsahMQp
-EOcKjvbdfHkVrNqH
-EObjjvbddjKSWUzn
-DncKjvbdxwiJbQZk
-EPCkKvbdMSWlzVQz
-DoDLKvbdUQpnuUhN
-DncLKvbdiCPCdvqR
-DoCjjvbdapHHELzd
-DncKjvbdyOSgwrhc
-DoCkKvbdDxYLtUTl
-EObjjvbdyfyMAMdw
-EObjjvbdHffzYxYH
-DoDKjvbdYzcFrKWZ
-EPDLKvbddZyPwyRC
-EPCkKvbdLhalRYAS
-DoCkKvbdGYtuBEXb
-DoCjjvbdrylQTAgn
-DoCjjvbdbBVeGPpX
-EPDLKvbdYpmFImFR
-DnbkKvbdJcKCpjDY
-DncLKvbdYTLaNUPY
-DnbkKvbdeOeSjtTr
-DoCkKvbdEYYLtTtM
-EPCkKvbdrzLoraIO
-DoCjjvbdKWVGDdfi
-DoDKjvbdBhjbLIfK
-EPCkKvbdNQYQvOGs
-EOcLKvbduLxXBTaX
-EPDKjvbdANHySwZx
-DnbkKvbdeOdsLTtS
-DnbkKvbdUsmTfMWK
-DoDLKvbdcImJkGXY
-DncKjvbdsPunibuf
-DnbjjvbdIGfyxxYH
-DoDLKvbdvBDyTOeI
-EPDLKvbdGKeScHmV
-EOcLKvbdqFceUVaI
-DncLKvbdqdEhpOWB
-DoDLKvbdTulPitAq
-DnbjjvbdWXIwudEg
-EPDLKvbdcTDKtDjB
-DoCjjvbdgFlZnHHA
-DnbkKvbdwuNEqZLn
-EObkKvbdmRxtzSci
-EObjjvbdjvXNdCYX
-DnbkKvbdqGDdsvBI
-DncKjvbdqdEhomvB
-DoCjjvbdrpVoKCvG
-EObkKvbdWHwvYHYz
-EOcKjvbdrykoraHn
-EPCkKvbdsPuoKCuf
-DncKjvbdZjSgofaf
-DncKjvbdNeETiIjd
-DoDLKvbddoFSkTsr
-EPCkKvbdkWWnECXw
-DnbkKvbdZRNFIldq
-EObjjvbdzjVQPdTU
-DnbjjvbdhytelRNf
-EOcKjvbdNPxQunHT
-DoCkKvbdmuVZkJrG
-EPCjjvbdUVlQJtBR
-DoDKjvbdzitpQESt
-DoCjjvbdraemLfkZ
-DoDLKvbdkNBlZeHP
-EObkKvbdrbGNMHLZ
-EPDLKvbdkIHLeemk
-DoDKjvbdbAvEeopX
-DoDKjvbdiGjCxujV
-EPCkKvbdqlzJxkgi
-DncLKvbdVZITzLPO
-EOcLKvbdVZITykOn
-EPCjjvbdjuvnDaww
-DoDKjvbdkVwOECYX
-EObjjvbdcyxpXyRC
-DnbjjvbdULvPAuni
-DnbkKvbdOTUWGdtp
-EOcLKvbdKDJcRKCx
-EPCkKvbdBsBDUFwS
-DncLKvbdQdDAopcr
-EObjjvbdcSbjtEKB
-DnbjjvbdlAloNALA
-DoCjjvbdADSXizJQ
-EOcKjvbdrpWOibvG
-EObjjvbdIGfzZXwg
-EPDKjvbdptUHRrKt
-DncLKvbdZdwfzhIb
-DoCkKvbdQZNAGrrK
-DoDKjvbduCbtvuoP
-EPCjjvbdJuuFceGi
-EPCkKvbdgGLymgHA
-DnbjjvbdcyyPxYpb
-EPCkKvbdhuZeWquC
-EObkKvbdyTNiNRbH
-DoCjjvbdVAaqSprZ
-DncLKvbdoznDkYPA
-EPCkKvbdiUydvquC
-DncLKvbdhytfMROG
-DoCkKvbdmbKXYPNu
-DnbkKvbdMpYQunHT
-EOcLKvbdHkaznXQk
-DoDLKvbdTvMPisaR
-DoCkKvbdIryBTNXl
-DoDLKvbdZLrDsmkm
-DncLKvbdlhctRVRa
-EPCjjvbdYkqcsmkm
-EPCjjvbdEXwlUTtM
-EObkKvbdEvZPoljF
-EPDLKvbdZRNEiNFR
-DoCkKvbdANIZTXZx
-DncKjvbdZoOIeFZj
-DoDLKvbdeJirWUzn
-DoCjjvbdRWmdDLgc
-DoDKjvbdACrYKZhp
-EPDKjvbdMowpunHT
-EOcKjvbdYTLaNTnx
-DnbjjvbdQvnEClHc
-DnbkKvbdSBceLhyL
-DoDKjvbdjgflGGOL
-EOcKjvbdYpldiMdq
-DoCjjvbdrovPKDWG
-DoDKjvbdZisHofbG
-DoDKjvbdEOcLKwDE
-EPCjjvbdhfjDZWJu
-DncKjvbdhfjCyWJu
-EOcLKvbdtSqsYzEc
-DoDLKvbdbQHHELzd
-DoDKjvbdySnImRbH
-EOcLKvbdVqmxCElD
-DnbjjvbdNdcsiJKd
-EPCkKvbdkNBkzEfo
-DnbkKvbdJKEAKPfd
-DncLKvbdiifIJlwr
-DnbjjvbdhtzEvqtb
-EObjjvbdwWlAvBWV
-EPDLKvbdlhctQuSB
-EOcLKvbdNddUIiKd
-EPDKjvbdJSxaTMxM
-EPDLKvbdVrOXaeMD
-DoDLKvbdGcjvKBjK
-DncLKvbdqvpLbiZR
-EPCkKvbdjKFgilxS
-DncLKvbdDoCjjvbd
-DoCjjvbdqqtjnKaN
-EOcKjvbdBvzdJEpW
-DoCkKvbdcarlrATm
-DoDLKvbdQdCaQQdS
-DncKjvbdVqnXadkc
-DoCjjvbdJvUecdgJ
-DnbkKvbdVYhUZkPO
-EPDKjvbdxZgfFxEr
-EPCjjvbdsPunicWG
-DnbkKvbdmSYtyrdJ
-DnbjjvbdTulQJsaR
-DncKjvbdsrrSxyeD
-DnbkKvbdzQnmJJwA
-DncKjvbdatafxLTh
-EOcLKvbdmfeYNNgZ
-EObkKvbdNxOuzcnU
-EPDLKvbdDwwksstM
-EPDLKvbdxnTIYTIc
-EPDKjvbdHgGyyXxH
-EOcKjvbdGAnpyJzm
-DoCkKvbdUQqPVUhN
-DncLKvbdYgWdAOri
-DoDLKvbdygZMANFX
-EPCkKvbdrJAJdlne
-EPDLKvbdZnmheEyj
-DnbjjvbdIxUCHkpp
-DnbkKvbdjJehJlwr
-DoDKjvbdhlEdNuDZ
-EOcKjvbdeOeSkTsr
-EOcLKvbdVqnYBdlD
-DoDKjvbdeATqMwif
-EPCjjvbdrXQLbhyR
-DnbjjvbdFkErbhMu
-DoCjjvbdpxnhHQcx
-EOcLKvbdrWpMDIxq
-EPDKjvbdVhYWYGxz
-DoCkKvbdwzIGFxFS
-DoCjjvbdEztQeLbi
-DnbjjvbdlZTRrxgU
-DncLKvbdSZihSbvA
-DnbjjvbdrzLpTAgn
-EPCjjvbdNrsugFVQ
-DnbjjvbdxUleQxlO
-DncKjvbdtkwwBUAw
-DoCjjvbdbBVdeoow
-EPDKjvbdEObjkXDE
-DnbjjvbdhgJbxvKV
-EPCkKvbdIwtCHlQp
-DoCkKvbdxmsIXrhc
-EObkKvbddePSCXDK
-EOcKjvbdVrOXbEkc
-EOcLKvbdFVyPomJe
-DoDLKvbdREDBPqDr
-DncLKvbdaNLCStmH
-DncLKvbdbAudfQPw
-DoDKjvbdRaceLiZL
-DoCkKvbdJYUCIMRQ
-DnbkKvbdYkrDtOMN
-DnbjjvbdFkFTChNV
-EOcLKvbdZRMeImFR
-EObkKvbdUxgszLOn
-EOcKjvbdFjdsChMu
-EObkKvbdrafNLgLZ
-EPDKjvbdelewGmJk
-EOcKjvbdZMRctNlN
-DoDLKvbdliEUQtqa
-DncKjvbdqUUHSRjt
-EPDKjvbduCbtwVno
-DoCkKvbdaaVeFoow
-EPDLKvbdkClKqGuH
-DoDLKvbdCflFgAzc
-DoDLKvbdTAEhgbPE
-EObkKvbdmtuZjjRf
-EObjjvbdKDKCqJbx
-DncKjvbdrovOjDVf
-DoCkKvbdhtzFWqtb
-DncLKvbdEvYpQNKF
-EOcLKvbdeFPRavcK
-DoDLKvbdhlEcnUby
-DoCkKvbdegjvSOQg
-DncKjvbdhbPCeWpq
-DnbjjvbdsrrTYyeD
-DncLKvbdTlWPAvOi
-EPCjjvbdwzHeexEr
-DncLKvbdmJEUQuRa
-DnbkKvbdkIHLeemk
-EObkKvbdhtyeXSUb
-EOcLKvbdHDkWKCJj
-EOcLKvbdRbDdkhyL
-EObkKvbdRosfifDw
-EPCjjvbdOStVfduQ
-DnbkKvbdiHJbxujV
-DoCjjvbdsPuoJcWG
-EPCkKvbdDxXktTtM
-DoCjjvbdHDjujCJj
-EObjjvbdUWLoisaR
-EPDKjvbdqiAKEmOe
-DoDLKvbdxmsIYShc
-EPCkKvbdCJKbKiGK
-DoDLKvbdRECaQRDr
-EPDLKvbdYqNEiNEq
-DnbkKvbdiMEcnVCy
-DoCkKvbduCbtwVno
-DoDKjvbdHbMZdzAD
-DnbkKvbdemGXGmKL
-DoDLKvbdgQBzwDwh
-DoDKjvbdKQzEoGOF
-DoDKjvbdWSNwaeMD
-EPDKjvbdySmhlqbH
-EObkKvbdDxYLtTtM
-DnbjjvbdFxuVBEXb
-EObjjvbdiBoCdwRR
-EPCjjvbdGQATWgGZ
-EPCkKvbdYpleJNEq
-EOcLKvbdvPTzqKoU
-DnbkKvbdZQmEhldq
-DncKjvbdLBKgMawq
-EPCkKvbdqFceTvAh
-EPCjjvbdkIHMFenL
-DoDKjvbdehLVqnRH
-DoDKjvbdxwhibPyk
-DnbkKvbdkMbMZeHP
-EOcKjvbdsrrSyZeD
-EOcLKvbdMowpunHT
-EObjjvbdJqZdnfOF
-DoCkKvbdezuxdhtX
-DnbjjvbdaaWFFopX
-DoCjjvbdqdFJQOVa
-EPCjjvbdWWhwudFH
-EPDKjvbdhtzFWrUb
-EPCkKvbdWSNwaeMD
-EObkKvbdcIlikFvx
-EPCkKvbdauCGwkTh
-EPCkKvbdbhmJkGWx
-EPDKjvbdRosgJfEX
-DnbkKvbdTvMQJtAq
-DnbkKvbdsBfMlGkZ
-DnbkKvbdVrNxCElD
-DoDLKvbdmpZxukZC
-EObkKvbdhlEcnVCy
-EOcLKvbdwzIFfYFS
-DnbkKvbdZtIhxdSn
-DoDLKvbdjgfkfFmk
-DoDLKvbdqTtHSRkU
-EObjjvbdSCDeLiZL
-DoDKjvbdeATplxJf
-DnbkKvbdIBkzEzAD
-EOcKjvbdFWZQPljF
-DoCjjvbdRbDeMJYk
-EPDLKvbdDoCkKvcE
-DoCkKvbdZjShPfbG
-DnbjjvbdNPxQvOGs
-EPDLKvbdKyQirztf
-DoDLKvbdJutecdfi
-DoCjjvbdTppoUuHm
-EPDLKvbdjEkGuPAO
-DnbkKvbdVTmTekuj
-DnbkKvbdZyEJmcMS
-EOcKjvbdNddThhjd
-DncLKvbdrDdhpNua
-EOcKjvbdBiLBkJGK
-DoCkKvbdrXPkbhxq
-DnbjjvbdZQmEiMdq
-DncLKvbdhzUfMROG
-EPDKjvbduaEYroEh
-DoCjjvbdJYUCHkqQ
-DoCjjvbdwzHfFxEr
-EPCjjvbdLiBkqYAS
-DoDLKvbdxZgfFxEr
-DoCkKvbdraemLgLZ
-DoDLKvbdxxJJaozL
-EPDLKvbdKeehBaRV
-DoCkKvbdPIAYZAZB
-EObjjvbdBvzdIdov
-DoDKjvbdjblKqGuH
-DoDKjvbdlhdURVSB
-EPDKjvbdqvpMDJZR
-DncKjvbdajkeoODA
-EOcKjvbdkySqsZHU
-DnbjjvbdJqZdnfOF
-DncKjvbdZHWdAOsJ
-DoCkKvbdaNLCStlg
-DoDLKvbdVZHszKnn
-DoCjjvbdtvOYJpsA
-DoCjjvbdNPxQvNfs
-DoDLKvbdZLqctOMN
-EObjjvbdvwMAvAvV
-DnbkKvbdEuxpPlie
-DnbkKvbdAMhYsWyx
-DoCkKvbdtumwjQsA
-EPCjjvbdVAaprqRy
-EObkKvbdlZSqsYgU
-EObkKvbdBvzdIdov
-DnbjjvbdyOShYTJD
-EOcLKvbdZshhxdSn
-EPDKjvbdUtMselWK
-DoDLKvbdYqNEiMeR
-DncLKvbddePSBwDK
-DncLKvbdqYnggQcx
-DnbkKvbdqceJQOVa
-DoDLKvbdtSrTZZeD
-EPCjjvbdANHyTWzY
-DoDLKvbdcIlikFvx
-DoDKjvbdxmsHwsIc
-EObkKvbdYzbfRiuy
-EPDKjvbdWHwuwfxz
-EOcLKvbddndsLTsr
-EObkKvbdwXMAuaVu
-EPDLKvbdbVBfwjtI
-EObjjvbdfMfXHMik
-DoCkKvbdOXoVzdOU
-DnbkKvbdnGeXlnHZ
-EPCjjvbdGGJrOJTq
-EPCkKvbdhanbeWqR
-EOcLKvbdLhbLpxAS
-EPDLKvbdbBVdepPw
-EOcKjvbdWSNwadlD
-DoCkKvbdaRfChTek
-EPCkKvbdmbJvxOmu
-DoCkKvbdCSaCsfXS
-EObkKvbdbhljKewY
-DncLKvbddZxowxpb
-DnbjjvbdRDcBQQdS
-DnbjjvbdKDJbqKDY
-EObkKvbdWRmxCFLc
-EPDLKvbdYlSETmkm
-EOcLKvbdMIalRYAS
-DoDKjvbdCEQAuimG
-EPDKjvbdCTAcTewS
-EPCjjvbdrRtkOKaN
-DnbkKvbdtTRryZeD
-DnbjjvbdMgColpVL
-EOcKjvbdrDdhomua
-EPDKjvbdRbDeMJZL
-DnbkKvbdxnSgwrhc
-DoDKjvbdVvhxVdFH
-DncKjvbdLYqJrzuG
-DncLKvbdZsiIyETO
-EPDLKvbdieLHUoAO
-EPDLKvbdNsUVgEuQ
-EPDLKvbdoAKztHcn
-DncKjvbdfNFvgNJk
-DoCkKvbdqYoHgQcx
-DncLKvbddwzUUSFz
-DoCkKvbdIHGzZYXg
-DncLKvbddZxpXxpb
-DnbjjvbdhlFDnUcZ
-EPCjjvbdSKxfUfjs
-DoCkKvbdbAvFGPpX
-EOcLKvbdVhXuwfxz
-EPCkKvbddoEsKtTr
-DncKjvbdhkeEOVDZ
-EObjjvbdNUrqjmAX
-EPDLKvbdUWLojTaR
-DoDLKvbdWIYVwfxz
-DnbkKvbdUtMsekvK
-EOcKjvbdRpUHJecw
-DoDKjvbdCJKbKiFj
-EObjjvbdEuxoomJe
-EPCjjvbdLrWlytpz
-EObjjvbdMgDPlotk
-DncLKvbdNrtWHFVQ
-DoCjjvbdZeYGzgiC
-EPCkKvbdKaKfmCYR
-DoCjjvbdjlakzEfo
-EPDKjvbdpeceTvBI
-DnbkKvbdKDKCqJcY
-DoDKjvbdMowqWNgT
-EPDKjvbdRMxCYmtz
-EObjjvbdrXQLbiYq
-DncLKvbdZnmheFZj
-EOcLKvbdiLeENtcZ
-DncKjvbdzaAPGfal
-EPCkKvbdeATqNYKG
-EObjjvbdSCDdlIyL
-DoCkKvbdVZHtZjnn
-EPCjjvbdZtIhxdTO
-EPDKjvbdTlVoAuoJ
-EObjjvbdZRNFIleR
-DoDLKvbdEPDLKwCd
-DnbjjvbdfRaWzkbo
-EPDLKvbddneSjstS
-EObkKvbduCbtwWOo
-EPCkKvbdmoyyWKyC
-EPCjjvbdehLVrORH
-DoDLKvbduCcUvuno
-EObkKvbddZxowxqC
-EObkKvbdKQydoFme
-EPCkKvbdqqtkOKaN
-DoDKjvbduaEYsOeI
-EObkKvbdePEsLUTr
-DoDLKvbdbsDLTcia
-DncLKvbdDwwlTtUM
-EOcKjvbdOEdUIhkE
-DoDLKvbdtvOXjRTA
-EObkKvbdeFPSCXCj
-EPCkKvbdqlzJxlIJ
-EOcKjvbdUMVoBVni
-EPCkKvbdqqtkNkBN
-DoDLKvbdiVZeWquC
-DncKjvbdZLrDsmlN
-EPCkKvbdzitopESt
-EOcKjvbdnBjXYPOV
-EObkKvbdehKurOQg
-DoCjjvbdmJDsptrB
-DnbkKvbdaNKbTVNH
-DncLKvbdGQASvfey
-EOcLKvbdtbcUwVno
-EOcKjvbdqUUHSSLU
-EOcLKvbdvwLaWBWV
-EPCkKvbdRacdlIxk
-DnbkKvbdxZgfGXeS
-EOcLKvbdVAapsQqy
-EOcLKvbdQvnECkhD
-EPDKjvbdCWzchdpW
-DoCjjvbdpedFUWBI
-EPDKjvbdqvpMCiYq
-EPDLKvbdEPDKjwCd
-DncLKvbdGckWJaij
-EObjjvbdgPazwEXh
-DoCkKvbdUVlPitBR
-DoCjjvbdMSXMzVQz
-DnbkKvbdliEUQuRa
-DoCkKvbdOStVgFUp
-EPCjjvbdUtMtGMVj
-DoCkKvbdKWVFdFHJ
-EPCkKvbdUxhUZkOn
-DnbkKvbdLBKflbYR
-EPCkKvbdFkEsCglu
-DnbkKvbdKCibpjCx
-DnbkKvbdGLEsChNV
-DoCjjvbdLGFhCApu
-DncLKvbdeXzTsqez
-DoCkKvbdxrmhlqbH
-EPDLKvbdYlRdTmlN
-EPCjjvbdqYnhHRDx
-EPDKjvbdWfYzUAOs
-EPCkKvbdMJCLpxAS
-EObkKvbduCbtwVoP
-DoCkKvbdmfdwlmfy
-EPCjjvbdVBBprpqy
-DoDLKvbdEKHivXjA
-DoDLKvbdkWWnECYX
-EOcKjvbdqUUHSRkU
-DncKjvbdYlRcsnLm
-EOcKjvbdelfWfmJk
-EPDLKvbdZtIhxcsO
-EOcLKvbdGKdrcINV
-EPDLKvbdOAIsUKSA
-DoCjjvbdXFxytAOs
-EPCjjvbdUQpntuIN
-EPDLKvbdTvLpJtBR
-EPDKjvbdRyihSbvA
-DnbjjvbdhyuFlROG
-EObkKvbdZxcinClS
-EOcKjvbdptTfqrKt
-DoDLKvbdURRPUtgm
-EObkKvbdaNKbTVNH
-EOcLKvbdiZuFlQmf
-EPDKjvbdePEsLUTr
-EPCjjvbdFxuUaEYC
-EPDLKvbdliETpuRa
-EObjjvbdjKFhKNYS
-DoCkKvbdwzHefXeS
-DoDLKvbdFfJqmiUR
-EObjjvbdcJMjKewY
-EObjjvbdqdFIomua
-DnbkKvbdFejRnJTq
-DnbjjvbdEzsqFMCi
-EPDLKvbdhzUelROG
-EPDKjvbdLKaIWAKZ
-DoCkKvbdGGJrOIsq
-EOcKjvbdVUMtGMWK
-EObkKvbdmpZyVkZC
-DoDLKvbdJTYaSmXl
-EObjjvbdmSZUyrci
-EObkKvbdxnSgwsIc
-EOcLKvbdhgJcYujV
-DoDKjvbdUQpoVVHm
-EPDKjvbdKWVFdEgJ
-DoCkKvbdWXJXudEg
-EObkKvbddxZtURez
-DnbkKvbdZRMeJNEq
-EOcKjvbdpxoIHRDx
-EObkKvbdGGKSOJTq
-EOcKjvbdkIHMFenL
-EPDLKvbdTqQoUtgm
-DnbjjvbdtvNxJpsA
-DnbkKvbdFyUtaDxC
-DnbkKvbdSLYeuHKs
-DncLKvbdxrmhlrBg
-DncLKvbdGdLWJajK
-EPCkKvbdSPtHJfEX
-EPCkKvbdeKJrVtzn
-DoCjjvbdWRnXadlD
-DncKjvbdhkdcmtby
-DoDLKvbdVviYWEFH
-EOcKjvbdTAFJICPE
-EPCjjvbdCJKbLIej
-DoDLKvbdyYJJaoyk
-EPDKjvbdNsUVgFUp
-EPCjjvbdrDdhomua
-DoDKjvbdySnJNRag
-EPCjjvbdyNrgxShc
-DnbjjvbdADRxKZhp
-DnbkKvbdaMkCStmH
-EPDKjvbdfIKvRnRH
-DnbkKvbdoAKztIEO
-DnbjjvbdDjHjVwjA
-EObkKvbdjuwODbYX
-DoDLKvbdbhmKKfWx
-EPDLKvbdKaLGlaxR
-DoDLKvbdwzIGFxFS
-EPCkKvbdGBOpxizm
-EPDKjvbdRXODcMHc
-EOcLKvbdYqNFJMdq
-EOcKjvbdxUleQxkn
-EPDKjvbdZirgpHCG
-DncLKvbderAvzkbo
-EPCkKvbdTvMPisaR
-EPCkKvbdZtJIxdTO
-EOcKjvbddePRavcK
-DncLKvbdCDpAuimG
-EPDLKvbdQdCaPqES
-EObjjvbdZyEJmbkr
-DoDLKvbdOEcsiIkE
-EOcKjvbdrbFlkgLZ
-EOcKjvbdRacdlJZL
-EPCkKvbdKDKCqKCx
-EPDKjvbdrDeIonVa
-DncKjvbdOFEThhjd
-DncLKvbdLAkHMbXq
-EObkKvbdhytekpnG
-DncLKvbdrSUkOLAm
-DncLKvbdiCOcFWpq
-DoCjjvbdrylPsAhO
-EOcKjvbdxVNEpyLn
-DnbkKvbdmbJvwnnV
-DnbkKvbdVAbQsQrZ
-EPCkKvbdCTBCtGXS
-DncKjvbdTAEiHbPE
-EObjjvbdFeiqnJTq
-EPDLKvbdDxYMTtTl
-DncLKvbdHDkVibKK
-DnbkKvbddePSBvcK
-DoCjjvbdauCGwkTh
-EPDLKvbdWIYWYGxz
-DoDLKvbdjcLjqHVH
-DoDLKvbdTfznMXWF
-DnbkKvbdkVwNcaww
-EObjjvbdlYrrSxgU
-DncKjvbdaNLCTUmH
-EOcKjvbdznoqEblY
-DncLKvbdjuwOEBww
-DncKjvbdGQATXHGZ
-EOcKjvbdiZuFkpmf
-EPCjjvbdajlGOnDA
-EPDKjvbdJcJbpjCx
-DncKjvbdauBgXjtI
-EPCkKvbdsZkpTAhO
-EPCkKvbdOEdUIhjd
-EOcKjvbdNsUWGduQ
-DnbkKvbdVTltFlVj
-EObjjvbdaNKasVNH
-DnbjjvbdhancEvpq
-EPDLKvbdZtIiZETO
-DoDKjvbdFxuUaEYC
-DoDLKvbdLGGHbAqV
-DoDKjvbdqceIpOWB
-DoDKjvbdvBEZTPEh
-DoDKjvbdKefHbBQu
-EPDLKvbdlZTSSyHU
-DncKjvbdnPyyWKyC
-EObjjvbdsZkpTBHn
-DoCjjvbdaaVdepPw
-EPDKjvbdtkwvaUAw
-EObjjvbdEPCkKvbd
-EPCjjvbdtkwvaUBX
-DncKjvbdRbDeMIyL
-EOcKjvbdxwhjBoyk
-DoDLKvbdFxuVAcxC
-DnbkKvbdxZgfFxFS
-EOcKjvbdjhGkefNk
-EOcKjvbdEPDKkWcE
-EPDLKvbdQvnEDMID
-EOcLKvbdqquKmjaN
-DoCkKvbdZtJJZESn
-EPDLKvbdTkvOaWPJ
-DnbjjvbdcSbkUEJa
-EObjjvbdQlxBxmtz
-EOcLKvbdehKuqmpg
-EObjjvbdpyOggQcx
-DncLKvbdnVVZjjSG
-EPCjjvbdyqOmIiwA
-EPDLKvbddZxpXyRC
-EObkKvbdRXODcMID
-EOcKjvbdnHFXlmfy
-EPDKjvbdznpQdcLx
-EOcLKvbdqGDdtWBI
-EPCjjvbdZoNhddzK
-EOcKjvbdqTsgSSLU
-EOcLKvbdRzJhTCvA
-EOcKjvbdCIjbLIfK
-DncKjvbdKQzEoGNe
-EOcKjvbdACrXizJQ
-EObjjvbdEzspdkcJ
-EObkKvbdsZlQTAhO
-EPDKjvbdfoazwEYI
-DoDLKvbdjAQGaQGj
-DoDLKvbdEzsqFMCi
-EPDKjvbdyYJJapZk
-DnbkKvbdIxUBglRQ
-DoCjjvbdtTRsYyeD
-EPDKjvbdGKdsDIMu
-EOcLKvbdFyVVAcxC
-DnbkKvbdZLrDtNkm
-EPDLKvbdsrqrxydc
-EPDKjvbdrpVnjCvG
-DoDLKvbdmSYtzTEJ
-EPDKjvbdajkfOmcA
-EPDLKvbdssSSxzEc
-EObjjvbdDxYMTssl
-DnbkKvbdiMFEOVDZ
-EOcLKvbdULvOaVni
-EPDLKvbdlqyUzSdJ
-EObjjvbdZoNheFZj
-DncKjvbdcScLTdKB
-EObkKvbdGLFTDINV
-DncKjvbdcyyQYZRC
-EOcKjvbdYqMeIldq
-DoCkKvbdOEcshhkE
-EObkKvbdirzhrjiz
-EOcLKvbdxUmFRYlO
-DoDKjvbdkyTRsZGt
-DncKjvbdIryAsNYM
-EObkKvbduWNxJpsA
-DncKjvbdYkqcsnLm
-DoDLKvbddZxpXyQb
-DncKjvbdRotGiedX
-DnbkKvbdKVtedEgJ
-EOcKjvbdjvWnEBww
-EObkKvbdFyVVAdXb
-DoCkKvbdYlSEUNkm
-EOcKjvbdcTDLTcia
-EPCkKvbdzjUpQESt
-DnbkKvbdqUTfqrLU
-EPDKjvbdSQUHJfEX
-DnbjjvbdiGjDYvKV
-EObkKvbdhkdcnVCy
-EPCjjvbdJuuFdFHJ
-EObjjvbdYkqdTnMN
-DoCkKvbdpssgSRkU
-EObkKvbdUWLpKUBR
-DoDKjvbdZsiJZESn
-DnbkKvbdYqMdhmEq
-DoCkKvbdjcLkRHVH
-DnbkKvbdSPsgKGDw
-DoDLKvbdKVtfEEfi
-EPCjjvbdiGibyWKV
-EPCjjvbdEYYLtUTl
-EPCjjvbdFejSOIsq
-DncLKvbdRECaQRES
-EPCkKvbdEuyQQNKF
-EObkKvbdxwhjCPzL
-DncLKvbdiLeDnUby
-EOcKjvbdEuxpQMie
-EOcKjvbdIidAJogE
-DoDKjvbdxsNhlqag
-EOcKjvbdEzsqFLcJ
-EObjjvbdYTMAmToY
-DoDLKvbdwuNFQyLn
-DoCkKvbdzitpQDrt
-EOcLKvbdZtJIxdSn
-DncLKvbdqZPHgRDx
-EPDLKvbdMoxQvNfs
-DncKjvbdmIctQuSB
-DoCkKvbdFfKSNiUR
-EPDLKvbdhtydvqtb
-EObjjvbdxrnJNRag
-DnbjjvbddoFTKssr
-EPDKjvbdqlyjZLgi
-DnbkKvbdyNsHwsJD
-EOcLKvbdxnTHwsJD
-EObjjvbdUQqOtuIN
-DnbkKvbdwtleQyMO
-DoDLKvbdrovPKDVf
-EOcLKvbdFaPQxizm
-EObjjvbdVAapsQqy
-EOcKjvbdJvVFdFGi
-DnbkKvbduDDVXVno
-EObkKvbdZjTHpGbG
-EObjjvbdZirgofaf
-DncKjvbdAMgySvzY
-DoDKjvbdGdLVibKK
-DoDKjvbdWRmwbEkc
-DncKjvbdXsMAlsnx
-DoDLKvbdtcCuXVoP
-DoDLKvbdqlyjYlIJ
-EPCjjvbdHELVjCKK
-DncLKvbdBdQAuilf
-DoCjjvbdeFOrCXDK
-DoCjjvbdRpTgJfDw
-DoCkKvbdLAkHMbXq
-EOcLKvbdaRebhUGL
-DncLKvbdnQZyWLYb
-EObjjvbdXsMBNUOx
-DncKjvbdrSVKnKaN
-EPCjjvbdAMhZSwZx
-EOcLKvbdcScKtEKB
-DncKjvbdKaLGlaxR
-EOcKjvbdZRMeJNFR
-EPCkKvbdwygeewdr
-DnbkKvbdhancFXRR
-EOcKjvbdOTUVfdtp
-EPDLKvbdmbKXYOnV
-DoDKjvbdGLFSbhNV
-EPDLKvbdMfbomPtk
-DnbkKvbdmIcsqVRa
-DoDKjvbdwtmFRZLn
-DoCkKvbddtAUATMv
-DncKjvbdiBoDEvqR
-EObkKvbdiHJcYujV
-DnbjjvbdiCPDFWqR
-EOcKjvbdyTNhlrCH
-DoDKjvbdNQYRVmfs
-EOcLKvbdFjdrbhMu
-DoCjjvbdsrrSyZeD
-EPCkKvbdXsMBMsoY
-DoDKjvbdjhHLfFmk
-EPCkKvbdyOTIYTIc
-EOcLKvbdbhmKLGWx
-DnbjjvbdxnTHwsIc
-EOcLKvbdZoOJEeZj
-EOcKjvbdjmBkzEfo
-EPDKjvbdYORAXuWU
-EPDKjvbdtkxXAsaX
-DoDLKvbduaEYsPFI
-EPCjjvbdypoNIiwA
-DoDKjvbdVBCRTQrZ
-DnbjjvbdlrYtyrdJ
-DoCjjvbdhzUekpnG
-EOcKjvbdcTCjsdJa
-EObkKvbdbhlijfWx
-EOcLKvbdYTLaMsoY
-DnbjjvbdKVtedFGi
-EOcLKvbdsPvPJbuf
-DncLKvbdNrsvHEuQ
-EObkKvbdmfeYMmfy
-EPCjjvbdZjTHpHCG
-DoDLKvbdpyOhGqDx
-DoDKjvbdRkZGVGjs
-DnbjjvbdRWnEDMHc
-EPCkKvbdjlbMZdfo
-DoCkKvbdyqOmIiwA
-DoCkKvbddxZstSFz
-DnbjjvbdKCibqJbx
-DoCjjvbdqqtjnLBN
-DnbjjvbdBhjbLJGK
-DoDLKvbdrWokbhxq
-EOcLKvbdJzpGXdAN
-EPDKjvbdRMxCZNtz
-DncKjvbdkClLRGuH
-DncLKvbdIHHZxxXg
-EPDKjvbdZshiYdSn
-EPCkKvbdqcdhomvB
-DoDKjvbdVTmUFkvK
-EObkKvbdZisHogBf
-DoCjjvbdRbDdkiYk
-DnbkKvbdGGJrOJTq
-DncLKvbdeFPRavcK
-DnbjjvbdSPtHKGDw
-DoDLKvbdJmADyfuB
-EPCjjvbdKCibpicY
-DoDLKvbdiGicZVjV
-DoCkKvbdZLqdUNkm
-EPDKjvbdVUNUFkvK
-EPCjjvbdemFvflik
-EPCkKvbdkxrqrxft
-DnbkKvbdRbEElIxk
-EPCjjvbdaaVdfQQX
-DoDLKvbdySmhlqag
-EPCjjvbdrRuKnKaN
-DncLKvbdezuyEhtX
-DnbkKvbdtbbuWuoP
-DnbkKvbdZtIhxcrn
-EObkKvbdcyxoxZQb
-EOcKjvbdDxYLtTtM
-EObjjvbdjggMFfOL
-EPCkKvbdGckWJbKK
-DnbjjvbdddnqavcK
-EPDKjvbdYgWdAPTJ
-DnbjjvbdbhlikGXY
-DncKjvbdNPxRVmgT
-EObkKvbdRpUHKGDw
-EObkKvbdmfdwlmgZ
-DoDLKvbdBvzdJFPv
-DnbjjvbdZHXEAPSi
-EPDKjvbdbQHGdLzd
-EOcKjvbdCIjbLIej
-DnbjjvbdOXnuzdNt
-EObkKvbdrSUkNkBN
-DoDLKvbdNeDsiJLE
-EPCkKvbdiUyeXRtb
-EObkKvbdbsDKsdJa
-DncLKvbdbrcLTdJa
-DncLKvbdSPsgJecw
-EObjjvbdKNADzGta
-EPDLKvbdFWZPomKF
-EPCjjvbdRzKISbvA
-EOcKjvbdvmWAMcdm
-DncKjvbdwyhGGYEr
-EPDLKvbdfHjuqnRH
-EPCjjvbdRXOEDLhD
-EPCkKvbdyOSgwsJD
-DoDLKvbdnCKXYOmu
-DnbjjvbdjmCLyeGo
-DnbjjvbdTYKlNzjx
-DoCjjvbdZisHpGbG
-EObjjvbdUWMPisaR
-EObjjvbdqFcdtWAh
-EOcLKvbdYqNEhleR
-DnbjjvbdlZSrSyGt
-EPDLKvbdePEsLTsr
-DncKjvbdSBcdlJYk
-EPDKjvbdePEsLTsr
-EPDKjvbdypnmIjXA
-DnbjjvbdsQWPKCuf
-EOcKjvbdZRNEhldq
-EPCjjvbdYpmFImEq
-EPCkKvbdKfFhBaRV
-DncLKvbdezvZEhtX
-DncKjvbdiCObdvpq
-DnbjjvbdmJETqUrB
-EOcLKvbdfpBzvcxI
-DncKjvbdRbDdkhxk
-EPCkKvbdmpZyVkZC
-EPDLKvbdyNsIXrhc
-DnbkKvbdyYJJaoyk
-DncKjvbdwWlBVaWV
-DoDKjvbdqwPlCiYq
-DncLKvbdvvkaVaWV
-DncKjvbdcJMjKewY
-EObkKvbdbBWFFpPw
-EPCjjvbdpyOhGqEY
-EPDKjvbdCDpAujNG
-EPDLKvbdCSaCtFvr
-DoCjjvbdwygfFxEr
-EOcLKvbdLFehBaQu
-EPCjjvbdssSSxydc
-EPCjjvbdHfgZyYYH
-DnbkKvbdnBjWxOmu
-DnbkKvbdcJNJjewY
-EObjjvbdrzLoraIO
-EOcKjvbdADRwjZiQ
-EPCkKvbdOAJStJrA
-DncLKvbdajkennDA
-DoCjjvbdmbKWxPNu
-EObkKvbdmbKXYPOV
-DoCkKvbdKCjCpjDY
-EPCkKvbdIjEAJogE
-DoCkKvbdkHgLfGOL
-DoCkKvbdJcJbqKCx
-EPCkKvbdVUMtGMWK
-DoDKjvbdNxOuzcmt
-EPDLKvbdNQYRVnGs
-DnbkKvbdzjUoocrt
-DoDKjvbdDnbjjvcE
-DoCkKvbdGBPRZJzm
-DoCjjvbdtvNwjRTA
-EPDLKvbdZQldhleR
-DoDLKvbdUtMsfMWK
-DnbkKvbdDxYLtTsl
-DoCjjvbdmbJwYPOV
-DoCjjvbdaNLCTVMg
-DoCjjvbdWXIwvEFH
-DoDKjvbddZxoxYpb
-DncLKvbdijGHimXr
-EPDKjvbdZQmEiMdq
-DncKjvbdTulPisaR
-DncLKvbdnGdxMnGy
-EPCkKvbdlYsSSyHU
-DoDKjvbdKRZePFme
-DoCkKvbdZRNFJNEq
-DncLKvbdkMbMZeGo
-DoCkKvbdBiLBkIej
-EObjjvbdWXIwvEFH
-EOcLKvbdGGJqnJTq
-DoDLKvbdRWmcblID
-EObjjvbdxUleQxlO
-DnbkKvbdREDBPpdS
-DnbjjvbdiifHjMwr
-EObjjvbdZLqctOMN
-EPCjjvbdmRxtyrci
-DoDLKvbdDxXlTtUM
-DoDKjvbdxrmiNSBg
-DoDKjvbdTppntthN
-EObjjvbdnUtykKRf
-DoCkKvbdRNYBxmtz
-EOcLKvbdQYmAHTSK
-EPCjjvbdZtIhxcsO
-DoCjjvbdbsCjsdJa
-EPDKjvbdsZkoraIO
-DoDKjvbdEJhJvYKA
-EOcLKvbdJSxaTMwl
-DoDLKvbdANHxrvzY
-EObkKvbdcTDKtDia
-EPDKjvbdrWolDJZR
-DoDKjvbdsQVnicVf
-EPCjjvbdYSlAlsoY
-EPCkKvbdJYUBhMRQ
-DncLKvbdtlXwBUBX
-EObjjvbdVrOYBeMD
-EPCjjvbdcJNJkGWx
-DncLKvbdjKGHjNXr
-DncKjvbdRMwayOUz
-EObjjvbdzdzOzdyp
-DnbjjvbdNHColpVL
-DoDLKvbdNddThiLE
-EPDKjvbdFjdsCgmV
-DnbjjvbdTJZjRABM
-DncKjvbdOTTugFVQ
-DncLKvbdVYgszLPO
-DncKjvbdEARhlzWw
-EPDLKvbdUGzmkvvF
-DoDLKvbdmRyVZsEJ
-EObjjvbdptUHRqjt
-EOcKjvbdJpzFOeme
-DnbkKvbdMgDPmPtk
-EOcKjvbdhzUfMRNf
-DoDLKvbdpyPHgQdY
-DoCjjvbdZjShQHCG
-EOcKjvbdOTTvGeVQ
-EPCjjvbdRacdkiZL
-DnbjjvbdzitoodTU
-EOcKjvbdxxIjCPyk
-EObjjvbdunszqLPU
-EObjjvbdwjwDgzzG
-DnbkKvbdUyHtZkOn
-DnbjjvbdqvpMChyR
-DnbjjvbdmIctRUrB
-EObkKvbdNHCpMpUk
-DoDKjvbdeFPSCXCj
-EOcKjvbdtvOXjRTA
-DncLKvbdZGvdAPSi
-DoCjjvbdQcbaPpcr
-DoDLKvbdVUMselVj
-DnbjjvbdVgxWXgYz
-DoDLKvbdjAQHBQHK
-EOcKjvbdxxJKCPyk
-DnbkKvbdQdDApQcr
-DnbjjvbdqrUjmjaN
-EOcKjvbdJzofYEAN
-DoDLKvbdJvVGEFHJ
-EObkKvbdJcJbpjDY
-EPDLKvbdhanbdwRR
-EObkKvbdiZtfLqOG
-DoCjjvbdeOdsLTsr
-DoCjjvbdSLZFuGjs
-DoCjjvbdqTsfrRjt
-EObjjvbdACqxKZhp
-EPCjjvbdxZhFexEr
-EPDKjvbdiBoCeXRR
-DoDKjvbdqFcdtVaI
-DnbkKvbdkClLQgVH
-DnbkKvbdZQmEhldq
-DnbjjvbdQYmAGrqj
-DnbjjvbdiLddNuDZ
-DoDLKvbdsQWOjDWG
-EPDKjvbdVqnXaeLc
-DnbjjvbdwNWANEFN
-EPCkKvbdsBfNMHKy
-EOcLKvbdKQzFOfOF
-DoDKjvbdHELVibJj
-EPDKjvbdcImJkFwY
-DncKjvbdIwtBgkqQ
-EObkKvbdANHySvyx
-DoDLKvbdpxnhGqEY
-EPCjjvbdrafNMHKy
-DoDLKvbdSQTfiecw
-DnbkKvbdiMEdOUcZ
-EObjjvbdQmYCYnUz
-EPDLKvbdWIYWXfxz
-EPCjjvbdNeEThiLE
-EObjjvbdHDkWJaij
-DncKjvbdMgDQNPuL
-DncKjvbdKWUedFGi
-EPDLKvbdJYUCIMRQ
-EOcLKvbdRacdkhyL
-EPCkKvbdSBdEkhyL
-EPCkKvbdMRwMzUpz
-EPDLKvbdkxrqsYft
-EObkKvbdRkYetgLT
-EPCkKvbdNrsvHFVQ
-DoCjjvbdqiAKFNOe
-DoDKjvbddwystRez
-EOcKjvbdrylQTBHn
-EPDKjvbdDjHjWXjA
-EObjjvbdCIkCLJGK
-DnbjjvbdqwPlDJYq
-EPCjjvbdnVUzLKRf
-EOcLKvbdUxhUZjnn
-DnbjjvbdRpUHJecw
-DnbjjvbdjhGlFfNk
-EObkKvbdJKEAKPgE
-DoDLKvbdIidAKPgE
-DncKjvbdCSaCtGXS
-DoCjjvbdIidAKQHE
-DnbkKvbdFjdsCgmV
-DoCkKvbdGKeTCglu
-EOcKjvbdEzspeMDJ
-EOcLKvbdqUTgSSKt
-DoCkKvbdnBivwnmu
-DncLKvbdJcJcRKCx
-EPCjjvbdVwJXucdg
-DnbjjvbdKVuGEFHJ
-DncLKvbdnVUzKjSG
-DoCkKvbdqGDeTuaI
-DnbkKvbdLFfICBQu
-DnbkKvbdZjTIQGbG
-DoDLKvbddBrlrATm
-DncKjvbdYNqAXtut
-DnbjjvbdURROtuHm
-EObjjvbdxmrgxSiD
-DoCkKvbdjJfHjMwr
-DncLKvbdNwoVzdOU
-EPDLKvbdyTNhlqbH
-EObkKvbdiMEcnUby
-DoDKjvbdJcKCqJbx
-EPDLKvbdNrtVgEtp
-DncKjvbdjEkGtoAO
-DoDKjvbdNVSrKmAX
-EOcLKvbdxmsIYTIc
-EObkKvbdcTDKtDjB
-EPDLKvbdxsOIlrCH
-DnbkKvbdbrbjsdKB
-DoCjjvbdpfEEtWAh
-DoCkKvbdMowqVmfs
-EPCkKvbdeATqMxJf
-EObkKvbdjJehJmYS
-EPDKjvbdxmrhYSiD
-EObjjvbdjbkkQgUg
-DoCjjvbdYlRdUNlN
-DoDLKvbdiHKDZWJu
-DoDKjvbdpedEsvAh
-DoCkKvbdEuyPomJe
-EPCkKvbdhtyeWrVC
-DncLKvbdbAvEfQQX
-DnbjjvbdTkvPBWPJ
-DncKjvbdYlRdUOLm
-DncLKvbdCIjajiGK
-EPDKjvbdUtNTfLuj
-DnbkKvbdKVuFdEgJ
-DoDKjvbdfVzwoizs
-EPCjjvbdySmiMrBg
-EPCkKvbdrpWPJcVf
-DoDKjvbdcImJjewY
-DoCkKvbdkVvnECYX
-DncKjvbdWRnYCEkc
-DoDKjvbdCIkBjhfK
-EObkKvbdmIdURVSB
-DoCkKvbdTppoUuHm
-EPDLKvbdUQqOtuHm
-DnbkKvbdhgKDYvJu
-DnbkKvbdkHgLfFmk
-EPDLKvbdCDoaVjMf
-EPCkKvbdehKvSNqH
-DncKjvbdNeEUJJLE
-DncKjvbdlhdTqVSB
-EOcKjvbdEuxpPmJe
-DncLKvbdqceIpNua
-DnbjjvbdnVVZjjRf
-DnbkKvbdKDJcRJbx
-EObkKvbdnHEwlmgZ
-EOcLKvbdFWZQQMjF
-DoDKjvbdKWUedEgJ
-DoDLKvbdmozZVkZC
-DoCkKvbdZdxGzhJC
-EObkKvbdGQATWffZ
-EPCkKvbdJuuGDeHJ
-DoCkKvbdiGibxvJu
-DnbkKvbdBraDUGXS
-EPDLKvbdiHKDYvKV
-DnbjjvbdZxcjODMS
-DnbkKvbdnGdwlmgZ
-DoDKjvbdkxsRrxgU
-EOcKjvbdrzMQTAgn
-DncLKvbdjhHLfGOL
-DnbjjvbdQvnEClID
-DoDKjvbdqdEhomvB
-DoDLKvbdGdKvKCJj
-DnbjjvbdqvpLbiYq
-EObjjvbdsPvOjCuf
-DoDLKvbdVqnXbElD
-EPDLKvbdeEoRbXCj
-DoCkKvbdyYJKBoyk
-DoDLKvbdlhdURUqa
-EPDLKvbdYkqdTnMN
-DoCkKvbdnGdwmNgZ
-EObkKvbdGGKSOIsq
-EObjjvbdLLAgvAJy
-DnbjjvbdajlFnmcA
-DoDLKvbdiifHimYS
-EPCjjvbdnPzYukYb
-EPDLKvbdVYhTyjnn
-EOcLKvbdfNFwHNJk
-DoCjjvbdbrbkTcia
-DncLKvbdRkZGVHLT
-EObkKvbdSQUHKFdX
-EOcKjvbdSKxeuHKs
-DncKjvbdFxuUaDwb
-DoCkKvbdaSGDHtFk
-EPDKjvbdZyDimcLr
-EObjjvbdiGibxvJu
-EPCkKvbdDwwktTsl
-EPDKjvbdRadEkiZL
-EPDKjvbdmgEwlmfy
-DncLKvbdaogHDkzd
-EOcLKvbdjuvmdCXw
-EPDKjvbdqwPlCiYq
-DoDKjvbdLBLHNBxR
-EObjjvbdeFOrBvbj
-EPDKjvbdFyVVAdYC
-EPDLKvbdKNADygUa
-DncKjvbdbVCGxLUI
-DoCkKvbdJSyArmXl
-EObkKvbdQvnDbkgc
-EObjjvbdrEEiQOWB
-EOcKjvbdZMSDtOLm
-DoDKjvbdQvmccLhD
-EPCkKvbdrzMQTBHn
-EPDKjvbdMgCpNQUk
-DoDKjvbdmbJwYPOV
-EOcKjvbdgGLymgHA
-EObjjvbdsrqsYzFD
-EPDLKvbdrNZiyLgi
-DnbkKvbdiiegimYS
-DoDKjvbdqwQLcJYq
-EObkKvbdaNLCSuNH
-EPCkKvbdnUuZkJqf
-EPCjjvbdSCEEkiZL
-DncLKvbdVZHszKnn
-DnbjjvbdUtMsfLuj
-DoDKjvbdxmrgwriD
-DoCkKvbdxxJKBpZk
-EObkKvbdZMRdUNlN
-EObkKvbdbPgHDkzd
-EObkKvbdqqtjnLAm
-EPDKjvbdURROuUhN
-DoDKjvbdCWzdJFPv
-DoDLKvbdMSXMytpz
-DnbjjvbdqlyjZMHi
-DoDKjvbdbsDLUDia
-EOcLKvbduVnXiqTA
-DoCjjvbdDxYLsssl
-DoDLKvbdyqPMiJwA
-EObkKvbdeOdsLUUS
-EOcKjvbdEuyQQMjF
-DoDKjvbdEztQeMDJ
-EPCkKvbdGZVVBDxC
-DnbkKvbdnGdxNNgZ
-DoCkKvbdcIljLFvx
-DoCjjvbdYqMdhmEq
-EPDLKvbdgKfzbfAE
-EPCjjvbdJcKDRJcY
-EOcKjvbdOFDtJJLE
-DncKjvbdiLdcmuDZ
-EObkKvbdrWpLcJZR
-DnbkKvbdVAaqTQrZ
-DnbjjvbdFkFTChMu
-DncKjvbdaaWEepQX
-EPCkKvbdpedEsvAh
-DncKjvbdjAQGaPfj
-DoDKjvbdbUbHXkTh
-DoDKjvbdRjyFtfkT
-EOcLKvbdOTTvHEtp
-DoCjjvbdRkYfVGjs
-DncLKvbdzoQRFCkx
-DncKjvbdrMzJyMHi
-EOcKjvbdULvPBWOi
-EOcLKvbdzdynzdzQ
-EPCjjvbdtumxJpsA
-DoDLKvbdwMvAMcdm
-EOcLKvbdqceIonVa
-EObjjvbdOEdUIiKd
-EObjjvbdHELVjBij
-EObjjvbdqcdiPmvB
-DoCjjvbdJvVFdFGi
-EPDKjvbdWRmwaeLc
-EPDKjvbdZxdJnDMS
-DoDKjvbdZxdJnDMS
-EObjjvbdxUldpxkn
-DnbkKvbdSLYetfjs
-EPDLKvbdYqMeIldq
-DoCjjvbdrMyjYlIJ
-EObkKvbddxZtTqez
-EPCkKvbdWSNxCElD
-DoDKjvbdWWiYVcdg
-DoDLKvbdqGDdsvAh
-EOcLKvbdhzVFlRNf
-EOcKjvbdaNLCSuNH
-DnbkKvbdkHgMFfNk
-DnbkKvbddePRbXDK
-DncKjvbdNVTSKmAX
-EObkKvbdhzUfLpmf
-EOcKjvbdZMSDtNkm
-EPDKjvbdTqROtuHm
-DoCkKvbdddnqbXCj
-DoDKjvbdliEURVSB
-DncKjvbdtvNxKQsA
-DnbjjvbdqceJQOVa
-EPDKjvbdpyOggQcx
-EOcKjvbdtcDUvuoP
-EObjjvbdrWpMChxq
-EPDKjvbdGYttaEYC
-EObjjvbdiifIKNYS
-DoCjjvbdZyEJmcMS
-EPDLKvbdKQzFOfNe
-DoCkKvbdqYoIGpdY
-EPDLKvbdxwhibPzL
-EPDKjvbdRadElJYk
-DoDLKvbdtkwwAtAw
-EPCjjvbdDjHjVxKA
-EPDKjvbdrzLosBIO
-EPCkKvbdBdPaVimG
-DoCjjvbdrafMkfjy
-EPDKjvbdNGcPmQVL
-DoDLKvbdVviYVdFH
-EPCjjvbdkVwODaxX
-DncKjvbdkMbMZeGo
-EOcLKvbdfkGzbfAE
-DnbkKvbdpyOhHQdY
-DoDKjvbdQdCaPqES
-EObjjvbdEKHiuxKA
-DnbjjvbdpxnhGpcx
-DnbkKvbdkxsSSxgU
-DnbjjvbdURQnuUgm
-DoDLKvbdTukpJtBR
-EPCkKvbdqAiFAWgd
-DnbjjvbdgGLymfgA
-EOcLKvbdyYIibQZk
-DoDLKvbdWHxVxGxz
-EPDLKvbdFyVVAdXb
-DnbkKvbdrRuKnKaN
-DoDLKvbdTpqOttgm
-EPDKjvbdLhbLqYAS
-DoCjjvbdHELVjCKK
-DncLKvbdfSBWzlDP
-DoCkKvbdRDcBPpdS
-DoDLKvbdsQWPJcVf
-EPCkKvbdySmiMrCH
-EPCkKvbdbUbHXjtI
-DoDLKvbdUtMsfLuj
-EPCjjvbdEvZQPmKF
-EObjjvbddeOqbXDK
-EPDKjvbdkClKqGtg
-DncKjvbdqiAJdmPF
-EOcLKvbdlrZUyrci
-EOcKjvbdbBVeFpPw
-EOcLKvbdULvPBWOi
-EPCkKvbdcJMjLFwY
-DnbjjvbdZtIhxcsO
-EPDLKvbdSPtHJfDw
-EObkKvbdaNLBsUlg
-DoDLKvbdqvpLcIxq
-DoCkKvbdpxoIHQcx
-EPCkKvbdlZTRsZGt
-DoCjjvbderBWzkcP
-EPDLKvbdZtJIxdSn
-EOcLKvbdmoyyWKxb
-DoDLKvbduaDxroEh
-EPDLKvbddoErkTtS
-DncKjvbdnPzYvKxb
-EObjjvbdsZlPsAhO
-EPDLKvbdjJfHjMxS
-EOcLKvbdbsDLUDia
-DncLKvbdMuTSLNAX
-EPDLKvbdemGWfmKL
-EObkKvbdKefHbBQu
-EOcLKvbduVnXjRTA
-DnbjjvbdGZVUaEYC
-EOcKjvbdkNCMZeGo
-EPCkKvbdGKeSbgmV
-DoDKjvbdqrVLNjaN
-DnbjjvbdEASIlzWw
-DnbjjvbdeOdrkUUS
-DncKjvbdDjIJvXjA
-DoCjjvbdqGEFUWAh
-EPCjjvbdQcbaQRES
-DnbkKvbdhtydwSUb
-DoCkKvbdMuTRjmAX
-DnbjjvbdJutfEEfi
-EPCjjvbdzGxlAMeX
-DncLKvbdIHGyyYYH
-DoDLKvbdxUmEqZLn
-DnbkKvbdNHCpMotk
-DnbjjvbdFyVVAcwb
-EPCjjvbdShzJqABM
-DnbjjvbdcyxoxZRC
-EPCjjvbdqquKnLBN
-DncLKvbdcIlikFwY
-DoCkKvbdeOeSkTsr
-EOcLKvbdYpldhldq
-EPDLKvbdQYmAGsRj
-DoCkKvbdzGyMAMeX
-EPCkKvbdqrVKnLBN
-EObkKvbdxUldpxlO
-EPCjjvbdfIKuqnRH
-EPDKjvbdFWYpQMjF
-EPDLKvbdOFEUJJKd
-EOcLKvbdHEKvKBij
-DoDKjvbdjcMLRHUg
-EPCkKvbdWXIwudEg
-DncLKvbdgPazvcwh
-DnbjjvbdnVUykJrG
-EPCjjvbdxxJJbPyk
-DncLKvbdjJehKMxS
-DncKjvbdEzspdkbi
-EPDKjvbdrpVnjDWG
-DnbjjvbdVrOYCFLc
-DoDLKvbdMfbpMotk
-DncKjvbdbhljLGWx
-DncKjvbdxrmhlrBg
-EOcKjvbdbKlGPODA
-DoDKjvbdJvUfEFHJ
-EPCkKvbdySnIlqag
-EPDKjvbdVAbQrpqy
-DnbjjvbdrykosAhO
-DnbkKvbdKfFhCBQu
-DnbjjvbdEXwktTsl
-DoDKjvbdDoDLLXCd
-EObkKvbdvwMAvAvV
-EObkKvbdXsLaNUOx
-DnbkKvbdRDcBQRES
-EOcLKvbdZisIPgCG
-DoDKjvbdpfEEtWBI
-DoDKjvbdfoazwDwh
-EPCkKvbdFpASvffZ
-EObjjvbdRWnDblHc
-DoCkKvbdNxOuzdOU
-DncLKvbdYlSDtOLm
-EPCjjvbdjbkjqHVH
-EPCkKvbdrMzJxkgi
-EPDKjvbdCIkBjhfK
-EPCkKvbdUslsekvK
-EOcKjvbdFejRnJUR
-EPDLKvbdNHColotk
-EPCjjvbdUxgtZjnn
-DoDKjvbdEOcLLXCd
-EPCkKvbdkHflGFnL
-EPCjjvbdwygfFxEr
-DncKjvbdeOdrjtTr
-DoDLKvbdqTtHRqjt
-EPDLKvbdQwNdCkgc
-EPCkKvbdhzVGLpnG
-DoDKjvbdxwiKCPzL
-EPCkKvbdZirhQGbG
-DoCjjvbdqrUkOKaN
-DoDLKvbdlrZUysEJ
-DoCjjvbdqFdFUWAh
-DnbjjvbdyYJKCPzL
-DncKjvbdxUldpyMO
-EPCjjvbdvAcyTOeI
-EObjjvbdLFegaaRV
-DncKjvbdemFvgNKL
-EOcLKvbdjcLjqHVH
-DoDKjvbdRMxCYnUz
-EPDLKvbdRjxfUfkT
-DoDLKvbdiMEdNuDZ
-DoDLKvbdZRMdhmEq
-DoDLKvbdqlyiyLgi
-EObjjvbdiiehJmYS
-DoCjjvbdwuMeRYlO
-EPDKjvbdqquKmkAm
-EOcKjvbdlrYtysDi
-EPDLKvbdliETqUrB
-EObjjvbdePErkTsr
-DoDLKvbdfHjvRnQg
-EObjjvbdRXOECkgc
-EObkKvbdMpXqWOGs
-DncKjvbdEJhJvYKA
-DoCkKvbdVrOYBeMD
-EPDKjvbdTkvPBWOi
-EOcLKvbdjuvmcbYX
-DncKjvbdMfcQMouL
-EOcLKvbdMpXpvOHT
-DoCjjvbdiLdcmtcZ
-DnbkKvbdiHJcZWJu
-EPDLKvbdTqQnuUgm
-DncKjvbdLGFgbBQu
-EPDKjvbdNdctIiLE
-EPDKjvbdZxdKODLr
-DoDKjvbdSZjITCvA
-EPCjjvbdDwxMUTsl
-EPCkKvbdySmhmRag
-EOcLKvbdSPtHKGDw
-DoDKjvbdmIctRUqa
-DoDKjvbdaRfChTek
-DncLKvbdyNrhXsIc
-DncLKvbdJTZBSlxM
-DoDKjvbdFeirOIsq
-DnbjjvbdJutedFHJ
-DnbkKvbdUsltGMWK
-DnbkKvbdbhljLGWx
-EPCjjvbdirziTLJz
-EOcKjvbdnPzYvKyC
-DoDKjvbdkDMLRGtg
-DncLKvbdyzeNqhIh
-EPCjjvbdYTMAmUPY
-DoCkKvbdgGMZnHHA
-DncLKvbdlZSqsYft
-EOcLKvbdZjShQHCG
-DnbjjvbdjhGlGGNk
-DoDLKvbdkxsRryGt
-DoCjjvbdZyDjNbkr
-DnbkKvbdNeEUJIjd
-EOcKjvbdxxJJbPyk
-DoDLKvbdRbDeMIxk
-EObjjvbdrDeJPnWB
-EPCkKvbdrXPkbiYq
-EPCjjvbdeFPRbWbj
-DncLKvbdHffyxxYH
-EPDKjvbdcyyQYZQb
-DoCkKvbdNsTvGeUp
-EPCkKvbdfpBzwDxI
-EPCjjvbdqTtHRrLU
-EPCkKvbdhgJbxvJu
-EOcKjvbdkxsRryGt
-EPCkKvbdZshhyETO
-DnbkKvbdrWpLbiZR
-EObkKvbdnHExMmfy
-DnbkKvbdbUbGwkTh
-DnbkKvbdnHExMnHZ
-EObjjvbdZnmiFEyj
-EObkKvbdSQUGjGDw
-EPCkKvbdqTtGrRkU
-EObjjvbdcImKLGXY
-EObkKvbdShzJqAAl
-DncLKvbdGGJqnIsq
-DnbkKvbdehKuqmpg
-DncLKvbddeOrCXDK
-EOcLKvbdRMwbYmtz
-DnbjjvbdgFlZmgHA
-DnbkKvbdyOSgxTJD
-EOcLKvbdQZNAGsSK
-DoCkKvbdRMwayNtz
-DncLKvbdezvYeItX
-EOcLKvbdVAapsQrZ
-DoCjjvbdcImKLFwY
-DoDKjvbdTqQnttgm
-DnbjjvbdOEdUJIkE
-DoDKjvbdeYZssqez
-DnbjjvbdZjSgpHCG
-DoCkKvbdTvMPisaR
-EOcKjvbdZjSgofaf
-EPDLKvbdfVzwoizs
-DnbjjvbdCSaCsewS
-EPDLKvbdFVyPpMjF
-EObkKvbddjJrVtzn
-DnbjjvbdyOSgxTIc
-EOcLKvbdrovPKDVf
-DnbjjvbdxZhGGXeS
-DncLKvbdbLLeoNcA
-EOcKjvbdMfbomQUk
-EPDLKvbdaRebhTfL
-DoDLKvbdoAKztHcn
-EOcLKvbdGckWJbJj
-DncLKvbdqmZjYlHi
-DncKjvbdZyDinDLr
-DoCkKvbdxwhibPzL
-DnbkKvbdZoOJFFZj
-EPDLKvbdYpmEiMdq
-DoCkKvbdiUzFWquC
-DnbjjvbdsPvPJcVf
-DncKjvbdDwxMTssl
-EObkKvbdZQleJNEq
-DoDLKvbdWSNxBdkc
-DoCjjvbdcSbkTcia
-EOcKjvbdqvolChyR
-DnbjjvbdqlzJxlHi
-DoCjjvbdlrZUzTEJ
-EPCkKvbdGdLWJbJj
-EObkKvbdzoPqFDLx
-DncLKvbdANIYrwZx
-EObjjvbdSPsgJfEX
-DoCjjvbdbiNJjfWx
-DnbkKvbdMfbpNQVL
-EObkKvbddePRbXCj
-EPDKjvbdShzKRAAl
-DoDKjvbdnPyxukYb
-EObjjvbdVZITzKoO
-EPDLKvbdZyDinDMS
-EPCjjvbdYpldhmFR
-DoCkKvbdZjTIPfaf
-EObjjvbdqdEiPmua
-DnbkKvbdRadEkhxk
-EPDLKvbdzjVPpDrt
-DnbkKvbdaMkBsUlg
-DncLKvbdMpXpunGs
-DoDKjvbdUxgszLPO
-EPCkKvbdiiegilxS
-DoCjjvbdEOcKkWbd
-EOcLKvbdcTDLUEJa
-EPDLKvbdZtIiYcrn
-DoDLKvbdmttyjirG
-EPDLKvbdGdLVjBjK
-DncLKvbdDigjVxKA
-EPCkKvbdelfWflik
-DoDKjvbdOTUVfdtp
-DncKjvbdTlWOaVni
-EPDKjvbdrpWOibvG
-EPDKjvbdfRaWzlCo
-DncKjvbdlrYuZrdJ
-DoDKjvbdIsZBSlwl
-EPDLKvbdqquLOKaN
-DnbjjvbdJmAEZgUa
-EPCkKvbdcImJkFvx
-DncLKvbdkxrqsYft
-EPCkKvbdUWLojTaR
-DoDKjvbdnGeXlmfy
-DoCkKvbdiMFDmuCy
-EPDKjvbdauCHXjtI
-DoCjjvbdBsAcUGXS
-DoDKjvbdACrYJyhp
-DoDKjvbdsZlPsBHn
-DoDLKvbdjJegimXr
-DoDKjvbdWXIwvDdg
-DncKjvbdelewHNJk
-EObkKvbdyTOJMrCH
-DoCkKvbdNddUIiKd
-DoCkKvbdRyjHrbvA
-DoCjjvbdiGjCyWKV
-DoDLKvbdhlFEOVDZ
-EPCkKvbdQdDAoqDr
-DoDKjvbdBiLBjhej
-EOcKjvbdqlyjZLgi
-DncLKvbdtSrTYzFD
-DoCkKvbdrMyjYlHi
-EObjjvbdhficYuiu
-DoDKjvbdfekymgHA
-EOcLKvbdiifHjNXr
-EObjjvbdIwsaglQp
-DoCjjvbdCIkBkIfK
-EPDKjvbdaSFcHsfL
-DoDLKvbdMgDPlpUk
-EPDKjvbdqYnggQdY
-DoDKjvbdaSFbgsek
-DoCjjvbdiZtekqNf
-EPDLKvbdkClKpftg
-DoCkKvbduMYWaUAw
-EObkKvbdtTSTYydc
-DnbjjvbdptUGqrKt
-EObjjvbdYlRctNlN
-DncKjvbdMgDQNPtk
-DncLKvbdILaznXQk
-DoDLKvbdiCPDFWpq
-DoCkKvbdiGicZWKV
-DncKjvbdFjdrbglu
-DncLKvbdKWUfDeGi
-DoCjjvbdVhXuwgYz
-DoDKjvbdhtzFWquC
-EPCjjvbdRpTfiedX
-DoCkKvbdKVuFdEfi
-DoDLKvbdbBWEfPow
-DoCkKvbdZyDjODLr
-DncLKvbdeAUQmXif
-DoCkKvbdIidAKQHE
-EPCkKvbdTqROuVIN
-DncKjvbdRXODcMID
-DoDKjvbdkyTRsZHU
-EPCjjvbdxnTIXrhc
-EObjjvbdJzofXdAN
-EOcKjvbdiBncFWpq
-EObkKvbdYORAXuVt
-DnbjjvbdiMEdNtby
-EPDKjvbdVrOXbFMD
-EPCkKvbdAMgxrwZx
-DoCkKvbdtbbuXVoP
-EPCjjvbdDoCkKwCd
-DncLKvbdVBBpsRRy
-DoDKjvbdemGWgMik
-EObkKvbdeEnqbXDK
-EPCjjvbdhanbdvqR
-DnbkKvbdmaiwYOnV
-DoCjjvbdcJMjLGXY
-DnbkKvbdIryArlxM
-EPCjjvbdtkwvaUAw
-DnbkKvbdxZgefYFS
-EPCkKvbderBWzlDP
-EPCjjvbdNxPVzdOU
-EPDKjvbdaSGDHsek
-EOcKjvbdqcdhpOVa
-EPCkKvbdxmsHxShc
-DoDKjvbdDncKjwDE
-DoCjjvbdYpmEhmFR
-DncKjvbdaRfCgsfL
-EObjjvbdegjurNpg
-DnbkKvbdjhHMFenL
-EPCjjvbdMfcPmQUk
-EOcLKvbdACrYKZhp
-DoDKjvbdffMZmgHA
-DoCjjvbdaaVeGQQX
-EOcKjvbdSCDdkiZL
-EOcKjvbdqwPlCiYq
-DoDKjvbdajlGPODA
-DncLKvbdJYTbHkpp
-DncLKvbdtcDVXWOo
-EPCjjvbdEXxLtTsl
-EPCjjvbdJuteceGi
-DnbjjvbdDoCkLWbd
-DoCkKvbduCbtwWOo
-EPDLKvbdauBgYLTh
-EPCjjvbdOXoVzcmt
-DoCkKvbdRMxByOUz
-DoCjjvbdqYoIGqDx
-EPCjjvbdNGbpMpVL
-DoCjjvbdJpzFOfNe
-EOcKjvbdVAapsQrZ
-DncKjvbdpxoIHQcx
-EOcKjvbdRaceLiZL
-DncLKvbdtcCuWvOo
-EObjjvbdbBVeGPow
-DnbjjvbdKyRKSzuG
-EOcLKvbdFyVUaEYC
-EPDKjvbdkCkkRHUg
-EObkKvbdKaKfmBxR
-DoDLKvbdbUbGwjsh
-DnbjjvbdrovOjDVf
-EPCjjvbdZsiIyDsO
-EObjjvbdRDbaPqDr
-EOcKjvbdnBivwnmu
-EPCjjvbdYTMBMsoY
-DoDLKvbdxKwEHzzG
-EPCkKvbdqTsgRqkU
-EPDKjvbdfMfWgNKL
-DnbkKvbdznpREbkx
-DncKjvbdJXtCHlRQ
-EPDLKvbdGYuVBEXb
-EPDKjvbdZLrEUOMN
-EPDKjvbdtcCtvuoP
-EObjjvbdXsLaNUPY
-EPDLKvbdyOTIYSiD
-EObjjvbdsrrTYyeD
-EObjjvbdZisHpGaf
-DoDLKvbdvOszqLOt
-DncLKvbdaMjbSuNH
-DncLKvbdYTMBMsoY
-EPDKjvbdwzIGFxFS
-EPDLKvbdmRyUyrci
-DncLKvbdTkvPBWOi
-EPCjjvbdNdcsiIjd
-EPCkKvbdEzspdkbi
-EObkKvbdrovOicVf
-DoDKjvbdhbObeXQq
-DncKjvbdZnnIeFZj
-EObkKvbdRECaPpdS
-EOcKjvbdnGeXlnHZ
-EPCjjvbdauCGwjsh
-EPCjjvbdczYpXyRC
-EOcLKvbdDihJuxKA
-EOcKjvbdkVwNcbXw
-EObjjvbdbsCkTcia
-DoCkKvbdfMewHNKL
-DoCjjvbdxZgeexEr
-EOcLKvbdiBoDEwQq
-DnbkKvbdpstHSSKt
-EOcKjvbdQvmdClHc
-EPDKjvbdIxUBhLqQ
-EObkKvbdZtJIyESn
-EPCjjvbdtumwjQsA
-DoCjjvbdNPxQunHT
-EOcLKvbddndrkUTr
-EObjjvbdCTBCsevr
-EOcKjvbdiUzEwRuC
-EPDKjvbdRyigrbvA
-DoCjjvbdezvYeJTw
-EOcLKvbdVgxVxGxz
-DnbjjvbdZeXfzhIb
-DncKjvbdxZgfFweS
-DoCkKvbdKxqKSztf
-DncLKvbdpyOggREY
-EPDLKvbdXrlBNUOx
-EPCkKvbdqwPkbiZR
-EPDLKvbdbsCjscia
-DoDKjvbdnGeYMmgZ
-EOcLKvbdUsmTfLvK
-DnbkKvbdjuwOEBxX
-DnbjjvbdTAFJICPE
-DncKjvbdEuxoomKF
-EPDKjvbdeOdsLTsr
-EObkKvbdZshiYdSn
-DncKjvbdcTDKscjB
-DncLKvbdvwMBWAvV
-EOcKjvbdVwIwudFH
-EPDLKvbdlZTSSxgU
-EOcKjvbdMgColotk
-EOcLKvbdZdxGzgiC
-DnbjjvbdULuoBWOi
-EObjjvbdiCObeXQq
-EPDKjvbdNUsRkNAX
-DoCjjvbdZxcjOClS
-DncLKvbdiUzEwSVC
-DoDLKvbdvlvAMceN
-DoDLKvbdqcdhpOWB
-EObkKvbdCSaDUGWr
-DoCkKvbdssSTYydc
-DoCkKvbdnGdxMmgZ
-DoCkKvbdHELWJbKK
-DoDKjvbdKefHbApu
-EObkKvbdVqmwbFLc
-DoCkKvbdUtNTekuj
-EPDLKvbdTlWOaVni
-DoCjjvbdDxXkstUM
-EPCkKvbdpxoHfqEY
-EPDKjvbdmSYtzTEJ
-DoCjjvbdddnrCXDK
-EPCkKvbdZjTHpGbG
-DncLKvbdhzVGLqOG
-EPCjjvbdZjSgogBf
-EPDLKvbdkDLjqGuH
-DncLKvbdxUmFRZLn
-EPDLKvbdjhHMFfNk
-EPCkKvbdZjTHpHBf
-EObkKvbdegkVqnQg
-EPDLKvbdGYttaEXb
-EObjjvbdZdwfzhJC
-DoCkKvbdGQASwHFy
-EPDKjvbdkVvnDbXw
-EObkKvbdJYTagkqQ
-DoCjjvbdMSWlzVQz
-DoCjjvbdnGeYMmfy
-DoDLKvbdADRxKZiQ
-EObkKvbdZLqdTmkm
-EPCkKvbdFeirOItR
-EPCkKvbdRjyGVGjs
-DncLKvbdiMFDnUcZ
-EObkKvbdVAaqSpqy
-EPCkKvbdULunaVni
-DnbkKvbdcImKKevx
-DoCjjvbduaDyTPFI
-EPDKjvbdKQydoFnF
-EPCjjvbdozmcjwoA
-DoDLKvbdZLqdUNlN
-DoDKjvbdJXsbHkpp
-DoCkKvbdelfXHNJk
-EObjjvbdeFOqavcK
-EPDLKvbdqlyjZMIJ
-DoCjjvbdUtMsekvK
-DoCkKvbdIxUBhMQp
-EOcKjvbdemGWgMjL
-DoCkKvbdwuMeQyLn
-DncKjvbdkClKpgVH
-DoDKjvbdfNFvflik
-DncKjvbdhkdcmuCy
-DoDLKvbdCJKakIfK
-DnbkKvbdSQTgJfEX
-DnbkKvbdkIGlGFmk
-DoDKjvbdySmhlqbH
-DoCjjvbdGdLVibJj
-EPCjjvbdSLZGUfkT
-EPDLKvbdSKxfVHKs
-DoDKjvbdGLFSbhMu
-DoCkKvbdqFcdtWAh
-EOcLKvbdbVBfxLUI
-DoDKjvbdcScKsdKB
-DnbkKvbdVwJYWEFH
-EPCjjvbdGQASwHFy
-DnbjjvbdqUTfrRjt
-EPDLKvbdEYYMTtUM
-DoDLKvbdfNFwHNKL
-EObkKvbdsQWPJbvG
-EOcKjvbdIsYaSmYM
-EPDKjvbdBdQAuilf
-DnbkKvbdrounibvG
-EObkKvbdiCPCdvqR
-EOcLKvbdBsAbsfXS
-DoCjjvbduDDVWuoP
-EPCkKvbdbsCjtEJa
-EOcKjvbdcTDLTdKB
-DoCjjvbdXGYytAPT
-DnbjjvbdePFTLTsr
-EObkKvbddoErjssr
-EPCkKvbdcTDKsdJa
-EPDKjvbdjgflGFnL
-EObjjvbddeOqbWcK
-EObkKvbdACqwizJQ
-EObjjvbdHgGyyXxH
-DoCjjvbdqlzKZMHi
-DnbjjvbdhfibxvJu
-DoDKjvbdSCEFLiZL
-EPCjjvbdSCEFLiYk
-EObkKvbdiLdcmuDZ
-EObkKvbdzGyMAMeX
-EPDKjvbdVYhTzKoO
-EPCkKvbdxrmiNRag
-DoDLKvbdjKGHilxS
-EOcKjvbdhWyAzzAJ
-EPDLKvbdMfcQNQVL
-DncKjvbdYkqdTmlN
-DoDLKvbdjJfIJlwr
-EOcLKvbdZeYGzghb
-DncLKvbdJuuFceGi
-EPCkKvbdhzUelRNf
-DnbkKvbdBhkCKhej
-DoDLKvbdhbObeXRR
-DnbkKvbdzHZMAMdw
-DoDKjvbdZxcjNblS
-DoCjjvbdDwwksstM
-DoCkKvbdUVkpJtAq
-DoDLKvbdaaWEepPw
-DncLKvbdGdKvJbKK
-DoDLKvbdTulQJtBR
-DoDKjvbdqceJPnVa
-DnbkKvbdvAdZTOeI
-EOcKjvbdVAbRSqRy
-EPCkKvbdTqQnuVHm
-DoCjjvbdwNWANDeN
-DnbkKvbdZtIiYdSn
-EPCjjvbdPIAXyAZB
-EPCjjvbdZoOIeEzK
-DoDLKvbdmJETqUrB
-DoCjjvbdOFDtIiKd
-DnbkKvbdqvolDIxq
-DnbjjvbdmgFYNNfy
-DncLKvbdieLHUoAO
-EPCkKvbdDnbkLWcE
-DoCjjvbdmJETpuSB
-DncLKvbdiiegjNXr
-EPDKjvbdZQldiMeR
-EOcKjvbdZHXEAPTJ
-EObkKvbdWHwvXfxz
-DnbkKvbdxUleRZLn
-DnbkKvbdtvNxKQsA
-DoDKjvbdOStWHEuQ
-DnbkKvbdsBellHLZ
-DoDKjvbdsCFllGkZ
-EPDKjvbdjhGlGGOL
-DncKjvbdxxJKBoyk
-DncKjvbdrXPkcJYq
-DoCkKvbduVnXipsA
-DoDKjvbdjKGHjMwr
-DoDKjvbdbBWEfPpX
-EOcKjvbdznoqEcMY
-DoCkKvbdySnJMqbH
-DoCjjvbdlrZVZsDi
-EPDLKvbdKfFgbApu
-DoDLKvbdZRMdiNFR
-EObjjvbdpeceUWAh
-EObkKvbdRotHKFcw
-DncKjvbdiZuFkpmf
-DoDKjvbdnGdwmNgZ
-DoDKjvbdMoxRVnGs
-DoDLKvbdiVZeXRtb
-EOcKjvbdGAoRYizm
-DoDKjvbdJJdAJpGd
-DoDKjvbdwMvANEFN
-DnbjjvbdaaWFFpQX
-DnbjjvbdqlzKZMIJ
-EPDLKvbdxnShXsJD
-DncLKvbdMfcPlotk
-DncLKvbdURRPVUhN
-DnbkKvbdHgGzZXxH
-EOcLKvbdYlRctOMN
-DncKjvbdnHEwlnGy
-DoDKjvbdlYsSTZGt
-EOcKjvbdZxcjNcLr
-EObjjvbdmttyjjSG
-EObkKvbdffLynHHA
-DnbkKvbdmpZxvLZC
-DncLKvbdBhjakJGK
-DoCkKvbdpstHSRkU
-EPDLKvbdiLddOVCy
-EOcKjvbdxUleQyLn
-EPCkKvbdTukpKTaR
-EOcLKvbdjvXOECYX
-EObjjvbdRWnEDLgc
-EObkKvbdbhljLGWx
-EPCkKvbdZoOJEdyj
-DnbkKvbdqrVKnLAm
-DoDKjvbdVAbRTRRy
-DnbkKvbdhfjDZWKV
-EOcLKvbdkWXOECYX
-DnbkKvbdYTLaMsnx
-EObjjvbdZRNFImFR
-DncLKvbdCWzdIdpW
-EOcLKvbdpyPIGqDx
-DoDLKvbdiCOcFWpq
-EPCjjvbdhtzFXSUb
-Dnbjjvbdlqxtyrci
-DoCkKvbdiZtelROG
-EPCkKvbdVUNUFkvK
-DnbkKvbdNddUJJLE
-DoCkKvbdNdctIhjd
-DnbkKvbdcyyQYZQb
-EObkKvbdQmYByNtz
-DoDLKvbdVrNxBeMD
-EPCjjvbdCTBCsevr
-DncLKvbdtSrTYyeD
-DnbjjvbdRyigsDWA
-DncLKvbdJYUBglQp
-DoDKjvbdSPsfiedX
-DoCkKvbdADRxKZiQ
-EPDLKvbdrEFJPmvB
-DnbjjvbdvAcyTOdh
-EOcKjvbdaMjasUmH
-DoDKjvbdZjSgogBf
-DnbkKvbdnGeXmOGy
-DnbjjvbdMgComPuL
-EPCkKvbdxKvcgzzG
-DncKjvbdwtldpyMO
-DoDKjvbdbhlikGXY
-EPCkKvbdpyPIHREY
-DoDLKvbdkClLRHUg
-EPDKjvbdqFdFUWBI
-EOcLKvbdkxrqrxgU
-DoDLKvbdTvLoitAq
-DoCjjvbdJuuFcdfi
-EPCjjvbdrykpTAhO
-EPCjjvbdiZuFkqNf
-EObjjvbdEuxpQNKF
-EPCjjvbdGGKSOJUR
-EPCkKvbdcyxowxqC
-DnbjjvbdjhGkeemk
-EPDKjvbdijGIJmYS
-DnbkKvbdypnliKXA
-EOcKjvbdRadFLhyL
-EPCjjvbdxwiKCPyk
-DoCkKvbdfILVqnQg
-DoDLKvbdkNCLzEgP
-DoCkKvbdGKdrbglu
-DnbkKvbdJcJcRJcY
-DoDLKvbdIwsahMRQ
-DnbkKvbdNddUIhjd
-EPCkKvbdJuuGDdgJ
-EPDLKvbdjKGHjMwr
-EObkKvbdGdKvKCJj
-DncKjvbdNUrqkNAX
-DoDLKvbdTqQoVVHm
-DoDKjvbdNddTiIkE
-EPCkKvbduaEZTPFI
-DnbjjvbdFWYopMie
-EObjjvbdyXhiaozL
-EPCjjvbdhaoDFWpq
-DncKjvbdJJdAKQHE
-DoDKjvbdegkVrOQg
-DnbjjvbdwuMdqYlO
-EPCkKvbdLKaHvAJy
-DoDKjvbdRbEFLiYk
-DoDKjvbdSxLMNzjx
-DnbkKvbdGKdsChMu
-DncKjvbdACrYJzJQ
-DoCjjvbdbUafwkUI
-DncKjvbdzjVPpDrt
-DnbjjvbdFfKSOJTq
-EPDKjvbdHffyyXxH
-EOcLKvbdRkZFtgLT
-EOcKjvbdXsMAmToY
-EOcLKvbdNPwqWNfs
-DoCjjvbdEuxpPljF
-DncLKvbdjJfIJlxS
-DoCjjvbdhgJbxuiu
-EPCkKvbdrDdhpOWB
-DnbkKvbdwWlBWAuu
-EObjjvbdySmiMrCH
-EPCjjvbduWOXjRTA
-DncLKvbdRDbaPqES
-EPCkKvbdjEkHVPAO
-EPDLKvbddiiqvUzn
-EPDKjvbdyYJKCPyk
-DncKjvbdNeEThiKd
-DncKjvbdrbGMlGkZ
-EOcKjvbdOTTvHEuQ
-EObjjvbdFyVUaEYC
-EPCkKvbdbiMikFwY
-EPDKjvbduaDxsPFI
-DncLKvbdozmckYPA
-DoDLKvbdVYgsykPO
-DoCjjvbdQvnDbkgc
-DncKjvbdZLrDtNkm
-DoDKjvbdHfgZyYXg
-DoDKjvbdauCGwkUI
-DoDKjvbdmJDsqVSB
-EOcKjvbdhgJbyWKV
-EPCjjvbdrouoKDWG
-DoDKjvbdQmYCYnUz
-DoDLKvbdfHkVqmpg
-DoCjjvbdZjShPfaf
-DoCkKvbdIGfzYxYH
-EPDKjvbdZRMeJNFR
-EPCjjvbdRpTgKFdX
-EPCkKvbdEYYMUUUM
-DncLKvbdwuMdqZLn
-EOcKjvbdmuVZkJqf
-DncKjvbdhgJbyWJu
-DnbjjvbdKVuFcdfi
-EPCkKvbdRadElIxk
-EPCkKvbdYlSDsmkm
-DoDKjvbdhlFEOVDZ
-DoCjjvbdIsZBSlwl
-DoDKjvbdLAkGmCXq
-DoDLKvbdqwQMCiYq
-EPDKjvbdURROtuIN
-DoCjjvbdpxoHgREY
-DncKjvbdwXLaWAuu
-EObjjvbdrpWPJcWG
-EPDLKvbdmozYvLYb
-EPCkKvbdMowpunGs
-DnbkKvbdANHySvzY
-DncLKvbdZyDinDLr
-DoCjjvbdziuPpESt
-EPDKjvbdiVZeXRuC
-EPDLKvbdDncKkWbd
-EOcLKvbdFVxopNJe
-DncLKvbdACqxJzIp
-DncKjvbdaMkCTUlg
-DoCkKvbdhyuGMQnG
-EObjjvbdbBWFFpPw
-EObkKvbdTAEiICPE
-DoDKjvbdbUagXjtI
-DoDLKvbdGZUuAcwb
-DoDKjvbdnGdwlmgZ
-DoDLKvbdVBCRSpqy
-DnbjjvbdfIKvRnRH
-EObkKvbdaRebgsek
-DnbjjvbdNVSrLNAX
-EPDKjvbdrJAKEmPF
-DnbkKvbdBdQBWKNG
-DoCjjvbdePFTLUUS
-EPCkKvbdRDcAoqDr
-DncLKvbdrNZiyLhJ
-DoCkKvbdLqwNZtpz
-EPDLKvbdlqxtzTEJ
-DnbkKvbdrRtjmkBN
-EPCkKvbdZRMeJNEq
-DnbkKvbdZsiJYdTO
-EObjjvbdUtMtGLvK
-EOcLKvbdnCJwYOnV
-DncLKvbdUMWPAuni
-EOcKjvbdJcJbpjDY
-DoCkKvbdcImKLGXY
-EObkKvbdYSlAmTnx
-DncLKvbdCTBCtFvr
-EObjjvbdqlyjYlIJ
-DoCkKvbdmSZUzSci
-DoDKjvbdjEjfuPAO
-EPCjjvbdWfYzUAPT
-DnbjjvbdzROmJJwA
-EObjjvbdnQZyVjyC
-DncKjvbdjAQGaPgK
-EObkKvbdtTSTZZeD
-DoDLKvbdZLrETnLm
-DncKjvbdCDpAujNG
-DncKjvbdUyHsykOn
-EPDLKvbdeXystRez
-EPCjjvbdlrZUyrci
-EPDKjvbdwjvcgzzG
-EPDKjvbdnHExNOGy
-EOcKjvbdZLqdTmlN
-EPCkKvbdEuxopMjF
-EObjjvbdJYTaglRQ
-EPCjjvbdrWpLbiZR
-EPCjjvbdNxOuzcnU
-DoDLKvbdijFhKNXr
-DnbkKvbdKWVGEFHJ
-DnbkKvbdKCicQjCx
-DoCkKvbdcScLTdKB
-EOcKjvbdKWUecdfi
-DoCjjvbdiLeDmuDZ
-DncKjvbdySnJNSCH
-EPDLKvbdZshhyDrn
-DnbkKvbdssSSxydc
-EOcLKvbdqrUjnLBN
-EPDKjvbdGdLWKCKK
-EObjjvbdsQWPJbuf
-DoDLKvbdJcKDRJcY
-DoCjjvbdZoNiEeZj
-DnbkKvbdGFjSOJTq
-EPDLKvbdxxJKBozL
-DoDKjvbdBraDUGXS
-EPDKjvbdJbjCpicY
-DoCjjvbdVqmwbEkc
-EPDKjvbdijFhKMwr
-EPDLKvbdrSVLNkBN
-DoCkKvbdiUzEvquC
-EPCjjvbdWIYVxGxz
-DnbkKvbdZoOIdeZj
-DncLKvbdZRMeJNEq
-EObjjvbdZMSDtOMN
-DnbjjvbdRWnDcLgc
-DoDLKvbdmRxtzTDi
-EOcKjvbdJmADygUa
-EOcKjvbdxUmFQyMO
-EOcLKvbdOTUWHEtp
-DoDLKvbdZRNFJMeR
-EOcLKvbdxmsHxShc
-EPCkKvbdUxhTykPO
-DoCkKvbdelfWfljL
-EPDLKvbdFejSOJTq
-EPCkKvbdKefIBaRV
-DncKjvbddeOqbXDK
-EOcKjvbdhlEcnUcZ
-DoCkKvbdZtJJZETO
-DnbjjvbdSPtHJfDw
-DncLKvbdOFDtIhkE
-EPDLKvbdFyVVAcwb
-DoCjjvbdqTtGqqjt
-EOcLKvbdyTOIlrCH
-DnbjjvbdACrYKZiQ
-DoDLKvbdvmWAMceN
-DoDKjvbdLBLHNCYR
-EPCkKvbdIxUCHlQp
-EPDLKvbdQmXayNtz
-DoCjjvbdKRZdoFme
-DncLKvbdZoNiEdyj
-DoDKjvbdqqtkOLBN
-EPCkKvbdiZuFkpmf
-DncKjvbdEPCjkXCd
-DoDKjvbdbVBgXjsh
-DoCjjvbdmRyUzSdJ
-EObjjvbdMJCLpxAS
-DoCjjvbdwWlBWAvV
-EPDKjvbdNHCpMouL
-DncKjvbdEOcLKwDE
-DoCjjvbdwjvcgzzG
-DnbkKvbdNGbpNPtk
-DoDLKvbdZGwEAOri
-EObjjvbdaRfDITfL
-DoDKjvbdVvhwudEg
-EPCjjvbdHgGyxwwg
-DncKjvbdcJMikFwY
-EObjjvbdwMvAMdEm
-EOcKjvbduMYXBUAw
-EPDLKvbdpfDeTuaI
-DoDKjvbdssSSxzEc
-DnbjjvbdjblLRHUg
-EOcLKvbdVwIxWDeH
-EPCkKvbdLGFgaaQu
-EPDKjvbdBiKakIfK
-DoDLKvbdEOcKjwDE
-EOcKjvbddijRvUzn
-DoCjjvbdmaivxPOV
-DnbkKvbdMfcQNPuL
-DncLKvbdZtIiZDsO
-DoDLKvbdhlEcmuDZ
-EOcKjvbdIGfzYxYH
-DncLKvbdICLydzAD
-EPDLKvbdMfcPmPuL
-DnbjjvbdrRuKmjaN
-DnbkKvbdbsDKscjB
-DoCkKvbdhkddNtcZ
-EOcLKvbdNQXqVnGs
-DoDLKvbdrEFIonVa
-DoCjjvbdQvnDcMID
-EPCjjvbdjlalZeGo
-EPCkKvbdjJfIKNYS
-EObjjvbdREDBPqES
-EPCjjvbdiZtfMRNf
-DoDKjvbdADRxJyiQ
-DncLKvbdYkqcsnMN
-DncLKvbdZshiZDsO
-DoDLKvbdRNXayNtz
-DncLKvbdqcdiPmvB
-EPCkKvbdrNZixlHi
-EPCjjvbdwtmFRYlO
-EObkKvbdJTZBTNXl
-EOcLKvbdWRnXadkc
-DoDLKvbdvwMBVaVu
-DoDKjvbdlZSrTYgU
-EPDLKvbdQcbaQRDr
-DoCjjvbdhuZdvrUb
-DnbkKvbdZxdKOClS
-DncKjvbdJzoexEAN
-EOcLKvbdQvmdDLhD
-DncLKvbdunszpkPU
-EOcKjvbdiZuGMQnG
-DncKjvbdVZIUZkOn
-DoDLKvbdkxsRsYgU
-EPCjjvbdGQASwGey
-DncKjvbdnBivwoNu
-EPDLKvbdsBelkfjy
-DoDLKvbdddoRbWbj
-EPCjjvbdhancFXQq
-EObkKvbdJvUfEEfi
-EPDLKvbdIidAKPfd
-DoDLKvbdxVMdpxkn
-DoCjjvbdaNLCTVNH
-DnbkKvbdZyDinDMS
-DoDLKvbdrMzJyLhJ
-EPDLKvbdyXhiaozL
-DoCjjvbdGKeTDHlu
-DncKjvbdwzIGFxFS
-EObjjvbdJvUedEfi
-DncLKvbdIjEAJpGd
-DncKjvbdyTNiNRbH
-EOcKjvbdidkGuPAO
-DoDLKvbdkVvmcbXw
-DoCjjvbdJYTbHkpp
-DoDLKvbdFyVVBEYC
-EPDLKvbdmoyyVjyC
-EOcKjvbdcTDKtDjB
-EPCjjvbdEvYpPmJe
-DoCjjvbdCJLCKhej
-DoCjjvbdSKxfUgLT
-DoDLKvbdFjeTDINV
-DncLKvbdEXxMUTtM
-EOcKjvbdWRnXaeMD
-DoCjjvbdrMzJyLgi
-DoCkKvbdcSbkUEKB
-DnbkKvbdyzeOSIIh
-DncLKvbdpstGqrKt
-EPDKjvbdCJLBkJGK
-EOcLKvbdJcJcQjDY
-EPDLKvbdbLLfPNcA
-DnbjjvbdEASImZwX
-DnbjjvbdtumwiqTA
-DnbkKvbdxKvdHzyf
-DoCjjvbdVwIxWDeH
-DncLKvbdYzcFqjVy
-EPDKjvbdqiAJeMoF
-DoDLKvbdNQXqVmfs
-EPDLKvbdFjdsChNV
-DoCkKvbdOTUWGdtp
-EOcKjvbdOEdUIiKd
-EOcLKvbduaEZSoFI
-EOcLKvbdxsNhlrBg
-EObkKvbdcIlijfXY
-DoDLKvbdLqvlytpz
-DoDKjvbdIryBTNXl
-EObjjvbdQwOECkhD
-DoCjjvbdLFegaaQu
-EObkKvbdFkFTChNV
-DnbjjvbdyzeOSHiI
-EObjjvbdLAkHNCYR
-DnbkKvbdZyDimcMS
-DncKjvbdkMbLzEgP
-DnbjjvbdRbEEkhyL
-EOcKjvbdLrXMzVQz
-EOcKjvbdVBBqTRRy
-EObjjvbdyNsHxTIc
-EPCjjvbdMuTRkNAX
-DoCkKvbdUaCQrprZ
-EPCjjvbdjmCLydfo
-DoCjjvbdFyVVAcxC
-EPCjjvbdQvnDblID
-DnbjjvbdLhbLqYAS
-DncLKvbdFxuVBEYC
-DncKjvbdGLFScIMu
-DncKjvbdBvzcheQW
-EPDLKvbdSPsfjFcw
-DnbkKvbdsQWOibvG
-DnbkKvbdaSGChTfL
-EPDLKvbdjmBkzFGo
-DoDLKvbdqAiFAWhE
-EPDLKvbdkVwNcaww
-DoCkKvbdKRZePGOF
-EOcLKvbdJXtCIMRQ
-EPCkKvbdaNLCTUmH
-EPDLKvbdliDtRUrB
-EOcLKvbdKfGHbApu
-EObkKvbdDwwlTstM
-DoDLKvbdmgExMmfy
-EOcLKvbdKWUfEFHJ
-EPCjjvbdkxrqrxft
-DncLKvbdkClKqHUg
-DoDKjvbdVqnXadlD
-DoDLKvbdULvPBWPJ
-DoDKjvbdUslsfMWK
-EOcLKvbdJvVFdFGi
-DncKjvbdiifHilxS
-EPCkKvbdRaceMJYk
-DoCkKvbddwytTrFz
-EPDLKvbdYkrETnLm
-DoCjjvbdiMEdOUby
-DoCkKvbdxVMeQyLn
-EPCkKvbdwuMdpxlO
-EPDLKvbdNPxQumfs
-DncKjvbdYpleJNEq
-DncKjvbdTAEhhCPE
-EOcLKvbdUGznLwVe
-EOcKjvbdNPwpunHT
-EPDLKvbdKaLHNBwq
-EOcLKvbdFfKRmhtR
-EObkKvbdYlRcsmlN
-DoDLKvbdWSOXadlD
-EOcLKvbdWWiXucdg
-DoCkKvbdZsiIxcsO
-DoDLKvbdbhlikFvx
-EOcKjvbdtlYXAsaX
-EOcLKvbdUtNTelVj
-DoDKjvbdhaoDFXRR
-DoDLKvbdEuxoomJe
-DoDLKvbdEYYLtTsl
-DncLKvbdbhmJkGWx
-EPDLKvbdqwPkbhxq
-DnbjjvbdlrYuZsEJ
-DncLKvbdeKKSWUzn
-DnbkKvbdyTNiNSCH
-DncKjvbddwzTsqez
-DncLKvbdTXkMNzjx
-DoDKjvbdJmAEZgUa
-DncKjvbdeEnqavbj
-EPDLKvbdcJNJjfWx
-DncLKvbdPyNAGsRj
-DoCjjvbdLGGHbAqV
-DncKjvbdddoRbWcK
-DoDLKvbdZjTHogBf
-EPDLKvbdRkZFuHKs
-EOcLKvbdEuyPoljF
-EPDKjvbdEYYMTtUM
-DncKjvbdDxXlTssl
-DnbkKvbdQvmcblID
-EObkKvbdjmBkydgP
-DoCkKvbdOAJTUKSA
-DncKjvbdhgJbxvJu
-DoDKjvbdVvhxVceH
-DoCkKvbdjvXODaww
-EPDKjvbdemFvflik
-DoDKjvbdkCkkRGtg
-DoCjjvbdDigjVxKA
-DncLKvbdLAjgNCYR
-EPDKjvbdbUbGwkTh
-EObjjvbdmuUzLJrG
-DnbjjvbdmgFXlnGy
-DoCkKvbdFxttaDwb
-EPCjjvbdJcKDRKCx
-DoCkKvbdpfDeUWAh
-EPDLKvbdADSYJyhp
-DoCjjvbdHkazmvqL
-DnbkKvbduLxWaUBX
-EPCkKvbdQdCaPpdS
-EOcLKvbdZdwfzhIb
-EPDKjvbdKWUeceGi
-EPDKjvbdSCDeMJZL
-DoDKjvbdyOShYShc
-EObjjvbdliEURVSB
-DncLKvbdmgEwlnGy
-DnbkKvbdsBemMHKy
-DoDKjvbdYzcGSJvZ
-EObkKvbdGcjvKBjK
-EOcLKvbdJuuGDdgJ
-EPCjjvbdOStWGeUp
-EOcLKvbdGLEsChMu
-EOcLKvbdeATqNYJf
-DncLKvbdxxIjCQZk
-EObkKvbddZyQXyQb
-DoDKjvbdVBCRTRRy
-EPCjjvbduDDVWuoP
-EOcKjvbdVZHtZkOn
-EPCjjvbdZQmEhmFR
-DnbkKvbdZyDimcLr
-EPDLKvbdjblKqHVH
-EOcLKvbdZtIiZDsO
-DnbkKvbdRWmcbkhD
-EPCjjvbddneSjtTr
-DoCkKvbdZQmFJMdq
-DoDLKvbdLFegbBRV
-EOcKjvbdSwkMNzjx
-DoCjjvbdFjeTDHlu
-EPCjjvbdtSqrxydc
-DncLKvbdSPtHKFcw
-DncLKvbdyYJJapZk
-EOcKjvbddxZssrFz
-EObjjvbdfekzOGgA
-EPDKjvbdrylQSaHn
-DnbjjvbdZisHofbG
-EObjjvbdrbGNMHKy
-DnbkKvbdLBKfmBxR
-DncKjvbdACqxJyhp
-DncLKvbddijRutzn
-EPDLKvbdMpYRVmfs
-DncLKvbdmttzKiqf
-DnbkKvbdZnmhdeZj
-EPCkKvbdjKFgjNYS
-DnbjjvbdxnTHxShc
-EPCjjvbdlZTSTYgU
-DoCjjvbdqlyjYkgi
-EObkKvbdxVMeQyMO
-EPDLKvbdSPtHJecw
-EPDLKvbdrpWOibvG
-EObkKvbdRbEFLhyL
-DoCkKvbdYNqAYUvU
-DoCkKvbdnCKXXnnV
-EObkKvbdddoSBvbj
-DncKjvbdNGcPlpUk
-DnbkKvbdmajXXnmu
-DoCjjvbdJXsbHlQp
-DncLKvbdNGcPlouL
-DoCkKvbdTAFJHaoE
-EPCjjvbdnPyxvKyC
-EPCkKvbdRyihTDWA
-DncLKvbdQlxCZNtz
-EObkKvbdJSyAsMwl
-DoCjjvbdmttykJrG
-EPCkKvbdfpBzwEXh
-DoCjjvbdrzMQTBIO
-EPDKjvbddZxowyRC
-DncKjvbdaNKaruNH
-DnbjjvbdaNKasVMg
-DncKjvbdcbTNSATm
-EPCkKvbdiLdcnVDZ
-EObjjvbdYTLaMtOx
-EOcKjvbdEASIlzWw
-DnbjjvbdziuPodTU
-EOcLKvbdqUUHRqkU
-DnbkKvbdyNsHxSiD
-EObjjvbdhkeDnUcZ
-EOcKjvbdNHCpNQUk
-EPDLKvbdIryBSmYM
-DnbkKvbdfekynGgA
-EOcLKvbdiHKCyWJu
-EObkKvbdrMzKYlIJ
-DoCjjvbdsZkoraIO
-EOcKjvbdQccAoqES
-DoCjjvbdtTRrxzFD
-EPCjjvbdJXtBhMRQ
-DnbjjvbdsBfNMHKy
-DnbkKvbdeEnrBwCj
-DoDLKvbdTfzmkvvF
-DoCjjvbdCJLCLIej
-DnbjjvbdNUrrLNAX
-DoCkKvbdxsNiNRag
-EPCjjvbdtbcUwVoP
-DoDKjvbdaogHDkzd
-DncKjvbdpedFTuaI
-DnbjjvbdqYngfpdY
-DncKjvbdbiNJkGWx
-DoCjjvbdGckVjBij
-EObkKvbdqceIomvB
-EPDLKvbdFWZQQNJe
-EObkKvbdrRtkOLAm
-DncKjvbdDwwktUTl
-EObkKvbdwNWAMceN
-DncKjvbdZMSDtOLm
-EObjjvbdTkvPAuni
-DoDLKvbdUxhTykPO
-EOcLKvbdVBCQsQqy
-EPDKjvbdZshhxcrn
-DnbjjvbdqdEiQOWB
-DoDKjvbdkWWmdBww
-DoDLKvbdzQoMhiwA
-DnbjjvbdUGzmlXWF
-DncKjvbdJTYaTMwl
-DoDKjvbdGLFScHmV
-DoDKjvbdrWpLcJZR
-EOcKjvbdwNWAMcdm
-EObkKvbdmfeYNOGy
-EObkKvbdtcDUwVoP
-DnbjjvbdiZuGMQmf
-EObjjvbdfMewGmJk
-DnbjjvbdANIZTWyx
-DncKjvbdtTSSxydc
-DnbkKvbdsBfMkfjy
-DoDKjvbdSLYfUgKs
-DoDLKvbdZisHogCG
-EObkKvbdVTlsfMVj
-DncKjvbddZyPwxpb
-DncLKvbdAMhYsXZx
-DncLKvbdxwhjCPzL
-EOcKjvbdKRZeOeme
-DoCkKvbdunszqLOt
-EPDKjvbdZRMdiMdq
-DnbjjvbdEuxpPljF
-EPDLKvbdGGJrOJUR
-EPDKjvbdVviXudEg
-DnbjjvbdpfDeTvBI
-DncLKvbdRadElJYk
-EPDKjvbdaMjbSuMg
-EPDLKvbdTAEhhCOd
-DncLKvbdTIyiqABM
-EPCkKvbdBsBDUFvr
-DoCjjvbdcSbkUEJa
-EObjjvbdCIjbKhfK
-DoDKjvbdauCHXjsh
-DoCkKvbdpyPHfqEY
-EOcLKvbdDwxMUUUM
-DnbjjvbdGFjRmiUR
-DoDLKvbdbQGgELzd
-EOcKjvbdGGJqnItR
-EPCjjvbdxrnJNRag
-DoDLKvbdbhmJkFwY
-EPDKjvbddoFSkTtS
-DncKjvbdNUsSKmAX
-EPCjjvbdfelZmfgA
-DoCkKvbdjKGIJlwr
-EPDLKvbdJYTaglQp
-EPCkKvbdVrOXbFMD
-EPDKjvbdTpqPUuIN
-EPCjjvbdGckViaij
-DnbjjvbdczZQYYqC
-DoDKjvbdMtrqkNAX
-EObkKvbdaNKartmH
-EPDKjvbdmSZUysDi
-EOcLKvbdlhdURVSB
-DncKjvbdWRnXbEkc
-DncLKvbdLBKfmBwq
-EPDKjvbdZdwfzhIb
-EPCkKvbdhancFXRR
-EObkKvbdaSFbgtGL
-DncLKvbdJXsaglQp
-DncLKvbdUsltFlVj
-DoDKjvbdLBKfmBwq
-EPCkKvbdnVVZjirG
-EObjjvbdiZuFlROG
-EObkKvbdwygeeweS
-EPCkKvbdwjvcgzyf
-DnbkKvbdssRsYzFD
-DnbjjvbdxwiJaoyk
-EPCjjvbdVhYWYHYz
-DncKjvbdhzVFkpnG
-DncLKvbdeJjSVtzn
-DncLKvbdyYIjCPyk
-EPDLKvbdJpzEoGNe
-DncKjvbdnBiwXoNu
-EOcKjvbdVrOYCElD
-EObkKvbdLBKgNCXq
-EPDKjvbdTlWPBVni
-EPDKjvbdFxuVBDxC
-DncKjvbdnHFXlnGy
-EPCjjvbdYkrDtOMN
-DoCkKvbdUWMPjTaR
-DoCjjvbdjSziSjiz
-DnbjjvbdeOdsKtUS
-EPCkKvbdmfdwmOHZ
-EObjjvbdtSrTYydc
-DnbkKvbdRjxeuGkT
-EObkKvbdKeehCApu
-EOcLKvbdpxoIGqEY
-DncKjvbdbLMGOnDA
-EPCkKvbdEXwktUUM
-EObkKvbdiUzFWqtb
-DoCjjvbdiHKCyViu
-EObkKvbdvwLaWAuu
-DoDLKvbdiCPDEvqR
-EOcKjvbdWXJXvEEg
-DoCkKvbdqTtGrSLU
-DnbkKvbdtbbuXWOo
-EObjjvbdgGLzOGgA
-DncKjvbdTlVoBWPJ
-DoCkKvbdeEoRbWcK
-DoCkKvbdkWWmdCXw
-DncKjvbdehLWRmpg
-EPCkKvbdjFLGtoAO
-DoDKjvbdGLFScIMu
-EObjjvbdrRtkOKaN
-EPCkKvbdczZQYYqC
-DnbjjvbdfHkVqnRH
-EOcLKvbdtvNxKRTA
-EPCkKvbdADSYJyiQ
-EOcKjvbdmJETptrB
-EOcLKvbdURQoUtgm
-DoDLKvbdZMSDtOMN
-EPCjjvbdFfJqnIsq
-EOcKjvbdcJNKKfWx
-DnbjjvbdkySqrxft
-DncLKvbdJpyePFme
-DncKjvbduCcVXWPP
-EOcLKvbdxKvcgzzG
-DoDLKvbdpfEEsvAh
-EObkKvbdZyDjNblS
-EPCjjvbdhbPDEwRR
-EPDLKvbdTqQoUthN
-DoDKjvbdxnSgxShc
-DoCkKvbdcTCjscjB
-DoCkKvbdOTUVfeVQ
-DncKjvbdkMbMZeHP
-DncLKvbdEvYpPmKF
-DncLKvbdJTZBTNYM
-EObjjvbdIHGyxxYH
-EOcKjvbdraemLfkZ
-EOcKjvbdMpYRVmgT
-DncKjvbdxZgfFxEr
-DnbkKvbdpxoIGpcx
-EPCkKvbdkIGlGFnL
-DoDKjvbdUslselVj
-DnbjjvbdZnnJEdzK
-DncLKvbdehLVrORH
-DoCjjvbdySmhlqbH
-DoDLKvbdADSXiyhp
-DoDKjvbdZtJJZDrn
-DoCjjvbdezvZEiUX
-EOcLKvbdqTtHSRkU
-EPDKjvbdVgxWXgYz
-DoCjjvbdGZUuBDwb
-DncLKvbdhzUekpnG
-EPCjjvbdZxcinDMS
-EPCkKvbdOFEThiLE
-DoDLKvbdhzVGLqOG
-EObjjvbdkySqryGt
-DoDKjvbdmpZyVkYb
-DoCjjvbdnHFYMnGy
-EObkKvbdRotGjFcw
-EPDKjvbdjblKpgUg
-EOcLKvbdWWiYVdFH
-DoDLKvbdtbcVXVoP
-EPDLKvbdqqtkOLAm
-EPDLKvbdmRyUysEJ
-DnbkKvbdxnShYTJD
-DoDLKvbdGKeSbhMu
-DoCkKvbdjuwODbXw
-DncLKvbdaMkCSuMg
-DncKjvbdtbcUvuno
-DnbjjvbdiVZeWqtb
-DoCjjvbdLBKgNBxR
-EObkKvbdlZSqrxgU
-EPCkKvbdULunaWOi
-DoCkKvbdwzIGGYEr
-EPCkKvbdnHExNOHZ
-EObjjvbdpyOgfqEY
-DnbjjvbdpedFUWAh
-DoCkKvbdhaoDFXQq
-DnbkKvbdYqMdhleR
-DnbjjvbdsZkpSaIO
-EPDKjvbdJcJbqJbx
-EObjjvbdehKvRmqH
-EOcLKvbdmIdURVSB
-EPDLKvbdvOszqKoU
-EOcLKvbdZisIQGbG
-DnbjjvbdFyVUaDwb
-EPCjjvbdTAEiIBoE
-DncLKvbdRkZFtgKs
-EOcLKvbdzdynzdyp
-EOcLKvbdnUtykKSG
-DoDKjvbdZQmEhldq
-EOcKjvbdnBjWxOnV
-EPCkKvbdqvpLbiZR
-DoDKjvbdrykosBIO
-EOcLKvbdBiKbLJGK
-EPDLKvbdBvzciFPv
-DoCjjvbdemFwGlik
-EPDLKvbdqTsfqqjt
-DncLKvbdptUHRrLU
-EObkKvbdbUbGwjsh
-DoCkKvbdHffyyXwg
-EPCjjvbdgGMZnHHA
-EPDKjvbdFejRmhsq
-DoCkKvbdQvmdCkgc
-DncLKvbdyNsHxShc
-DoCkKvbdrDeIpOWB
-EObkKvbdYzcGRiuy
-DncKjvbdMowqWNfs
-DoDLKvbdbsDLTcjB
-EPCkKvbdZQmEiNEq
-EObjjvbdNPwqWNfs
-DoDLKvbddeOrBwDK
-EObkKvbdrNZixkgi
-DoDKjvbdtlXvaUBX
-DncKjvbdtunYKRTA
-EOcLKvbdfSBWzkcP
-EObjjvbdVAbRTQrZ
-DnbjjvbdcJNKLFvx
-DncKjvbdssRsYyeD
-DoDLKvbdqTsgSSLU
-EPCkKvbdMowqVmgT
-DoCjjvbdDnbjjvbd
-EPCkKvbdlhdURUqa
-DncKjvbdqrVLOLAm
-DoDKjvbdNHDQNQUk
-EPCkKvbdXsLaMtOx
-EPCkKvbdRosgJfDw
-DncLKvbdKVuFcdgJ
-DoCjjvbdGGKRnItR
-DnbkKvbdeEnrCWcK
-EPDLKvbdlZSrTYgU
-EPCjjvbdtSrTYyeD
-DoCkKvbdZisHpHCG
-DnbjjvbdbrbkUDia
-DnbkKvbdhficYvKV
-EOcKjvbdsBfMlHLZ
-DoDKjvbdBdQBVjNG
-DnbkKvbdTvLpKUAq
-DoCjjvbdzaAPGgCM
-EObjjvbdiVZeWrVC
-EPCjjvbdZshiYcrn
-EObjjvbdRNXbYnUz
-EObkKvbdBcpBWJlf
-DncKjvbdtbcUvuoP
-DoCkKvbdmfeXmNgZ
-DncLKvbdbPfgELzd
-DncKjvbdZshiYdSn
-EObkKvbdDjHiuwjA
-DoDLKvbdfIKvRnRH
-DnbjjvbdiLeDmtcZ
-DoDLKvbdQwNcblID
-EObkKvbdmRyUzSdJ
-DnbkKvbdnHFYMnHZ
-EOcLKvbdfHjvSORH
-DncLKvbdlZSrSyHU
-EObkKvbdtSrSxzFD
-EObjjvbdZyEKNcLr
-EObkKvbdRkYeuHLT
-EOcKjvbdTkuoAuoJ
-DnbjjvbdEPDKkXCd
-EPCkKvbdnCJwXoOV
-EObjjvbdxrmiMqbH
-DoDLKvbdRaceMIyL
-EPDKjvbdRosgKFdX
-DoCjjvbdzoQQeDMY
-DncKjvbdZyEJmcMS
-DoDLKvbdOFDshiLE
-EPDKjvbdSQUGiedX
-EPCkKvbdTIyjRAAl
-EObjjvbdxUmFRYkn
-DncKjvbdmpZyWLYb
-DoCkKvbdygZMANEw
-DoDLKvbdhuZeWquC
-EObkKvbdFyUuAcxC
-DoCkKvbdiCPCeXQq
-DncKjvbdsCFlkfkZ
-EPCjjvbdNPwpvOHT
-DoCjjvbdSPtGjGDw
-DncLKvbdAMhZSvyx
-EPCkKvbdWXJYWDdg
-EPDKjvbdaogHDkzd
-DoDLKvbdRosgKFcw
-EPDLKvbdrRtjnKaN
-DncKjvbdvBEZSoEh
-DoDLKvbdmajXYOmu
-DnbjjvbdfNFwHMjL
-EPCkKvbdezuyEhtX
-DoCkKvbdHffzZYYH
-EPCkKvbdvAdYsOdh
-EPCjjvbdhlFDnVDZ
-DncKjvbdbiNKLFvx
-DoDLKvbdMIalQxAS
-EPDLKvbdGckWKBjK
-EOcKjvbdvOszqKnt
-DoCkKvbdraelkgKy
-EOcKjvbdMgComPtk
-DoDKjvbdOSsugFVQ
-DoCkKvbdyNrhYTJD
-EPCjjvbduDDVXWOo
-DncLKvbdiCPDFXRR
-DncLKvbdiGibyWKV
-EOcLKvbdfNGXHNJk
-EObkKvbdBhjakIej
-EPCjjvbdxmrhXriD
-DnbkKvbdJbibqKDY
-DnbkKvbdSCDdkhyL
-EPCjjvbdGFirOIsq
-DnbkKvbdKVtfDeHJ
-DoDKjvbdGKdrbhMu
-DncLKvbdZLrETmlN
-EObjjvbdjuvmcbXw
-DncKjvbdQdDApRDr
-EObkKvbdeATplwjG
-DoCjjvbdZMRdUNkm
-DoDKjvbdTqQoVVIN
-EPCkKvbdOTTufeVQ
-EPDKjvbdWRnXadlD
-DncKjvbdZsiJYdSn
-DoCkKvbdZLrDsnMN
-DoDKjvbdEKHiuwjA
-EPDLKvbdnBivxPOV
-EPCjjvbdddnrCWbj
-EOcLKvbdpssgSRkU
-EPCjjvbdzdzOzdyp
-EPCjjvbdZxcinClS
-DoDKjvbdvAcySoEh
-DnbjjvbdWHxWXfxz
-DoDLKvbdCWzdJEpW
-DoCjjvbdehLVqnRH
-EObjjvbdEXxLstTl
-EObjjvbdkMakzEfo
-EPCkKvbdKaKflbXq
-EPDLKvbdijFgjNYS
-DoCjjvbdZsiIxdSn
-DncKjvbdeATqNXif
-DncLKvbdzoPqEblY
-EObkKvbdLAjgNBwq
-DncKjvbdUxgsykPO
-DoDKjvbdaogGckzd
-DncKjvbdFVxpPmJe
-EOcLKvbdZLrDtNlN
-EObjjvbdYNqAXuWU
-DoCkKvbdEYYLstUM
-EObjjvbdeFPSBwDK
-DncKjvbdePEsKssr
-DncKjvbdZjTHogCG
-EPCkKvbdjKGHjNXr
-DoCkKvbdNrtVgFVQ
-DncLKvbdaMjaruNH
-DoDLKvbdwjwEHzzG
-EOcLKvbdTIzJqABM
-DoDLKvbdliETqVSB
-DoDLKvbdNrtVfdtp
-DnbjjvbdZxdKNcMS
-EPDLKvbdbUafxKsh
-DoCkKvbdVrNxCFMD
-DoCkKvbdxZgefYEr
-DoDKjvbdYTLaMsoY
-DncKjvbdeAURMwif
-EOcLKvbdNGcPmQVL
-EPDKjvbdqceJQOVa
-DncKjvbdRotHKGEX
-DoCjjvbdwNWAMdFN
-EPCkKvbdFyVVAcwb
-DoDKjvbdmozYvKyC
-DncKjvbdSPsgJecw
-EPDKjvbdZtJJYcrn
-EOcLKvbdGckWKCJj
-DoDKjvbdkxrrSxft
-DnbjjvbdRbDdlIxk
-DncKjvbdyYJJbPyk
-DnbjjvbdhgJcYvKV
-EObkKvbdjcLjqHUg
-EObkKvbdhgJbyWKV
-EObjjvbdrovPKCvG
-DoCkKvbdbBVdepQX
-DnbjjvbdUVkojTaR
-EPCkKvbdbUagYLUI
-DoDLKvbdptUGqqkU
-DoCjjvbdyTNhlqag
-DncKjvbdEYXlTssl
-EPCkKvbdXFxytAOs
-EOcLKvbdNdctIhkE
-EPDLKvbdkDMLRGuH
-EPDLKvbdDihJuxKA
-EOcLKvbdrafNMHLZ
-EPDLKvbdbKlFoODA
-DncLKvbdZLqcsnMN
-DnbjjvbdznpRFDLx
-DncLKvbdziuQPdSt
-EPCkKvbdbrcKsdKB
-DncLKvbdaMkCTUmH
-EPDLKvbdYkqdUOLm
-DoDKjvbdjhHLfGNk
-DoDLKvbdZMSDtNlN
-DnbjjvbdZjTHpHCG
-DoCkKvbdemFvgNKL
-DncKjvbdrRtkOLAm
-EPCjjvbdyNrhXsIc
-EObjjvbdgPazwDwh
-DoDKjvbdRDcAoqDr
-DoDKjvbdvvkaWBWV
-EOcKjvbdZRMdiNFR
-EPCkKvbddePRawCj
-DoCkKvbdHDjvKBij
-DnbkKvbdZirgpGbG
-EOcKjvbdhbPCeWqR
-DnbkKvbdNPwpvNfs
-EPCjjvbdZirhPfbG
-EOcLKvbdIGgZxwxH
-EPCkKvbdrykosBHn
-DoDKjvbdxnTIYShc
-DnbjjvbdNsTvGduQ
-DncLKvbdBcpAvJlf
-DnbjjvbdlqxtysDi
-DoCkKvbdOEdTiIjd
-DncKjvbdfHkVrOQg
-DoCkKvbdiHKDYvKV
-DoDKjvbdOTUVgFUp
-EObkKvbdaaVdfPow
-DncLKvbdZHXEAPTJ
-DnbkKvbdkIHLefNk
-DnbkKvbdjEjfuPAO
-EObjjvbdhtzFWqtb
-DoDLKvbdSQTfjFdX
-DncLKvbdHEKvKBjK
-DncLKvbdHDkVjBij
-EPDKjvbdRpTfiecw
-DnbkKvbdiBncEwQq
-EObkKvbdRadEkhyL
-EPCkKvbdezvYdiTw
-EOcKjvbdaMjasUlg
-EObkKvbdczZPwyQb
-EPCjjvbdTvMQJtAq
-EPCjjvbdJXtCIMRQ
-DoDLKvbdkDMKpftg
-EPCjjvbdiVZdvqtb
-DnbkKvbdtunXipsA
-DoCjjvbdjJehKNYS
-DnbjjvbdJvUeceHJ
-DoDKjvbdKRZdoFme
-DncLKvbdJcKCpjCx
-EPDKjvbdmbKXYPNu
-DnbjjvbdkIHLeenL
-EPDLKvbdNPxQunHT
-DnbjjvbdUtMtFkvK
-EPDLKvbdsPvPJcWG
-EObjjvbdMRvlzVQz
-DoCkKvbdsQWOjDWG
-DnbjjvbdXGZZtAPT
-DnbjjvbdunszpkOt
-DncKjvbdxZhFfXdr
-DnbjjvbdRzJgsCvA
-EPCkKvbdSCDdlIxk
-EPDKjvbdREDBPqES
-DnbjjvbdBvzdIdov
-DoDLKvbdSLYetfkT
-EObjjvbdKWVGDeHJ
-DoCjjvbduDDUvuoP
-EOcLKvbdWIYWXgYz
-DoCjjvbdbhmJjfWx
-EPDKjvbdIxUCILpp
-EOcLKvbdeXzTsrFz
-EPDLKvbdsBemLgKy
-EPCkKvbdzjVPpDrt
-DncLKvbdZyDimbkr
-DnbjjvbdRNYBxmtz
-EPCkKvbdvOszpkPU
-EObkKvbdSQTfiedX
-DncKjvbdZRNFIldq
-DoDKjvbdbhlijfXY
-EObkKvbdEzspeLcJ
-EPCjjvbdKCicRJbx
-EOcLKvbdOYOuzcnU
-DoCkKvbdhkddOVDZ
-DncKjvbdIxTahMQp
-EOcLKvbdwygeexFS
-EPCjjvbdKRZeOeme
-EPDLKvbdgPazvcxI
-DncKjvbdfNFwHMik
-EOcLKvbdtkwvaTaX
-EObjjvbdURQnuVIN
-DnbkKvbdiBncFWqR
-DncLKvbdaMkCStmH
-EPCjjvbdZjSgogBf
-DoDKjvbdMowpvOGs
-EPCkKvbdsrqsZZdc
-DnbkKvbdRpTfjFdX
-EOcKjvbdaMjbTVMg
-EOcLKvbdmgExMmfy
-DncKjvbdCJLCLJGK
-DoCkKvbdNeDshiKd
-DnbkKvbdGLFSbgmV
-EObjjvbdMtrrLNAX
-EOcKjvbdpedEsvAh
-DoDKjvbdcyxpXyQb
-EObkKvbdxZhGGXdr
-DoCkKvbdEztQdlCi
-EObkKvbdijFgilxS
-EPDLKvbdkHgMFenL
-EOcLKvbdlrYtysDi
-DncLKvbdjcLjpgVH
-DoCjjvbdnVVZkKRf
-EPDKjvbdFeirNhsq
-DnbkKvbdjblLRGuH
-EPDLKvbdtTSTZZeD
-DoDKjvbdVBCRTRSZ
-DncKjvbdTYLMNzjx
-DoCkKvbdEztQdkcJ
-EObjjvbdpfEFTuaI
-DncLKvbdYSlAmUPY
-DncKjvbdYpldiNFR
-DncLKvbdWXIwvDdg
-DoDLKvbdeXyssrFz
-DncLKvbdqdEhonVa
-EOcLKvbdNQYRVnGs
-EObjjvbdRpTgKGDw
-DoDKjvbdauCHXkUI
-DoDLKvbdhficZViu
-DnbjjvbdzoPpeCkx
-DoCkKvbdJYTaglQp
-DoDKjvbdnBiwYPNu
-EOcLKvbdMJCLqYAS
-EPCjjvbdYkrDsnMN
-EPCkKvbdehKvRmqH
-EObkKvbdVqmxCFMD
-DncKjvbdrDeJPmvB
-EPDLKvbdzaAOgHCM
-EOcLKvbdNPxQvNfs
-DncLKvbdFVxopMie
-EPDKjvbdgQBzwDwh
-EObjjvbdTfzmkvvF
-EPDLKvbdUaBprpqy
-DoCkKvbdnGdxNOGy
-DncLKvbdfIKurOQg
-EPCkKvbdKDJcRKCx
-EPCjjvbdmJEUQuSB
-DncLKvbdrafNMGjy
-EOcKjvbdZxdKNbkr
-DnbkKvbdJmADzGuB
-EPCjjvbdQvmdDMID
-DnbkKvbdemGWgNJk
-DncKjvbdyfxlAMdw
-EPCkKvbddtAUATNW
-DncKjvbdcasMrATm
-DoDKjvbdVhYVxHYz
-EPCjjvbdhyuFkpmf
-DoDLKvbdcbTMrATm
-EPCkKvbdILaznXRL
-DoDKjvbdRDbaQQcr
-DncKjvbdijFgjNYS
-EObkKvbdIMBznXRL
-EPCjjvbdxVNEpyLn
-DncLKvbdYkqctOMN
-EOcKjvbdxrmiNSBg
-EPDLKvbdtTRsYzFD
-EOcKjvbdzjVQQDsU
-EPCjjvbdZMRctNlN
-DncKjvbdXrlAmTnx
-EOcLKvbdbPgGdLzd
-EPDLKvbdFfJqmhsq
-EOcLKvbdyzdmqgiI
-DoCjjvbduCbtvuoP
-DncLKvbdNGcPlpVL
-EPCjjvbdGBOpyJzm
-EPCkKvbdRDcBPpcr
-EOcLKvbdRbEFLhyL
-EOcLKvbdePFTLTsr
-EObkKvbdcTCkUDjB
-DnbkKvbdrWokbhxq
-DncLKvbdqUTfrRjt
-EOcLKvbdRyihTDWA
-EObkKvbdpxnhHQdY
-DnbkKvbdrSUkOKaN
-DoCjjvbdIGgZyYXg
-DoDLKvbdMowqWNfs
-DoDKjvbdUxgtZkOn
-EObjjvbdUtNTelVj
-EObjjvbdlqxtyrdJ
-DncKjvbdkVvnDbYX
-EObjjvbdePFTKssr
-DoCkKvbdMuSrLNAX
-EOcLKvbdnQZyWLZC
-DoDKjvbdhgJcYujV
-DoDLKvbdaMjasVMg
-EPCjjvbdcScLUDia
-DnbjjvbdbKkeoNcA
-DnbkKvbdfpBzwEYI
-DoCkKvbdBhkBjhej
-DnbjjvbdkDMLRGtg
-EObkKvbdeATqNXjG
-EOcKjvbdFkFSbglu
-DnbjjvbdznpQdcMY
-DncLKvbdIidAJpHE
-DoCjjvbdLZQirzuG
-DnbjjvbdzjUopDrt
-EOcLKvbdnUuZjiqf
-DoDLKvbdwyhFeweS
-DoCkKvbdaoffckzd
-EObkKvbdzaAPGgCM
-EObkKvbdEzspdkcJ
-DnbjjvbdDjHiuxKA
-DnbkKvbdVqmxBdlD
-EOcLKvbdrJAKFMne
-EOcKjvbdZjSgofbG
-EPCjjvbdfMfWgNJk
-DoCkKvbdTukpJsaR
-DoCjjvbdySmiNSBg
-DnbkKvbdzGyMANFX
-EObkKvbduWNxKQsA
-DoDKjvbdRkZFuHLT
-DncLKvbdbKlGOmcA
-DncLKvbdyNsIXsJD
-DnbkKvbdMpXqWNfs
-DoCkKvbdHEKujBjK
-DncLKvbdDxXktTsl
-EPCkKvbdACrYJyiQ
-EOcKjvbdqUUHSRjt
-DoDLKvbdOFDsiJLE
-EObkKvbdrbGMlGjy
-DoCjjvbdjblKpgUg
-EPCkKvbdiHJcYujV
-EPDKjvbdrDeJQNvB
-EPDLKvbdbrbkTdJa
-DnbkKvbdNeDtIhkE
-DnbkKvbdcJNKKevx
-EPCjjvbdxVNFQxkn
-EObjjvbdhyuGLqOG
-EOcKjvbdrafMkfkZ
-EObkKvbdRkYetgKs
-DnbjjvbdUWLoitBR
-DoCjjvbdQvmcblID
-EOcLKvbdDoDLLXCd
-DncLKvbdzRPMiJwA
-DoCkKvbdsZkoraHn
-DoDKjvbdkHgMGFnL
-EObkKvbdrbFmMGjy
-DnbkKvbdRWnDbkhD
-EPDKjvbdJbicRJbx
-DncKjvbdGZUuAcwb
-DoCjjvbdmfdwmNfy
-DoDKjvbdBdQAujNG
-EPDLKvbdwWlAuaVu
-DncLKvbdxmrgxSiD
-DoCkKvbdUsmUFkuj
-EOcKjvbdcTDKsdKB
-DnbjjvbdjcLkRHVH
-DoDKjvbdbiMijewY
-EPCjjvbdPyNAHSrK
-DnbjjvbdFkErcINV
-EPDKjvbdZQldhmFR
-EPDKjvbdTJZjRABM
-EOcKjvbdKaKgMaxR
-DoCjjvbdwzHefYEr
-DoDLKvbdDwxLtUUM
-DoCkKvbdfILWRmpg
-DoCkKvbdRyihTCvA
-DoDKjvbdSQUGjFcw
-DoCjjvbdEYXktUTl
-EPCjjvbdoznEKxPA
-EPDLKvbdSiZiqABM
-EObkKvbdVUNUFkuj
-DncKjvbdMfbpNQUk
-DncLKvbdEvYopMie
-DnbjjvbdMowpvNgT
-DncLKvbdKjaHvAKZ
-DoDKjvbdqmZjZMIJ
-EObjjvbdGcjuibJj
-DoDLKvbduLwvaTaX
-DoCkKvbdHgHZyYYH
-EObjjvbdEOcKjwCd
-EPCjjvbdGckWKCKK
-EObkKvbdEuyQQMie
-DnbjjvbdHgGzZYYH
-EObjjvbdVUMsekuj
-EObkKvbdWWiXucdg
-EPDKjvbdRWnECkgc
-EPDKjvbdxZgefYFS
-DnbkKvbdEuyPomKF
-EPCjjvbddePSCXCj
-DoDKjvbdUsltFlWK
-DnbkKvbdbsDKtEJa
-EObkKvbdmoyyWLZC
-DoDKjvbdSCDeMJZL
-DnbkKvbdwtleRYkn
-EPDLKvbdJpzEnfNe
-DncKjvbdZisIQGbG
-DoCjjvbdiUzEwRtb
-DncKjvbdrounicVf
-DncLKvbdmIdURVRa
-DoDKjvbdYSlBNUPY
-DnbjjvbdKDKDQibx
-DoDLKvbdnCJvwoOV
-EPDKjvbdgFlZmfgA
-DoDKjvbdTukojTaR
-DnbjjvbdVAbQsQqy
-EOcLKvbdtAHRIABS
-DnbjjvbdmbJvwnnV
-EOcKjvbdvBDxrneI
-DnbjjvbdeJirWUzn
-DnbjjvbdKeegaaQu
-DnbjjvbdzQoMiKXA
-DnbjjvbdxwiJbPyk
-EPDLKvbdKNADzHUa
-DoCkKvbdANHyTXZx
-EObkKvbdxLXDgzyf
-EOcKjvbdpxoHgQcx
-DncKjvbdLBKflawq
-EPDKjvbdhanbdwQq
-DnbkKvbdEASIlyvw
-EPCkKvbdwzHfGYEr
-EOcLKvbdqZPHgQdY
-EPDKjvbdqTtGqqjt
-DoCjjvbdDxXksssl
-DoDKjvbdQlwayNtz
-EOcKjvbdTvLoitAq
-DnbkKvbdirzhsKiz
-EPDKjvbdyzeORghh
-DncLKvbdmJDsqVRa
-DncLKvbdKefICAqV
-EOcLKvbdZnmheFZj
-DoDKjvbdIxUCILpp
-DncLKvbdxsOIlrBg
-DoCkKvbdiVZdvqtb
-EPDLKvbdbBWEfQPw
-EObkKvbdsCFllGkZ
-EObkKvbdNdctIiKd
-EObjjvbdozmcjwoA
-EPDLKvbdlhdTqUqa
-EOcKjvbdbUagYKsh
-DnbkKvbdJpydoGOF
-DnbkKvbdnGeYMmfy
-DncKjvbdtlXwBUAw
-DncKjvbdqiAJdlne
-EPCkKvbdMIakqYAS
-DnbkKvbdCWzchdov
-EObkKvbdelewHNJk
-EPCjjvbdFpASvgFy
-DoDLKvbdVrNxCFMD
-DnbkKvbdMpYQvNfs
-EPCkKvbdEObkKwDE
-EPDLKvbdHDjuibJj
-EPCjjvbdKaLHMaxR
-DoDKjvbdakLfOmcA
-EPDLKvbdMgDQNQVL
-DoCjjvbdEvYpQNKF
-EPDKjvbdrEEhpOVa
-EOcLKvbdOFDsiIjd
-DncKjvbdtTSTYyeD
-EObjjvbdQvnDblHc
-DoDKjvbdVrNwbElD
-EPCjjvbdZMRdUNkm
-DoCjjvbdhfibxujV
-DnbjjvbdYpmFJMeR
-DncLKvbdDihKVxKA
-DoCjjvbdrNZjYkgi
-EOcLKvbdYqNFImEq
-DoDLKvbdJbjDQjCx
-DoDKjvbdwygefXeS
-DncLKvbdUyHsykPO
-DncLKvbdJSyBTMxM
-EPDKjvbdcImKKfXY
-EPCjjvbddndsLTtS
-DoDLKvbdEASIlzWw
-EObjjvbdrylQTAgn
-DoDKjvbdFkFTChMu
-DncLKvbdUaCQrprZ
-DnbjjvbdOFEThhjd
-EObjjvbdlYsRrxgU
-EPCkKvbdnGeYNOGy
-DoDKjvbdwygefYEr
-DoCjjvbdGckViajK
-DoDKjvbdSZjITDWA
-EObjjvbdkWXNdCXw
-EPCkKvbdKjaIWAJy
-EObkKvbdKkBIWAKZ
-DoDLKvbdptTfqrLU
-DoDKjvbdPxmAGsRj
-EObkKvbdTvMPitBR
-EPCkKvbdegjvSOQg
-DoDKjvbdwNWANEEm
-EOcLKvbdRNXbYmtz
-DoDKjvbdEOcKjwDE
-EPDLKvbdfMfXHMik
-DoCkKvbdWHwvXfxz
-EPCjjvbdelfWgNKL
-EPCjjvbdqcdiQOVa
-DncKjvbdkyTSTZGt
-DoCkKvbdbAueFpPw
-EOcKjvbdQwNdClHc
-DnbjjvbdxmsIYSiD
-EPDKjvbdCTAbtFwS
-DncLKvbdJpzFOeme
-EOcKjvbdiZuGLqOG
-DncKjvbdKaLHMaxR
-EPDLKvbdbiMjLFvx
-EPCkKvbdjvXODaxX
-EOcLKvbdOAJSsirA
-EPDKjvbdqYnhHQdY
-DoCkKvbdDwwlTtUM
-DnbkKvbdRjxfVHKs
-EObjjvbdzjUpPcrt
-EOcLKvbdeUAUATNW
-EObkKvbdQlwaxmtz
-EObkKvbdEXxLtUUM
-EObkKvbdYkrETmkm
-DoCkKvbdxmsHwsIc
-DoDKjvbdzjUoocrt
-EPDKjvbdqGEFTuaI
-EPCjjvbdbiMjLGXY
-EPDKjvbdfpBzwEXh
-DncKjvbdZeYGzhJC
-DoCjjvbdFkEsCglu
-DncKjvbdOFDshhjd
-DncKjvbdZMRcsnMN
-EPCkKvbdrEFJPnVa
-DoCkKvbdcyyPxYpb
-EPDLKvbdijGIKMwr
-DoCjjvbdbAudepQX
-DncLKvbdFejSOItR
-EOcKjvbdSLZGVHLT
-EPDKjvbdMJBkpxAS
-DncKjvbdJXsaglQp
-DnbkKvbdjcMLRHVH
-DoCkKvbdFjeTCgmV
-DnbjjvbdqUTfrRkU
-DnbjjvbdznoqFCkx
-EObkKvbdVqnYBeLc
-DoDLKvbdaMjbTVMg
-DoCkKvbdSQUHKFdX
-DoCjjvbdrDdhomua
-DncLKvbdcTCjsdJa
-DoCkKvbdsCFlkgKy
-EPCkKvbdmbKWwnmu
-DoCjjvbdZQmFImEq
-EPCkKvbdyXiKCPzL
-EOcLKvbdKQzEnenF
-EPCjjvbdrbGNMGjy
-EPDKjvbdgGMZnHHA
-EOcLKvbdfHjuqnRH
-EOcLKvbdFeirNiUR
-DoCjjvbduaEZSoFI
-DncKjvbdbAudfPow
-DoCkKvbdbiMikFwY
-DoDLKvbdcyxpYYqC
-DnbjjvbdpxoHfpdY
-DncKjvbdqUTgRqjt
-DoDKjvbdcImKKfWx
-DnbjjvbdmfeYNNfy
-EPCjjvbdIjEAJofd
-EObjjvbdLBKgNCXq
-EObjjvbduLxWaUAw
-DnbjjvbdJTZBTNXl
-DoCkKvbduaDyTOeI
-EOcLKvbdUyIUZkPO
-EOcLKvbddePRawCj
-EPDKjvbdhbObeWqR
-EOcKjvbdBdQAvJmG
-EOcKjvbdkVwODaww
-DnbkKvbdUVkoisaR
-DnbkKvbdMoxQvNfs
-EObjjvbdCJKbLIfK
-DncKjvbdYpmFJNEq
-DoCjjvbdjKFhKMxS
-DnbjjvbdZLrEUNlN
-EPDKjvbdwuNFRZMO
-EObjjvbdjuvnECXw
-EPCkKvbdlZTSTZGt
-DoCjjvbdsQVoJcWG
-DncLKvbdmJETqVSB
-DnbjjvbdjggLfGOL
-EObjjvbdxwiKBpZk
-DoDLKvbdKDKCpjDY
-EPCjjvbdzRPNIjXA
-DoCkKvbdkaMoNALA
-EPCkKvbdjvWnDaww
-EPCkKvbdSBcdkiZL
-DnbkKvbdbUbHXkUI
-EOcKjvbdURROtuHm
-DncLKvbdJmAEZgVB
-DoDLKvbdDxYLsssl
-DncKjvbdWRnXadlD
-EPCjjvbdADSXiyhp
-DnbkKvbdNGcPlouL
-DnbjjvbdBsAcTevr
-EObjjvbdWWhwvDeH
-EOcLKvbdbUafxKsh
-DoCkKvbdtcCuXWOo
-EOcKjvbdbKkennDA
-EPDLKvbdGcjujBjK
-DoDKjvbdRWmdDMHc
-EPCkKvbdmSZUyrdJ
-DoCkKvbdLZRKSztf
-DncKjvbdZQmFJNFR
-EPDLKvbdjhGkefNk
-DncKjvbdeATpmYJf
-EPCkKvbdDjHivXjA
-EObjjvbdFyVVBEXb
-DncKjvbdIHHZxxXg
-DnbjjvbdMoxQvNfs
-EObjjvbdlYsRsZGt
-EOcLKvbdZHWdAPTJ
-DoCkKvbdoznDjwoA
-EOcLKvbdYpmEiNEq
-EOcLKvbdfMfWgNJk
-DnbjjvbdjlalZeGo
-EPDLKvbdVgxVxGxz
-DoDKjvbdZRMdiMeR
-DnbkKvbdNsUVgFUp
-EObjjvbdNGcPmPuL
-EPDLKvbdrSUjnKaN
-DncKjvbdMgDPmQUk
-DoDLKvbdRkZGUfkT
-EOcLKvbdpxoIGqDx
-DoCkKvbdVwIxVcdg
-DoDKjvbdZQmFIleR
-EPDKjvbdZshiZDrn
-EPCkKvbdFWZPpNJe
-DnbkKvbdcImKKfXY
-DoCkKvbdiVZeWqtb
-EPCkKvbdkxsSSyHU
-EObkKvbdcSbkTdKB
-EOcKjvbdFxttaEYC
-EPCkKvbdhtzEwSVC
-EOcKjvbdLAjgNBwq
-DoCkKvbdZisHofbG
-DoDLKvbdIsYaTNYM
-EPDLKvbdADRxJzIp
-DoDKjvbdTkuoAvOi
-EOcLKvbdZRMeJMdq
-EPDLKvbdWWiXvDdg
-DnbjjvbdbsDKscjB
-DnbkKvbdtlXwBUBX
-EPCjjvbdmgFXlmgZ
-EObkKvbdjmBlZeGo
-EObkKvbdmgEwmOGy
-DoCjjvbdtlXwBTaX
-EPDKjvbdSiZiqABM
-EPDLKvbdEXxMTssl
-EPCkKvbdRWmccLhD
-DncLKvbdrWpMDJZR
-EPDLKvbdelfXGlik
-EOcLKvbdFjdsChNV
-EPCkKvbdVUMtFkuj
-DoDLKvbdtkxXBUBX
-DncLKvbdMgDQNPtk
-DnbkKvbdMJCMQxAS
-EOcLKvbduWOYJpsA
-EPCjjvbdZxcimcMS
-DoDKjvbdqrUjmkAm
-EObjjvbdRzJgsCvA
-EOcLKvbdiBoDFXRR
-EPCjjvbdSPtHKFcw
-DncKjvbdbBVeGPpX
-DnbjjvbdRotGiedX
-DoDKjvbdIHGzZYXg
-DnbjjvbdiGjCyViu
-EPCjjvbdSxKkmzjx
-EPCjjvbdmajWwoOV
-DnbjjvbdmbKWxPNu
-EObkKvbdCTBCsfXS
-DoCjjvbdKQzEnfOF
-EPCkKvbddijRutzn
-EObkKvbdFjeTCgmV
-DnbjjvbdURQnuUhN
-DnbkKvbdiCOcFXRR
-EObkKvbdJutfEEfi
-DncLKvbdhtydwRuC
-DoCjjvbdcTCjsdJa
-DnbjjvbdzoPqEcMY
-DoDLKvbdSCDdlJZL
-EOcKjvbdlhctQuSB
-EPDKjvbdOFETiJKd
-EObkKvbddZyQYZQb
-EOcLKvbdrMyjYlHi
-DoDLKvbdqrVLOLBN
-DncKjvbdyNsHwriD
-EObkKvbdQvnECkgc
-DnbkKvbdznopeClY
-DoCkKvbdCJLBjiGK
-EOcLKvbdauCGxKtI
-EPCjjvbdeFOrCWcK
-DncLKvbdcSbjtDia
-DnbkKvbdKWVGDdgJ
-EPDKjvbdrDdiQNua
-DncLKvbdqTtGqrKt
-DoDKjvbdjJfIKMwr
-DoCkKvbdkxsSTZHU
-EObkKvbdFejSNhtR
-DoDKjvbdnCKWxOmu
-DoDLKvbdvBDySneI
-DncKjvbddZxpXyRC
-EPDKjvbddwzTsqez
-DoDLKvbdLFfIBaQu
-DncLKvbdwzHeewdr
-DncLKvbdOFEUJJKd
-DoDLKvbdEvZQQMie
-EPDLKvbdWHxVwgYz
-DoCjjvbdiGjCxujV
-EPDKjvbdrovPJcWG
-DoDLKvbdZxcjOCkr
-DnbjjvbdRzJgsDWA
-DoDLKvbdiZuGLpnG
-DncLKvbdTukoitBR
-DnbkKvbdnBiwXnnV
-DoDKjvbdBvzdIdov
-EObkKvbdRWnECkhD
-DoCkKvbdRbDeMJZL
-DncKjvbdiGjDYujV
-EPCkKvbdNdctIiLE
-EPCjjvbdKWUfDdfi
-EOcKjvbdkIGlGGNk
-EPDKjvbdGZVVBDxC
-EObkKvbdXsMBNUOx
-EObjjvbdANHxrvyx
-EPDKjvbdZtIhyDrn
-DoCkKvbdRWmdCkgc
-EObkKvbdffLynGgA
-DoDKjvbdIxTahMQp
-DncKjvbdKQzFPGOF
-DoDKjvbduDCtwWOo
-EOcKjvbdnCJvxOmu
-DoCjjvbdEJgivXjA
-DncKjvbdemGWgMjL
-DncKjvbdCDpBVjMf
-DncLKvbdmoyxukZC
-EOcLKvbdtkwwBTaX
-DoCkKvbdLqwMzUpz
-DncLKvbdqFdFUWBI
-EPDLKvbdZyEJmblS
-EOcKjvbdEzsqFMCi
-DoCkKvbdcarmSATm
-DncLKvbdFfJqmiTq
-DncLKvbdKQzEoGNe
-DoCjjvbdUaCRTRSZ
-EOcLKvbdqZOhGqEY
-DoCkKvbdZisIQGaf
-DoCkKvbdeFOrBwCj
-DoDLKvbdmIctQtqa
-EObkKvbdxVMdqYkn
-DncKjvbdwygfFxFS
-DoCkKvbdRWnEDLhD
-EOcKjvbdmRyUyrci
-DoCkKvbdWXIwvDeH
-EPDLKvbdRXODcLgc
-DoDLKvbdBsBDUGWr
-EOcKjvbdEvYopNJe
-DoCjjvbdBvzdIdov
-DoCkKvbdyzeNrIJI
-EObkKvbdCJKbKhej
-EObjjvbdQccBQQcr
-DnbkKvbdxZgeewdr
-DoDKjvbdqcdhpNua
-DoCjjvbdeJjSVtzn
-DncKjvbddneTKssr
-DnbjjvbdZxcjNbkr
-EPCjjvbdZisIPfaf
-EPCkKvbdkyTRrxft
-DncKjvbdVwIxVcdg
-DncLKvbdIxTagkpp
-EPCjjvbdbrbjtEJa
-DncKjvbdkCkjqHUg
-DoCkKvbdUxgsyjnn
-EObjjvbdUaCRSprZ
-DnbjjvbdMJCLpxAS
-DncLKvbdliEUQuRa
-EPCkKvbdANHxrvzY
-EPCjjvbdeAURMwjG
-EPDKjvbdZoOIeEzK
-DoDKjvbdmuVZkJqf
-DncLKvbdaNLCTUlg
-DoCkKvbdnQZxvLYb
-DncLKvbdhficZWJu
-DncKjvbdatbHYLUI
-DoCjjvbddndrjtUS
-EOcLKvbdsBfMkgKy
-DnbjjvbdBiKakIfK
-DnbjjvbdSQTfjFcw
-DoCjjvbdmoyxvKyC
-DoCkKvbdGcjuibKK
-DnbkKvbdZQldiMeR
-EObkKvbdqquKnKaN
-DoCjjvbdZRNEhldq
-EPCjjvbdBiKbLJFj
-EPCjjvbdyXhjCPyk
-DncLKvbdtTSSxzEc
-EPCjjvbdnCJwXnmu
-DoDLKvbdbBWEfQPw
-EOcLKvbdemGXHNKL
-DoDLKvbdmfdxMnGy
-EOcLKvbdTqQntthN
-EOcLKvbdrMyixlIJ
-EOcLKvbdVUMselWK
-EOcLKvbdBvzchePv
-DoCjjvbdbVCHXjsh
-EPCjjvbdZRMdhleR
-EOcLKvbdhbObeXRR
-EPCkKvbdFWZPpMie
-DncLKvbdXFyZtAOs
-DnbkKvbdTqQoUuHm
-EPCjjvbdCSaDUFvr
-DoDKjvbdQZNAHTSK
-EOcLKvbdmoyyVkZC
-DoCkKvbdGLErbhMu
-EOcLKvbdtvNwjRTA
-EObkKvbdFjdsDINV
-EOcKjvbdeOdsLUUS
-DncKjvbdMtrrKmAX
-EObkKvbdBsBCtGWr
-EOcLKvbdVBCRTRSZ
-DoDKjvbdKQydoFme
-DncLKvbdnHFXmOGy
-DnbkKvbdGAnqYizm
-EOcLKvbdjlakzEfo
-EOcKjvbdegkWSOQg
-DoCjjvbdtkwwAsaX
-EPCkKvbdeKKSWUzn
-EObjjvbdrRtjnLBN
-EPCkKvbdeATqMxKG
-DnbkKvbdZMRdTmlN
-DoDKjvbdNsUWGeVQ
-EObjjvbdyXiKBpZk
-EOcLKvbdJKEAJpHE
-DoDKjvbdzQoNJJwA
-DoCkKvbdwygeewdr
-EObkKvbdsCGNMHKy
-EOcLKvbdlhdUQuRa
-EObjjvbdyNsHwsIc
-DoDLKvbdWRnXbFLc
-EObjjvbduCcUvvPP
-EOcLKvbdrEEhonWB
-EPCjjvbdRjyFtgKs
-EPCjjvbdkNCLzFGo
-DoCkKvbdRDbaPpcr
-DoDKjvbdQdCaQQdS
-DncKjvbdwyhFexFS
-EPDLKvbdBhjakJGK
-EPDKjvbdaNKaruMg
-EObkKvbdzQnliJwA
-DnbjjvbdptTfrSLU
-DoDKjvbdFWZPpNJe
-EObkKvbdZxcjOCkr
-DoDKjvbdehLWRnQg
-EOcLKvbdcSbkUEKB
-EObjjvbdbUafxLTh
-EObkKvbdBcpAvKNG
-DoDLKvbdySmiNSBg
-DncLKvbdmIdUQuRa
-EPCkKvbduDDUvuoP
-DoDLKvbdMtrqjmAX
-DoDLKvbdVZHtZkOn
-EOcLKvbdiZuGLpnG
-EOcKjvbdxmrgxShc
-DoCjjvbdMpYQvNfs
-EOcKjvbdCIkCKiFj
-EPDLKvbdaaVdepPw
-EObkKvbdXFyZtAOs
-EPDLKvbdbKlFnnDA
-DncLKvbdqGEFTuaI
-EOcKjvbdqFcdsvAh
-EPCkKvbdcSbkUDjB
-DncKjvbdrJAJeMoF
-EObjjvbdZMRdUNkm
-DncKjvbdCEPaVjNG
-DnbjjvbdptUHSSLU
-EPCkKvbdUtNTekuj
-DoCkKvbdVqmwadlD
-EObjjvbdCIkBjiFj
-EOcLKvbdbVCGwkUI
-EObjjvbdFfKSNiTq
-EPDKjvbdJXtCHlRQ
-EPDKjvbdTvMQJtBR
-EPCjjvbdZMRdTnLm
-EPCjjvbdemGXGljL
-EPDKjvbdxmsHxTJD
-EOcKjvbdiVZdvrVC
-DnbkKvbdmSZUzSdJ
-EPCkKvbdUaCRTRSZ
-DncLKvbdoAKztIDn
-EObjjvbdHffyyXxH
-EPCkKvbdaMjbStmH
-EObjjvbdZyDinDMS
-DoDKjvbdjlbMZdgP
-DncKjvbdQwOEDMHc
-DncLKvbdGLFSbgmV
-EPCkKvbdjvXOECXw
-DoCkKvbdSBceLhyL
-DoDLKvbdEvYpPmKF
-EOcKjvbdrbFlkfkZ
-EPDKjvbdTvMQJsaR
-DncLKvbdjvXNcaxX
-DnbkKvbdijGIKNXr
-EOcLKvbdiHJcZViu
-DoCjjvbdlqxuZsDi
-DnbkKvbdhuZeXRtb
-DncLKvbdACqxJzJQ
-EObjjvbdjlbLydgP
-EPDKjvbdxZgefXdr
-EOcKjvbdSCEFLiYk
-EObjjvbdKefICApu
-EPDKjvbdjlbLyeGo
-DncLKvbdbAvEepQX
-EPCkKvbdrSVKnLAm
-DncLKvbdZjTHpHBf
-DnbkKvbdCWzdIdov
-DoDLKvbdxUmFQyLn
-DnbkKvbdxVNFRYkn
-DoCkKvbdZisHpHCG
-DoDKjvbdwkXEHzzG
-DoCjjvbdSPtHJedX
-EOcLKvbdBiLBkIej
-DoCkKvbdiLdcnVCy
-DnbkKvbdlhcsqUqa
-EPCjjvbdwzIGFxEr
-EPCkKvbdySmiNRag
-DncLKvbdHEKujCKK
-EPDLKvbddeOrCXDK
-DoDLKvbdNGbolpUk
-EOcLKvbdtlYXBTaX
-EOcLKvbdqwQLcIyR
-EObjjvbdIrxaSlxM
-EObjjvbdbrcKtEKB
-EOcKjvbdpxngfqDx
-DoDLKvbdKfFhCApu
-DoDLKvbdJvUfEEfi
-DncKjvbdsQWOibuf
-DoCjjvbdHgGyxxXg
-DoCkKvbdZHWdAPTJ
-DncKjvbdauBgYLTh
-DoDLKvbdJYUCIMRQ
-DncKjvbdbrbjtEJa
-DnbjjvbdemFwHNJk
-DnbkKvbdBvzcheQW
-EPCkKvbdJqZePGNe
-EPCkKvbdSKxeuGkT
-EPDLKvbdIryBTMxM
-EPCjjvbdwWlAuaVu
-EOcLKvbdyTOJNRbH
-EPCjjvbdQvmdClID
-DnbjjvbdyTOJMqag
-DncKjvbdrXQMDJYq
-EPCkKvbdGdLVjBij
-EOcLKvbdjJehJmXr
-DnbkKvbdCJKakJGK
-DoCjjvbdLrWlzUpz
-EPCkKvbdhzVFlRNf
-DoCjjvbdRDcApRES
-EObkKvbdzROmJKXA
-DncKjvbdxUmFRYlO
-EPCkKvbdURQoVVIN
-EPDLKvbdVZHtZkPO
-DnbkKvbdatafwjsh
-EObjjvbdNrtWGdtp
-DoDLKvbdBiLCLJFj
-EOcKjvbdmgFXmOHZ
-EObjjvbdZRMeImEq
-DoCjjvbdiMEdNtcZ
-DnbjjvbdgFkzNfgA
-DnbjjvbdGKdsDHmV
-DncLKvbdIxUBhMRQ
-DoDLKvbdjSzhrjiz
-DoDLKvbdpyPHgRDx
-DoDLKvbdqYoIGpdY
-DoCkKvbdUQqPUuHm
-EPCkKvbdBraDTfXS
-DncKjvbdNrtWGeUp
-DncKjvbdJqZdnenF
-EPCjjvbdCWzdIePv
-DoDKjvbdrXPlDIxq
-EPDKjvbdauBgYLUI
-EPCjjvbdQmXbYnUz
-DoCjjvbdGGJqnJUR
-EPDLKvbdkVvnEBww
-EPCjjvbdTukoitBR
-DoCjjvbdRkZFtgLT
-DoDKjvbdEuyPpMie
-EPCkKvbdSLYfUgLT
-DnbjjvbdIwtBglQp
-DnbkKvbdznpQeDMY
-EOcKjvbdznpRFCkx
-EPDLKvbdtumwjQsA
-DoDLKvbdBhjajiGK
-DoDKjvbdhlFDmuDZ
-DnbkKvbdqquKnKaN
-DncLKvbdMowqVmfs
-EOcKjvbdqrUjnLAm
-EObjjvbdqwQMDIyR
-EPDKjvbdnCKXYPOV
-DnbkKvbdHffyyXxH
-DoCjjvbdlZSrTZGt
-DoDLKvbdznpRFDMY
-EPDKjvbdWWiXvDdg
-DoDKjvbdRWnEClID
-DnbjjvbdJcKCqKDY
-EPDKjvbdJbjDQicY
-DncLKvbdhaoDEwRR
-DncLKvbdvAdZSoEh
-DncLKvbdeEnrCWbj
-DoDKjvbdVvhwvDeH
-EOcKjvbdVAapsQqy
-EPCkKvbdxnTIYSiD
-EPCkKvbdrouoJbuf
-EObjjvbdePEsKtUS
-EPDLKvbdirziSkJz
-DnbjjvbdhaoCdvqR
-EPCkKvbdGZVVAdYC
-DncKjvbdtbbuWuoP
-DoCkKvbdLFehCBRV
-DoDKjvbdLZRJrztf
-EObkKvbdkHflGFmk
-EOcKjvbdJYUCIMQp
-EPDLKvbduCcVXWOo
-EPCkKvbdptTfqqkU
-DoDKjvbdGQATWgGZ
-DncKjvbdEztQeMCi
-EObkKvbdZtJJZETO
-DoCjjvbdZsiIyETO
-EObkKvbddndrjstS
-EOcLKvbddeOqbXDK
-DnbkKvbdCTBDUGXS
-EPDKjvbdQlwayOUz
-EPCjjvbdlqyUzTEJ
-DoDLKvbdhtydvrUb
-EOcKjvbdlZTSSyGt
-EOcKjvbdmJDtQuSB
-DnbjjvbdtSqsZZeD
-DoDLKvbdUaBpsRSZ
-EPDKjvbdLGFhBaRV
-DnbkKvbdSBcdkhxk
-DoCjjvbdDoDKkXDE
-DoDKjvbdwyhFfYFS
-EPDKjvbdOEctJIjd
-EPCjjvbdEObjkWcE
-EPDLKvbdhtzEvquC
-EObkKvbdZjShQHCG
-EPCjjvbdmIctQuRa
-EPCkKvbdVwIwucdg
-EOcLKvbdADRxJzJQ
-EOcLKvbdWWiXvEEg
-EPCjjvbdTAFIhBoE
-EPDLKvbdZLqdTnMN
-EPDLKvbdZQldhmEq
-EOcKjvbdLLBIWAJy
-DncLKvbdrMzKYlIJ
-EPCjjvbdzitoodSt
-EPDLKvbdLFehCAqV
-DoCkKvbdrMyiyMHi
-EPDKjvbdkVvmcaxX
-EOcKjvbdmpZxvKxb
-EPCkKvbdliDtRUrB
-DncLKvbdkxsRsYft
-EPDKjvbdTqROuVHm
-EPCjjvbdSQTgJedX
-EPDLKvbdHlBznXRL
-DncKjvbdQdDBQRDr
-EPDLKvbdliDsqVRa
-DoDKjvbdjgflFfOL
-EPDKjvbdeEoSCWbj
-DnbkKvbdfSBWzkcP
-EObkKvbdmIcspuSB
-EPCjjvbdvAdZTPEh
-DoCkKvbdIGfyxwxH
-DnbjjvbdWWiYWDeH
-EObkKvbdZQleImFR
-DncLKvbdQwNdCkgc
-EOcLKvbdQdDBPqES
-DnbjjvbdrpWPJbuf
-DoCkKvbdTulQKTaR
-DoDLKvbdeUAUASlv
-EPCjjvbdZQmFJNEq
-DncLKvbdVBBqSqSZ
-EOcKjvbdqceJPmvB
-DncLKvbdZtIiYcrn
-EOcLKvbdJSxaSmYM
-DoCkKvbdqqtkOLBN
-EObkKvbdgFkymfgA
-DnbjjvbdVqmwadlD
-DncLKvbdsBfNMGkZ
-EPDKjvbdEPDKjwCd
-EObjjvbdHDjvKBjK
-DncLKvbdCTAbsevr
-EObkKvbdFxuUaEXb
-DoCjjvbdcyyQYZQb
-EObjjvbdZsiIxdSn
-EPDLKvbdZQmEhmEq
-DnbkKvbdxnTIXriD
-DncKjvbdfHkVrORH
-EOcKjvbdddoSCXDK
-EPCkKvbdhanbdvpq
-EOcKjvbdRyihTDWA
-DnbjjvbdajkeoODA
-EOcLKvbdlhdTpuSB
-EPDLKvbdhgJbxuiu
-EPCjjvbdnHFXmNgZ
-EPCkKvbdpecdsvAh
-DnbkKvbdVZIUZjnn
-DncKjvbdbAvFGPpX
-DnbjjvbdkMalZeHP
-EOcLKvbdYSlAmUOx
-DoCjjvbdHDkWKCKK
-EPDLKvbdaRecHsek
-EPCjjvbdJXsagkqQ
-EObjjvbdRMwbZNtz
-EPCkKvbdrbGMlHKy
-DncLKvbdKfGICApu
-EPDLKvbdUtNTfLvK
-EPCkKvbdMJCMRYAS
-EOcLKvbdCJKbLJFj
-DoDKjvbdfpBzvcxI
-EObkKvbdYpldhmFR
-EOcLKvbdSPsfiecw
-DoCjjvbdHEKvKCKK
-DnbjjvbdUGzmkwVe
-DnbjjvbdfMfXGmJk
-DnbkKvbdZoOIeEyj
-EObkKvbdZnmhdeZj
-EOcKjvbdTkuoBVoJ
-EPCjjvbdGKdsChMu
-DoDLKvbdJYTahLpp
-EPCjjvbdbhmJkFwY
-DoDLKvbdkIHMGGOL
-EPDKjvbdZsiIxdSn
-EPCjjvbdMgCpNQUk
-DncLKvbdjblKqGtg
-DncLKvbdOYOuzdNt
-DncKjvbdTvMPjTaR
-EPDLKvbdiiehKNXr
-DoCjjvbdZdxGzghb
-DoDLKvbdeOdsKssr
-DoDLKvbddBsMrAUN
-DoCkKvbdxxIjBozL
-DoDKjvbddoErkUTr
-EOcLKvbdwzIFeweS
-DoDLKvbdREDBQRES
-EObkKvbdhlEdOUby
-DoCjjvbdNPxRWNgT
-DoDLKvbdZLqctNlN
-EObjjvbdbUbHXkUI
-DnbkKvbdhtydwSVC
-EPDKjvbdeUAUASmW
-EObjjvbdhgKDYvJu
-EOcLKvbdZnmhddyj
-DoDLKvbdUVlQKUAq
-DoDKjvbdDihJvXjA
-DnbkKvbdZLrETmlN
-EPCjjvbdxxJJbQZk
-EPCkKvbdrounjDVf
-DoCjjvbddiirVtzn
-DoDLKvbdmttyjiqf
-DncKjvbdfHjvSNpg
-DoCjjvbdmRxuZsEJ
-DoCkKvbdjAQGaQGj
-DncLKvbdnVUzLJrG
-EPCjjvbdLAjgNCXq
-DoDLKvbdqmZixlHi
-EPDLKvbdVUMsekvK
-EPDKjvbdrMzKZMIJ
-EPCkKvbdKDKCpicY
-EOcLKvbdwtmEqZMO
-EPDLKvbdmgFXlnGy
-DncKjvbdyTNhlqbH
-DncKjvbdnHFXlnHZ
-DoDLKvbdTqROuUgm
-DoDKjvbdRMwbZOUz
-EPDKjvbdRMwbYmtz
-DoDKjvbdZnmheEyj
-EPCkKvbdbBWEfPow
-DoDKjvbdQwNccLgc
-DoCjjvbdhtzFWqtb
-DoDKjvbdRotHKGEX
-DncKjvbdZsiJZETO
-EObjjvbdaNKbStlg
-DoCkKvbdsZlQTAhO
-EObjjvbdjhGlGGNk
-EObkKvbdQdDBQQcr
-DoDKjvbdMtrrLNAX
-EPCjjvbdRotHKGDw
-EPCjjvbdqZPIGqDx
-EOcLKvbdiGicZViu
-DnbjjvbdJvVGEFGi
-DoCkKvbdKNAEZfuB
-EPDLKvbdLZRJrzuG
-DnbkKvbdhytfLpnG
-EPDKjvbdRbEEkiYk
-EOcLKvbdcJMjLFvx
-DncKjvbdFfKRnItR
-DoDLKvbdegjurORH
-DnbjjvbdEPDKjvcE
-EPCjjvbdkHgLeenL
-DncLKvbdZnmheEzK
-DncKjvbdZjSgpHCG
-DoCkKvbdbBVdeoow
-DoDLKvbdZQmEhleR
-EPDLKvbdpxoHfpcx
-EPCkKvbdSPtGjGEX
-DncKjvbdRbDeLhxk
-EObkKvbdrpWOibvG
-DnbjjvbdfIKurNpg
-EPDLKvbdZyEKNbkr
-DoDLKvbdwXMAvBWV
-EOcLKvbdWWiXvDdg
-EOcKjvbdelfWfljL
-DncLKvbdjuvnEBxX
-DncLKvbdliDspuRa
-EObjjvbdVTlsekuj
-DoCjjvbderAvzlDP
-EPDKjvbdNeDtIhkE
-Dnbjjvbddwyssqez
-EObkKvbdGGKRnItR
-DoCkKvbdHbLzEzAD
-EPCkKvbdTvMPjUBR
-EObjjvbdTAEiIBoE
-DoCjjvbdRjxfUgLT
-DnbkKvbdnUuZkKRf
-EPDLKvbdjmBkydgP
-EObkKvbdNeDsiIjd
-DncKjvbdrounjDWG
-DnbjjvbdrWokbhxq
-DoDLKvbdsPvPKDWG
-DncKjvbdZdwfzgiC
-EOcLKvbdZLqdUNlN
-DoCjjvbdkDMLRHVH
-EPDKjvbdirziSjiz
-EObkKvbduDDUvuno
-DoDLKvbdkHgMGGOL
-DncLKvbdhkdcmuCy
-EObkKvbdCJLCLIej
-DnbkKvbdeFPRawCj
-DncKjvbdsQVoKDVf
-EPDLKvbdRXNccLhD
-EObkKvbdFxttaDxC
-EObkKvbdqrVKnKaN
-EPCjjvbddoEsKtUS
-EObjjvbdzaAOffbM
-DoCjjvbdWSNxBdlD
-EPCjjvbdqlzKYlIJ
-EOcLKvbdQdDApRDr
-DncKjvbdczZPwyRC
-EOcLKvbdtlXwBUBX
-EOcKjvbdmgFYNOGy
-DoCjjvbdKVtfEFGi
-EObkKvbdrNZjZLgi
-EOcKjvbdliETqVSB
-EOcKjvbdbVBgXkUI
-DncLKvbdNHDPmPtk
-DnbjjvbdjlakzEfo
-EOcKjvbdVUNTfLvK
-EPDKjvbdTXjkmzjx
-DncLKvbdrylQTBIO
-EPCkKvbdJpzEoGOF
-DncKjvbdFeiqmhtR
-DncLKvbdZnnJFFZj
-EPDLKvbdlrZUzTEJ
-EPDKjvbdLFfICBRV
-EPCjjvbdcyxpXyRC
-DoDLKvbdQdCaQQcr
-DncLKvbdZsiJZDsO
-EObjjvbdzQoNIjXA
-DncLKvbdVqmxBdlD
-DoDKjvbdRjxfUgLT
-EObjjvbdWIYVxHYz
-DoCkKvbdIGfzZXxH
-DncKjvbdxsNhlqag
-DoDKjvbdFWYopNJe
-EPDKjvbdVBCRTRSZ
-EPDKjvbdwyhFfXeS
-DoCjjvbdziuPocsU
-EPDKjvbdYSkaNUPY
-EObjjvbdznopdcLx
-EOcLKvbduMYWaUBX
-EPDKjvbdnPzZWKyC
-EObkKvbdZxcimbkr
-EObkKvbdBhjbKiFj
-EOcLKvbdjuwNdBww
-EPDKjvbdmbKWxOnV
-DoCkKvbdnHFYNNgZ
-DoDLKvbdrMzKYkhJ
-EOcLKvbdqdFIpNvB
-EPDKjvbdcScKtDjB
-EOcLKvbdygZMAMdw
-EOcLKvbdsCGNLgLZ
-DoDLKvbdaMkBsUlg
-DncKjvbdlZSqsYft
-DnbkKvbdnVUzLKRf
-DoCkKvbdnHFXlmgZ
-EPDKjvbdxZgfGYFS
-DoCkKvbdxwiKCPzL
-DnbkKvbdBcpAvKMf
-DoCjjvbddZyQXxpb
-DncLKvbdzQnmIjXA
-EPDKjvbdFWZQQMjF
-DnbjjvbdMgDQMpUk
-DncLKvbdOFDtIiKd
-DoDKjvbdKNAEZfta
-EOcKjvbdhyuGMQmf
-DnbjjvbdZnmhdeZj
-DncLKvbdhbOcFXRR
-EOcLKvbdvBEZSoEh
-EOcKjvbdYkrEUOLm
-EPCkKvbdNrtWGduQ
-EPDKjvbdZjSgpHCG
-EObkKvbdyzdmrHhh
-DoDLKvbdznpQdblY
-DncLKvbdZshhyDrn
-DnbkKvbdjvWmdCYX
-EOcLKvbdAMgxsWzY
-DnbjjvbdwzIGGXdr
-EPDKjvbdrNZixlIJ
-DoDKjvbdsQWOicVf
-DoDKjvbdjuvmdBxX
-EObkKvbdzHZMANFX
-DoDLKvbddjJqutzn
-EOcKjvbdwNWAMdFN
-DnbkKvbdTqRPUtgm
-EOcKjvbdVYgtZkOn
-EPDKjvbdNGcPlotk
-DnbjjvbdJbjDRJcY
-EPDLKvbdZtJIyESn
-DoDKjvbdtcCuXVoP
-DoCjjvbdZMSETmlN
-DoCjjvbdgGLzNfgA
-EPDKjvbdxKvcgzyf
-EObjjvbdrMzKZMIJ
-DncLKvbdMoxQumfs
-EPCjjvbdbhlikFvx
-DoDLKvbdRadFMJYk
-DnbjjvbdHgGzYxYH
-EObjjvbdVZHtZkOn
-DnbkKvbdakLfPNcA
-DoCjjvbdmfeXmOGy
-DoDLKvbdrRtjmjaN
-DnbjjvbdUxgsyjoO
-DnbjjvbdbhlikFvx
-EPDLKvbdRbEFMJYk
-EOcKjvbdRXNcblHc
-DnbkKvbdqmZixlHi
-DoCjjvbdrzLpTBIO
-DoCjjvbdILaznXRL
-EPDLKvbdRjyGVGkT
-EOcLKvbdehKurOQg
-DncLKvbdYkrDsnLm
-DoDKjvbdZisHpGaf
-DncLKvbdpyPIGpcx
-EOcLKvbdijFhKNYS
-EOcKjvbdMuSqkNAX
-EObjjvbdajlFnnDA
-EOcKjvbduLxXAsaX
-DnbjjvbdiiegjMwr
-EPCkKvbdiMEdNuCy
-EPCkKvbdqTtHSRkU
-EPCkKvbdIryBTNXl
-DncLKvbdFjdrcHlu
-EPDKjvbdZoOIeFZj
-DncLKvbdcbTNSATm
-DoDKjvbddePSCWcK
-DoDKjvbdZsiJYcsO
-DoDKjvbdpeceTuaI
-EOcKjvbdjhHMGFnL
-EOcLKvbdjcLkRGtg
-DnbjjvbdCJLCKiFj
-EPDLKvbdZsiIxdSn
-EObkKvbdVTlsekvK
-EObkKvbdCTAcTewS
-DoDLKvbdOYOuzcnU
-EPCkKvbdiUydwRuC
-DncLKvbdGQATXGey
-EPDLKvbdDjIJvXjA
-DncKjvbdpxoIHQdY
-EObkKvbdZMSDsmkm
-EOcLKvbdBvzchdov
-EOcLKvbdKRZeOenF
-DnbkKvbdwzIFfYEr
-DnbkKvbdSKyFuHKs
-EPDKjvbddCSlrATm
-EObkKvbdSCDeMIyL
-EPCjjvbdsCFllGjy
-DnbjjvbdHgGyyYYH
-DncKjvbdjKFgilwr
-DncLKvbdEvYoomJe
-EObkKvbdlhdTpuSB
-DoDKjvbdWWiYVceH
-DnbjjvbdLGGHbBQu
-EObkKvbdOXoVzcnU
-DnbjjvbdbsCjtDjB
-DnbjjvbdQwOECkhD
-DnbjjvbdMgComQVL
-DoCjjvbdRotGjFcw
-DnbjjvbdmajWxOmu
-EPCkKvbdbPfgDkzd
-Dnbjjvbdpxngfpcx
-DoCkKvbdBraCtGWr
-DncKjvbduDCtwWPP
-EPDLKvbdYzcFrKVy
-EObjjvbdbVBgXkTh
-DnbkKvbdyYIibPyk
-DncLKvbdUVlPitAq
-EObkKvbdbKlGOnDA
-DnbjjvbdrJAKFNPF
-EPDLKvbdLAjgMbYR
-DoCjjvbdSxLLmzjx
-DncKjvbdeEnqawCj
-EObkKvbdFWZQPmKF
-EOcKjvbdGdKvJbJj
-DnbkKvbdjcLjqHUg
-EPCjjvbdQvnDcLgc
-EPCkKvbddoFTLTtS
-DnbkKvbdZtIhyDrn
-EPDKjvbdBvzdIdpW
-EObjjvbdEYYLstUM
-EPCkKvbdyzdnSHiI
-EObjjvbdZLqdTmlN
-EPDLKvbdIHHZyXwg
-DoCkKvbdbVBfxKtI
-DnbkKvbdMpYRWOGs
-EOcKjvbdczYoxYqC
-EPCjjvbddwytTqez
-EPCjjvbduaDySoEh
-EObkKvbdTJZiqAAl
-EObjjvbdmoyyWLYb
-EPDKjvbdnPyxukZC
-EObjjvbdrWolDJZR
-DoCkKvbduCbtvvPP
-EPDLKvbdJbicQibx
-DncLKvbdHELVibJj
-DnbjjvbdKefHbAqV
-DncLKvbdsZkpTBHn
-DoDKjvbduCcVXWOo
-DnbkKvbdidkGtoAO
-DnbjjvbdrEFIonWB
-EPCkKvbdfpBzwEYI
-DncLKvbdwuNFRZMO
-EPDLKvbdrounjCvG
-DncLKvbdxxJJaoyk
-EPCjjvbdJmADzHUa
-EPDLKvbdqGEFTvBI
-EPDLKvbdyOShYTJD
-EPCjjvbdJutecdfi
-EPDLKvbdIMBznXQk
-DncKjvbdmoyxvKyC
-EPDLKvbdrXQMChyR
-DoCkKvbddwytUSFz
-DncKjvbdZjTHofbG
-EPDKjvbdGcjujCJj
-EPCkKvbdvBEYsOeI
-DncKjvbdCTAcUGWr
-EPCkKvbdmbKWwnnV
-DnbjjvbdpxnhHREY
-EObjjvbdlZTRsYft
-DoCjjvbdhkdcmtcZ
-EObjjvbdMfcPmPtk
-EPCkKvbdJXtCHkpp
-DnbjjvbdrSUjmkBN
-EOcLKvbdYSlBMtOx
-EObjjvbdznopdbkx
-DncLKvbdddoSCXDK
-DoCjjvbdOXnuzcnU
-EPCkKvbdZGwEAOsJ
-EOcKjvbdauCGwjtI
-EPDLKvbdNHDPmPuL
-EOcLKvbdNHCpMpUk
-DoCjjvbdmSYtysDi
-DncKjvbdFjeTDINV
-DncKjvbdNrtWHFUp
-EPCjjvbdmJETqUqa
-DncKjvbdEzsqEkcJ
-EOcLKvbdmoyyVjyC
-EOcLKvbdZMSETnMN
-EOcLKvbdBsAbtFvr
-EPCjjvbdJutfEFHJ
-DoCkKvbdiBoDEwRR
-EPDLKvbdZQmFImFR
-EPDLKvbdpfDdsuaI
-DnbkKvbdmbKXYPNu
-EObjjvbdjKGHjNXr
-EOcLKvbdpssgSRjt
-DoDLKvbdKRZePGOF
-DnbkKvbdfekymgHA
-DoDLKvbdiCOcFWqR
-DnbjjvbdiHJbyWKV
-DoDKjvbdsCGNMHKy
-DoCjjvbdGKeSbgmV
-DoDLKvbdkIGkfFnL
-DncKjvbdfILWRnRH
-DoDKjvbdGLEsChNV
-EPCjjvbdVrNxBeMD
-EPDKjvbdSLZGVHKs
-EPDLKvbdQlxByOUz
-EOcLKvbdMgDQNQVL
-DoDLKvbdrRtjnLAm
-EObjjvbdCIkBjhfK
-DncKjvbdDwwlTssl
-DoDLKvbdANIYsWzY
-DnbjjvbdxVMdqYkn
-DoCkKvbdzdynzdzQ
-DnbjjvbdxsNhmRag
-EObjjvbdzjVQPcrt
-DoCkKvbdbBWFFopX
-EPDKjvbdhfibxvKV
-DnbkKvbdegjvRmqH
-EPCjjvbdkNCMZdgP
-EOcLKvbdmtuZkJqf
-EObjjvbdemFvfljL
-DncLKvbdyYIibPyk
-EObjjvbdieKftoAO
-DncKjvbdvOszqKoU
-DncLKvbdVUNTelWK
-EOcKjvbdCDoaWKMf
-EPCkKvbdbsDKtDjB
-EPDLKvbdmSYuZsDi
-DncLKvbdwWlBWBWV
-EObjjvbdkVwOEBww
-EObkKvbdWSNwbFLc
-DnbjjvbdZRNFImEq
-DoDKjvbdrounjDVf
-EPDKjvbdCJKbKhej
-DncKjvbdsrrTYyeD
-DoCjjvbdQvnEDMHc
-DoCkKvbdGQASwGfZ
-EOcLKvbdfSBWzkbo
-DoDLKvbdRkZGVGkT
-EOcKjvbdyXhjCPzL
-EPCkKvbdbrbkTdJa
-EPDLKvbdsQVnibvG
-DnbjjvbdpyOgfpdY
-DoDLKvbdtunXiqTA
-EPDKjvbdqGDdsvAh
-DncKjvbdjEkHUoAO
-EPCjjvbdGQATXGfZ
-EOcKjvbdKDJcRKCx
-DncKjvbdhyuGMQnG
-DoCkKvbdYkrDsnMN
-DoCjjvbdaNKbSuMg
-EOcLKvbdrykpTAhO
-DnbkKvbdrSUkNkAm
-EPCjjvbdwzHeeweS
-DoDLKvbdSBdFMJYk
-DnbjjvbdqUUGrRjt
-DoDKjvbdzitoocrt
-EPDKjvbdxnShXriD
-DoCkKvbdVviXvEEg
-EObkKvbdFxuUaDxC
-EObkKvbdygZMAMeX
-DnbjjvbdiifHilxS
-EPDKjvbdZxcjODMS
-DoDLKvbdWWhxWEFH
-EPCjjvbdzoQQeClY
-EOcLKvbdptUHRqjt
-DoDKjvbdVviXudEg
-EPDLKvbdUQpnuVHm
-EPCjjvbdwzHfFweS
-EOcLKvbdZxcjNbkr
-EObkKvbdZnmhddyj
-DoDLKvbdvlvANDdm
-EOcKjvbdMfbolpVL
-EObjjvbdbAvFFpQX
-EOcKjvbdBdPaWJlf
-DncKjvbdqceIonWB
-DoCkKvbdtcDVWvOo
-DoCkKvbddoFTKssr
-DoDKjvbdaMkBruMg
-EPCjjvbdEuyPolie
-DnbkKvbdOEcsiJLE
-DncKjvbdHlBznWqL
-EPDKjvbdbhlijewY
-EObjjvbdfoazwDwh
-EOcLKvbdaNKbStlg
-DoCkKvbdqdEiQOWB
-DoCkKvbdTvLpKUBR
-DncKjvbdkNBkzFHP
-EObkKvbdFkErcHlu
-DoCkKvbdZshiYcrn
-EObjjvbdEJhJvYKA
-DnbkKvbdOTUWHFUp
-DoDLKvbdVhXvXfxz
-EPDLKvbdBdPaWKMf
-EObjjvbdFejRnJTq
-EPDLKvbdULvPBVoJ
-EPDKjvbdJzpFwdAN
-EPDKjvbdqwPkbiZR
-EPDLKvbdrEFIomua
-EOcLKvbdijFhJlxS
-DnbkKvbdYkrEUOLm
-DnbkKvbdIMBznXQk
-DncKjvbdZisHpHCG
-EPDLKvbdzjUopESt
-DnbjjvbdzjUpPcrt
-EPDKjvbdqZOgfpdY
-DoDKjvbduLxXAsaX
-EObkKvbdrMyiyMHi
-EPCkKvbdqTsfqrKt
-DoDKjvbdTfznMXVe
-EObkKvbddoErkUTr
-EOcLKvbdHELWKCJj
-DncLKvbdUVkpJtAq
-EPCjjvbdRMxBxmtz
-EPDKjvbdjEjftoAO
-EOcLKvbdYkrDsmkm
-DoDLKvbdajlFoNcA
-DoCjjvbdmJDtRUqa
-EPDKjvbdTqQoUuIN
-DnbkKvbdtcDUvvPP
-DncLKvbdrbGMlHLZ
-DnbkKvbdKfGHbApu
-DncLKvbdGFjRnIsq
-EPDLKvbdJzpGYEAN
-DoCjjvbdkySrSyHU
-EObjjvbdKVtfDdfi
-EPDKjvbdNrsugFUp
-DoCkKvbdNxOuzcmt
-DoDLKvbdDihJuxKA
-DnbkKvbdzdzOzdzQ
-DncKjvbdmSYuZrci
-EOcLKvbdptTfqqkU
-EPCkKvbdVUNTfLvK
-DoCkKvbdGdKujBjK
-DoCjjvbdzitopETU
-DoDKjvbdqvokbiYq
-EPDLKvbdGFjSOJTq
-DoDKjvbdliETqUrB
-DoDKjvbdZisIQGbG
-DoCjjvbdnQZyWLZC
-EOcLKvbdGdKujCJj
-EPCkKvbdaRfDIUGL
-EOcKjvbdauCHXjtI
-DnbkKvbdbQHHDkzd
-DoCjjvbddZxpYYpb
-EObkKvbdbBWEepPw
-DncKjvbdSLYfVGkT
-EObkKvbdVgxVxHYz
-DoCjjvbdfpBzwEYI
-DoDKjvbdmfdxMmfy
-DncKjvbdhancEwRR
-DnbkKvbdEASJMzXX
-EObjjvbdmfdwmNfy
-DnbjjvbdhbOcFXQq
-DoCjjvbdVgxVxGxz
-EPCkKvbdQcbaQQdS
-EPCjjvbdhbObeXRR
-EPDKjvbdePFSkUTr
-EPDLKvbdMoxQumgT
-DoCkKvbdIBkydzAD
-EOcLKvbdcasMrAUN
-DoCkKvbdUQqOttgm
-DnbkKvbdelevfljL
-EObjjvbdZeXfzgiC
-EPCjjvbdQYmAGrrK
-EObjjvbdxZhGFxFS
-EObjjvbdJuuGEEgJ
-DoDLKvbdEARhlyvw
-EPDKjvbdZdxGzhJC
-DoCkKvbdzRPMhiwA
-DoCkKvbdZxcinClS
-EOcKjvbdFyVVBEYC
-EOcLKvbdtbcUwVoP
-DncLKvbdlZSrTYft
-EObkKvbdaaVeGPow
-DncLKvbdEKIJvXjA
-DncLKvbdbhljKfWx
-EObkKvbdVhYVxGxz
-EPDKjvbdmpZxukZC
-DoDLKvbdnBivxOnV
-EObjjvbdRbEEkiZL
-EPCkKvbdZRNFIleR
-DoDLKvbdZyEJmblS
-DncKjvbdkIGkefNk
-EPDKjvbdRkZGVGjs
-DnbkKvbdiHJbyVjV
-EPDLKvbdFjeSbglu
-DncLKvbdqFcdtVaI
-EOcKjvbdGYuVAdYC
-DoCjjvbduaEZSneI
-DnbjjvbdKWVFdFHJ
-EObjjvbdGdLVjCJj
-DnbkKvbdpssgSSKt
-DoCjjvbdssRryZdc
-EPDKjvbdZisIQHCG
-EOcKjvbdCIjajhfK
-DoDKjvbdrafNMGjy
-EObkKvbdgQBzwEXh
-DnbjjvbdgQBzwDwh
-DncKjvbdCEQAvKMf
-EPCkKvbdiCOcFWpq
-EPDLKvbdLFfHbBQu
-EPCjjvbdJTYaSmXl
-EPCjjvbdRjyFuGkT
-DoCkKvbdjFKftoAO
-DncKjvbdmaiwXoNu
-DoCjjvbdVZITyjnn
-DoDLKvbdDxYLtUTl
-DnbjjvbdqvpLcJYq
-EOcLKvbdlqxuZsDi
-DoDKjvbdZshhyDsO
-DoCjjvbdGFjSOIsq
-DnbkKvbdcScKtEKB
-EPCjjvbdMpXqVmfs
-EPCjjvbduoTzpjoU
-DoDLKvbdYkqctNkm
-EObkKvbddoErjstS
-DnbjjvbduLxWaUAw
-DoCkKvbdRXODbkgc
-DoCjjvbdwzIGFweS
-DoCkKvbdZyEKOClS
-EObjjvbdiGjCxvJu
-EObkKvbdbiMijewY
-DoDKjvbdqrVKmkBN
-DoCkKvbdFyUuBEYC
-DoDLKvbdNsTufduQ
-DoDLKvbdEPCkKvcE
-DoDLKvbdNQYRWNgT
-DnbjjvbdNrtWGeUp
-DoCjjvbdPxmAGrqj
-EPDKjvbdKNAEZgVB
-EPDKjvbdmttzKjSG
-EPDKjvbdssSSxydc
-DoCjjvbdTlWPAuni
-EObjjvbdDHLegAzc
-EObjjvbdXnRAXtvU
-EObkKvbdKfFgaaQu
-EOcKjvbdhtzFXSUb
-EPCkKvbdJTZAsMwl
-EOcKjvbdQYmAGsSK
-DoCkKvbdjhHLeemk
-EOcLKvbdiifIJmYS
-EPDKjvbdLrWlzVQz
-DoCjjvbdxsOIlrBg
-EPDLKvbdNPxQvNfs
-DnbkKvbdIGfyxwxH
-DoCjjvbdjKFhKMwr
-DnbjjvbddjKSVtzn
-DoCjjvbdZoNiFEzK
-EPCjjvbdeFOqavcK
-DoDLKvbdEuxpQMie
-EObjjvbdZjShQHCG
-DoDLKvbdZMSDsmkm
-DoDLKvbdGYtuBEYC
-EPCjjvbdUaBprqRy
-EOcLKvbdmozZWLZC
-DncLKvbdUWLpKUBR
-EPCjjvbdqYnhHQcx
-DoDLKvbdUaBprpqy
-EPDKjvbdrzMQSaHn
-DnbjjvbdGdLWKCJj
-EObkKvbdfILVrNqH
-EPCjjvbdehKvRmqH
-EPDKjvbdOSsvGeVQ
-DncLKvbdxxJJaozL
-EPCjjvbdZLqctNkm
-EOcLKvbdZxcinCkr
-DncLKvbdkWWmcbXw
-DoDLKvbduCcVXWPP
-DncLKvbdyTNhlqbH
-DncKjvbdYTMAlsoY
-DoCkKvbdRosfjFcw
-EPDLKvbdDwxLsstM
-EOcKjvbdlZTRryHU
-DoCjjvbdNGbpMpVL
-EOcLKvbdYgWdAOri
-DoCjjvbdDxYLstTl
-EObjjvbdIwtBglRQ
-EOcKjvbdvPTzpkPU
-DoCjjvbduLxXAtBX
-DoCjjvbdiLeENuCy
-DnbjjvbdUaCRSqRy
-DnbjjvbdYpmEhleR
-EObjjvbdsPvOjDWG
-DoCkKvbdLFfICApu
-DncKjvbddxZstRez
-EPCkKvbdFyVVAdXb
-DoCjjvbdFyVVBDxC
-DoDLKvbdFeirNiTq
-EPCjjvbdxnSgxTIc
-EOcKjvbdAMgySwZx
-EObkKvbdkyTRryHU
-DoCkKvbdMRwMzUpz
-DnbjjvbdCWzdJEov
-DoCkKvbdUyITzLPO
-EPCkKvbdcSbjsdKB
-DoCkKvbdqceIonVa
-DoCkKvbdjmCMZeGo
-DncKjvbdfMewGljL
-EObkKvbdpfEEtVaI
-DoDLKvbdczZQYYqC
-DoDLKvbdRNXbYmtz
-EObjjvbdTvLojUBR
-EPCkKvbdtbcVXWPP
-DncLKvbdmSYuZrdJ
-DoDLKvbdTukpKUBR
-EPDLKvbdsQVoKCvG
-EPDLKvbdBraCtFvr
-EPDLKvbdZQmEiNEq
-EPCjjvbdrzLosAgn
-EPCjjvbdssRsZZdc
-DncKjvbdbAudepQX
-DncKjvbdcTDKscia
-DncLKvbdlqyVZsEJ
-EOcLKvbdbVCHXkTh
-EObkKvbdYTMBMsnx
-DnbjjvbdULvPAuoJ
-DoCjjvbddtAUASlv
-DoDKjvbdxUmEpxkn
-DncKjvbdQwOEDLgc
-DoCkKvbdSPsgKGDw
-DncKjvbdiCOcFXQq
-EPDKjvbdRkYfUfkT
-EObkKvbdKCjDRJcY
-DoCjjvbdZLqctOMN
-EPCjjvbdUWLpKTaR
-EPCjjvbdLqwMzVQz
-DnbjjvbdnBivxPNu
-EObkKvbdRpUHKFdX
-EPCjjvbdeATqNXif
-DoCjjvbdfILVrOQg
-DoDKjvbdNrtVfeUp
-EOcLKvbdNUrrKmAX
-EPCjjvbdrbFllHLZ
-DncKjvbdkDMLQgUg
-DoCkKvbdVvhwvDeH
-DnbjjvbdKeegaaRV
-DoDKjvbdcJMjKfXY
-DnbjjvbdZtJJYcrn
-DoDLKvbdyqOliJwA
-DoDLKvbdMgDPmPuL
-DoCkKvbdHffzZXxH
-DoCjjvbdZxdKNblS
-EPDKjvbdkDLjqGtg
-EPDKjvbdYzbeqjVy
-DncLKvbdTppnttgm
-EObkKvbdVYgtZjnn
-EPCjjvbdzaAOgHCM
-EOcKjvbdcyxoxZRC
-EPDLKvbdxnSgxTJD
-EObkKvbdfMfXHNJk
-EPDKjvbdunszpjoU
-EObkKvbdFfKRmhsq
-EOcLKvbdhtydwRtb
-DoDLKvbdYkrDsnLm
-EPDLKvbdGGKSOItR
-EPCkKvbduDCuXVno
-EPDLKvbdrEFJQOVa
-EPDLKvbdIjEAKQGd
-EObjjvbdIryArmYM
-DoDLKvbdYkqctOMN
-EPCkKvbdiZtekqOG
-DncKjvbdzdzOzeZp
-DoDLKvbdbiNKLFwY
-DnbkKvbdlhcsqUrB
-DnbkKvbdKyRJrzuG
-DoDKjvbdOFDtIiKd
-DnbjjvbdvvlBWBVu
-DnbkKvbdlrZUyrdJ
-EObkKvbdxZgeewdr
-DncKjvbdegkVrNpg
-DoCjjvbdrJAJeNPF
-EObjjvbdmfeXmOHZ
-DoCjjvbdNPwqVmfs
-DnbjjvbdnPzYvLZC
-EPDKjvbdZshiYcrn
-EOcLKvbdhgJcYvJu
-DoDLKvbdXrlAmToY
-DnbkKvbdwWlAvBVu
-DnbkKvbdjvWnEBww
-DoDLKvbdTYLLmzjx
-EOcKjvbdDihJuxKA
-DncLKvbdTfznLvue
-DoCjjvbdVgwvXgYz
-EObjjvbdsBfMkgKy
-EPCjjvbdUaBqTQrZ
-DnbjjvbdbhmJkGWx
-EPCjjvbdLBLGmCYR
-DoDKjvbdwjwEHzyf
-EPDLKvbdegkVrNpg
-DoCkKvbdJpzEnfOF
-EPCkKvbdFejSOItR
-DnbjjvbdTqQnuUhN
-EOcLKvbdUMVoAvOi
-EPCkKvbdSCEFLiZL
-EPCkKvbdnCKXYPNu
-EPDLKvbdZyEKNbkr
-DncLKvbdZisIQGaf
-EObjjvbdGLEsDHmV
-DoCjjvbdBcpAujNG
-EObjjvbdZRNFIleR
-DnbjjvbdVrOXaeLc
-EPCjjvbdHELViaij
-EOcLKvbdqcdhpNvB
-EPCkKvbdiZuFkqOG
-DoCkKvbdOSsufeVQ
-DoDLKvbduoTzpjnt
-EOcLKvbdTqRPUuHm
-DoDLKvbdCDpAuilf
-EOcKjvbdZMSDsnMN
-DoDLKvbdYqNFJMeR
-DnbkKvbdbAvFFpPw
-EOcKjvbdVqmwaeMD
-EPCkKvbdUyHsyjnn
-EPCjjvbdKeehBaQu
-DoCjjvbdZshiYdTO
-EObkKvbdTvMQJsaR
-EPCjjvbdjblKqHUg
-DnbkKvbdYlSDtOMN
-EObkKvbdrWpMCiZR
-EOcKjvbdUGzmlWue
-DncKjvbdFyUuAcwb
-EPCkKvbdLZQjSztf
-EPCjjvbdfjfzbfAE
-DncKjvbdFWZQQMie
-DoCjjvbdVgxVxHYz
-EOcKjvbdWWhxWEFH
-DoDLKvbdUWLoitAq
-DoDLKvbdzaAOffbM
-EOcLKvbdrXPkbiYq
-DoCkKvbdYzberKVy
-DncLKvbdIMBznWpk
-EPCkKvbdEPCkKwDE
-DnbkKvbdWWiYVcdg
-DoCkKvbdCWzchdpW
-EOcLKvbdjvXNcbYX
-EPDLKvbdSxLMNzjx
-DnbjjvbdhficYuiu
-DncLKvbdvmWAMdEm
-EObjjvbduaDyTOdh
-DncKjvbdwWlAvBWV
-DoDKjvbdVviYWDeH
-EOcKjvbdNsUWGdtp
-DoCjjvbdzjVPodTU
-EPCkKvbdmIcsptqa
-EPDLKvbdIHHZxxYH
-EPDLKvbdUyIUZkPO
-EObkKvbdCDpBWJlf
-EPDKjvbdWSNwaeMD
-DoCjjvbdACrXjZhp
-EPDLKvbdwuMdqYlO
-DnbjjvbdHlBznWpk
-DnbjjvbduaDyTPEh
-DnbjjvbdwuNFRZLn
-EObjjvbdajkfOnDA
-DnbkKvbdWWiYWEEg
-EPDLKvbdffLymgHA
-EOcLKvbdkDMKpfuH
-EPDLKvbdMoxQvOHT
-DnbkKvbdbKkenmcA
-DoCjjvbdhytfMRNf
-DoCjjvbdIsZAsNXl
-DoDKjvbdLiBkqYAS
-DncLKvbdyzdmrHiI
-DnbjjvbdemFvfmJk
-EOcLKvbdSCEEkiYk
-DoDKjvbdbiNKKevx
-DoDLKvbdaaVdeoow
-DnbjjvbdNGcQNPuL
-DncLKvbdQYmAGrrK
-EPDKjvbdrbGMkfjy
-EPCjjvbdZjShPfbG
-DnbjjvbdJmADyfuB
-DnbjjvbdhtzFWquC
-DnbjjvbdQvmdDMID
-DncLKvbdjvWnEBww
-EPCjjvbdxZgfGXdr
-EObkKvbdDihKWXjA
-EPCkKvbdZMSETnLm
-EPDKjvbdZLqcsnMN
-EObkKvbdqwPlDJZR
-DoDKjvbdZisIQGaf
-EObjjvbdjlalZeGo
-DncKjvbdxsOJMqag
-DoDKjvbdOFEUIhkE
-DoCkKvbdzitoodSt
-DncLKvbdVrNwaeMD
-DoCjjvbdezuyEiTw
-EPDKjvbdiCOcEvpq
-DoCjjvbdvvlAvAvV
-DnbjjvbdJuuFceHJ
-DoCjjvbdlYrrSyGt
-EPCkKvbdfILVrNqH
-DoDLKvbdxsOJNRbH
-DncKjvbdIwtBgkpp
-DnbkKvbdOTUWHEtp
-EPDKjvbdFejRnIsq
-DnbjjvbdVBCRTQrZ
-EPCjjvbdiMEcnUcZ
-EObkKvbdiZuGMRNf
-EOcKjvbdatbHYLTh
-DoCkKvbdmSZVZrdJ
-DoDKjvbdqTsgRqjt
-DoDLKvbdCEQBWKNG
-DnbjjvbdZtJJZESn
-DncLKvbdIHGzZXwg
-EPDLKvbdwtmFRZMO
-DoCjjvbdKDJbqJcY
-EObkKvbdatbHXkUI
-DnbkKvbdYqNEhleR
-EObjjvbdNHColotk
-EPDKjvbdegkWSNpg
-DoDLKvbdRjyFtfjs
-DoCjjvbddoEsKtUS
-EOcLKvbdsQWOjCvG
-DoCkKvbdvAcxsOeI
-EObjjvbdbAueGQQX
-EOcLKvbdxKwEHzzG
-DoDKjvbdqTtHSRkU
-EOcKjvbdOAIsUKSA
-EPCjjvbdWSNxCElD
-EPDLKvbdnCKWwoNu
-DncLKvbdEARiMzXX
-DoCkKvbdbAvEeoow
-EOcKjvbdhgJcYvJu
-DnbjjvbdTulPisaR
-DnbjjvbdIidAKQGd
-EPDKjvbdyOTIXrhc
-EPCkKvbdrbFmLgLZ
-EPCjjvbddeOqbXDK
-DncKjvbdRacdlJZL
-EOcLKvbdbsDKtDjB
-EPCjjvbdUyHtZkOn
-EObkKvbdyTOImSBg
-DncKjvbdtbbtwWPP
-EPDKjvbdKDKDRJcY
-EObjjvbdhanbeXQq
-EOcLKvbdvvlAuaWV
-EPDLKvbdVYgsyjoO
-EPDLKvbdKaKflawq
-EOcLKvbdCIjajiFj
-EObkKvbdUsmUGMWK
-EPDLKvbdIjEAJofd
-EOcLKvbdqBJFAWhE
-EPCkKvbdEJgivXjA
-DnbkKvbdYkqdTmkm
-EPCkKvbdliDsqUrB
-EObjjvbdKVtfEEfi
-EObkKvbdmgFYMmgZ
-EObjjvbdEARhlyvw
-DncKjvbdaRecHtGL
-DnbjjvbdNQYRVmfs
-EOcLKvbdFfKRnJTq
-DncLKvbdMgDQNQUk
-EObkKvbdHgGyyXwg
-EPCkKvbdCJKbKiFj
-EPCkKvbdBraDUGXS
-EPDLKvbdiMEcnVCy
-DoDLKvbdkCkkQfuH
-EOcLKvbdwtmFRZLn
-EPDKjvbdKefHbApu
-DnbkKvbdkxrqsZGt
-EPCkKvbdfIKvRmqH
-EOcKjvbdDnbkLWbd
-EPDLKvbdaRebhTek
-DoDLKvbdjuwODaxX
-DnbjjvbdREDBPpdS
-DncLKvbdjuwNcaww
-EOcKjvbdbiMjKevx
-EPDKjvbdqvpLcIyR
-EPCjjvbdijGIKMxS
-EPDLKvbdQmYCZNtz
-EObjjvbdCDpAvKMf
-EOcLKvbdJJdAKPgE
-DoDKjvbdUxgszLOn
-DnbjjvbdOEcshhjd
-DoCjjvbdUaCRSprZ
-EPCkKvbdxmrhYTJD
-EPDKjvbdICLydzAD
-EPCjjvbdKRZdoFme
-EObkKvbdNdctJIjd
-EPCjjvbdKVuFdEgJ
-EObjjvbdrXPlDIyR
-DoCkKvbdfMewGmKL
-DnbkKvbdIwsahMQp
-EOcLKvbdRaceMIxk
-EPCkKvbdcyxoxZQb
-EObjjvbdRkYeuGkT
-DncLKvbdbVBfwkTh
-EObjjvbdTppoVUhN
-EPCjjvbdhytfMROG
-EOcKjvbdUxgszKoO
-DoCjjvbdGLEsDHlu
-EObkKvbdegkVqmqH
-DncKjvbdkMbLyeGo
-DncKjvbdyzdmqghh
-EPCkKvbdGFiqnIsq
-EPDKjvbdpstGqqjt
-EPDKjvbdYkrDsmkm
-EPCkKvbdKaLGlbXq
-DoCkKvbdxwiJbPyk
-EPCkKvbdJcKDQibx
-EPCkKvbduDCuXWPP
-DnbjjvbdiGicZWKV
-DoCkKvbdsPunicWG
-DnbjjvbdKNAEZgVB
-EPDLKvbdnPyxujyC
-EObkKvbdJXsagkpp
-EObkKvbdNddUIiKd
-DnbjjvbdQwOEClID
-DnbkKvbdFVxpQMie
-EPCkKvbdVrNxBeLc
-EPCjjvbdUsmUGLuj
-EPDLKvbdGZVVBDwb
-DoCjjvbdmRyUyrdJ
-DncKjvbddZxoxZQb
-DnbjjvbdGKdsDINV
-EObjjvbdrafNLgKy
-DoCjjvbdJbjCqJbx
-DnbjjvbdlYsSTYgU
-DoCkKvbdQvnDblID
-DoDKjvbdssSTYzFD
-DncKjvbdmozZVkZC
-EPDKjvbdjbkkRGuH
-DoDLKvbdxmrgwriD
-DoDKjvbdfHkVrORH
-EPCkKvbdJuuFceHJ
-DoDKjvbdcbSlrATm
-EPCkKvbdeATpmXif
-DncLKvbdBiKajhej
-EPCkKvbdrNZixlIJ
-EPDLKvbdKVteceGi
-EObkKvbdzjVPodTU
-DoDLKvbdWSNxCEkc
-EOcKjvbdZxcimcLr
-EOcKjvbdZnnIeEyj
-DnbkKvbdmbKWxPOV
-EPCkKvbdZLrETmkm
-EPDKjvbdnUtyjiqf
-DoCkKvbdrWpLcJZR
-DoCkKvbdaMkCStmH
-DncLKvbdFVxpQMie
-EPCjjvbdrpWOicWG
-EOcKjvbdyOTIYShc
-EObkKvbdqrVLNkBN
-EOcLKvbdQvnDbkhD
-EOcLKvbdDigiuxKA
-DncLKvbddoErkTtS
-DoDKjvbdRWmdDLgc
-EPCjjvbdiHKDZVjV
-DnbkKvbdADSYKZiQ
-DnbkKvbdsPunibuf
-DoCjjvbdSPsfiedX
-EPDKjvbdJmAEZfta
-EOcKjvbdZMRcsnLm
-DoCkKvbdiLddOUcZ
-EObkKvbdqqtkOLAm
-DoDLKvbdYpmFImFR
-EObjjvbdVhYWXfxz
-DnbjjvbdMowqWNfs
-EObkKvbdVgwuwgYz
-DoDKjvbdDxYLsssl
-DnbjjvbdZtIiYcsO
-DnbkKvbdxwiKBpZk
-DoDKjvbdEuxpPmKF
-EOcKjvbdJcKDRKCx
-EObkKvbdUtNUFlWK
-EOcKjvbdjhHLfFnL
-DoCkKvbdSQTgKGDw
-DncLKvbdQccBQRDr
-DncLKvbdILazmwRL
-DoDKjvbdYTMBNUPY
-DoDLKvbdKaKfmCXq
-EPCjjvbdkIHMGGOL
-DnbjjvbdCIjbKhfK
-DnbkKvbdVgwuwfxz
-EPCjjvbdwtmFQxkn
-EPDLKvbdcyyQYZRC
-DoDKjvbdPyNAGsRj
-EObjjvbdSLYetgLT
-DoDLKvbdMRwNZuQz
-DncKjvbdFjdrcHlu
-DoCjjvbdZyDimbkr
-DnbkKvbdRXNdClID
-EObjjvbdEYYLtUTl
-EObkKvbdVqmxBdlD
-DoDLKvbdptTgRqkU
-EOcLKvbdBdPaWKMf
-EPCjjvbdiBncEvpq
-DoDLKvbdzQoNJKXA
-DoDKjvbdUQpoUtgm
-DnbkKvbdrzLpTBHn
-DoCjjvbdunszpkPU
-EPDLKvbdSZjHsCvA
-DncKjvbdRotHJfDw
-DnbkKvbdFejSOItR
-EOcKjvbdeFOrBwCj
-DoDLKvbdkVwNdCXw
-EPCkKvbdeOdrjtTr
-EPCjjvbdhuZdwRuC
-DnbkKvbdfILVqmqH
-DncKjvbdnPzYvLYb
-DncKjvbdHgGzZYXg
-DncKjvbdkVwNcaxX
-DoDLKvbdOAJSsjSA
-DncKjvbdOFDtJIjd
-EOcLKvbdVgwvYGxz
-EObkKvbdsQVnjDWG
-DoCjjvbdZjShQHCG
-DncKjvbdzoPpeCkx
-DoDLKvbdSLZFtfjs
-DnbkKvbdBsBCtFvr
-EOcLKvbdFyUuAcwb
-DnbjjvbdqUTfqrKt
-DoCjjvbdZxdJmcLr
-DncLKvbdmbJwYPOV
-EObjjvbdEObjkXDE
-EOcKjvbdaSFcIUGL
-EPCkKvbdqYoIHQcx
-EOcKjvbdfNGWgMjL
-DoCjjvbdbrcKtEKB
-EPCkKvbdvBDxsOdh
-DnbjjvbdtcCuXVoP
-DnbjjvbdrpWPKDVf
-EOcKjvbdwyhFfYFS
-EPCjjvbdnPyyWLZC
-EPDLKvbduMYXBUAw
-DoDKjvbduaDySoFI
-DoCjjvbdyXiKCPzL
-DncLKvbdGFjSOIsq
-DoDLKvbdeEoRbXDK
-DncLKvbdcTCjtDia
-DnbjjvbdnUuZjiqf
-DnbjjvbdjlakzFHP
-EOcLKvbdwWlBWAvV
-DnbkKvbdWWiXuceH
-EObkKvbdemGWfmKL
-EObkKvbdmuUykJrG
-DoCkKvbdmozYvKxb
-DncKjvbdQZNAGsSK
-EObjjvbdjblKpgUg
-DncKjvbdSZigsDWA
-EOcLKvbdZyEJmblS
-DoCjjvbdnCJwYOmu
-EPDKjvbdtkxWaTaX
-EPDKjvbdGZUuAcwb
-DoCkKvbdyfxlANEw
-EPCkKvbdTAFJIBnd
-DncKjvbdZLqctOMN
-DncKjvbdUMWPBWPJ
-EPCkKvbdDwwksstM
-EPDKjvbdEObjjvbd
-EObjjvbdWXJYWEEg
-DnbjjvbdpaIeAXIE
-DoCjjvbdqYoIHREY
-DnbjjvbdvmWAMceN
-EObkKvbdLFfHaaQu
-EOcLKvbdpaIeAWgd
-EPDLKvbdkCkkQgUg
-DnbjjvbdePErkTtS
-DnbkKvbdNGbomQVL
-DoDLKvbdEPCjkWcE
-DoCkKvbdehLWRnRH
-EOcKjvbdyXhibQZk
-EOcLKvbdZyEKOCkr
-DoCjjvbdkDLkRGtg
-DoDLKvbdkaNPNALA
-EObkKvbdrWpLbiYq
-DoDLKvbdfHkVqmqH
-DoDLKvbdEOcLKwCd
-DoDKjvbdrykpTBHn
-DncKjvbdxZgefYFS
-DnbkKvbdJpzFPFnF
-DoCkKvbdNGcPmPtk
-EPCjjvbdhzUelRNf
-EObkKvbdVTltFlWK
-DoCkKvbduaDxrneI
-EObkKvbdSQTgJfEX
-EOcKjvbdVhYVxHYz
-EOcKjvbdkCkkQgUg
-EObkKvbdqUUHSSLU
-EOcLKvbduLwwAtAw
-EPDKjvbdZLrETnMN
-EObkKvbdmttyjjRf
-DoDKjvbdYqMdiMdq
-DoCkKvbdkNBkzEfo
-DncKjvbdiLeDnUcZ
-DoDKjvbdZLrDsnLm
-EPCkKvbduVnYKRTA
-EPCjjvbdCIkCLJFj
-EPDKjvbdssRrxyeD
-DncKjvbdQwOEClHc
-EPCkKvbdwXLaWAuu
-EPCkKvbdUyHszKoO
-EPCkKvbdJYTagkqQ
-DoCkKvbdwuNFRYlO
-EPCjjvbdfHkWRmqH
-EOcKjvbddeOqbXCj
-EObkKvbdhficYujV
-EPCkKvbdmSYtzTEJ
-EPCjjvbdtkxWaTaX
-EPDLKvbdwygfGYEr
-EPDKjvbdmpZxvKyC
-DoCjjvbdpstGrSLU
-EPDKjvbdUtMtGLuj
-EOcKjvbdjlbLzFGo
-EObkKvbdkyTSTZGt
-EOcLKvbdLYpjSzuG
-EPDLKvbdyXhibQZk
-DncKjvbdptUHSRkU
-DnbjjvbdFfKRmhtR
-DoCjjvbdtbcUwVoP
-EPDKjvbdhyuFkpnG
-EPDLKvbdFpASwHFy
-EPCjjvbdRbDeLiYk
-DncLKvbdXmqAYUut
-EObjjvbdqlyjZLgi
-DoCjjvbdssSTYydc
-DnbkKvbdTIzJqABM
-EPCkKvbdxsOJNRag
-EPCjjvbdlhcspuSB
-EObkKvbdqUTgSRjt
-EOcKjvbdOEcshhkE
-EObjjvbdzjUpPdTU
-DnbkKvbdvwLaVaWV
-EPCjjvbdmoyyVkYb
-DoCkKvbdOFETiJKd
-EPCjjvbdeEnqawCj
-EObjjvbdmuUzKjRf
-EPDLKvbdVvhxVdFH
-EPCkKvbdaSGDHsek
-EPCjjvbdkySrTZHU
-EObjjvbdtAGqIABS
-EObkKvbdZyEJmblS
-DncKjvbdyTOJMrCH
-DncLKvbdFWYoolie
-DoDLKvbdTvMPjUAq
-EObjjvbdZLqctOLm
-DnbkKvbdmIctQuSB
-DoCkKvbdZGvdAPTJ
-DoCjjvbdkDMLRGuH
-DoDLKvbdnVUykKSG
-DoDKjvbdLGFhBaRV
-DncLKvbdxwiKBozL
-DncLKvbdWIYWXgYz
-DncLKvbdFkFSbglu
-DoDKjvbdIGgZxxXg
-DnbjjvbdEztRFMDJ
-DoDLKvbdZQldiNEq
-EOcLKvbdwWkaWAvV
-DoDKjvbdLBLHMawq
-DoDLKvbdkMbLzFGo
-EPDKjvbdREDAopcr
-DoCkKvbdZoNiEdyj
-EPDLKvbddneSkUUS
-DnbkKvbdSQUHJecw
-DoCjjvbdZshhxcrn
-DnbjjvbdRkZFuHLT
-EPDKjvbdwuNEqYkn
-DoDLKvbdemGXGmJk
-EOcLKvbdKWVGDeGi
-DoCkKvbdWSOXadkc
-EObjjvbdVTmTelWK
-DncKjvbdhkeDmuDZ
-EPCkKvbdRWnEDMID
-DnbjjvbdNQYRVnGs
-DnbkKvbdTfzmlWvF
-DoCkKvbdFpASvgGZ
-DoCjjvbdqTsfqqkU
-EObkKvbdUVkpKUAq
-DoDLKvbdrRtkNjaN
-EPCkKvbdrJAKEmOe
-DncKjvbdIGfyyYXg
-DnbjjvbdZLrDtNkm
-EObjjvbdiMEcmuCy
-DncKjvbdkyTSTZHU
-DncLKvbdBsAbtFvr
-DnbkKvbdrpWPKDWG
-DncKjvbdbBWFFoow
-DoDLKvbdxmsIXsJD
-DnbkKvbdehLWRnRH
-EObkKvbdiVZeXRuC
-DnbkKvbdOTUVfduQ
-DncLKvbdZjTIQHCG
-DoDLKvbdOSsugFVQ
-DoCjjvbdrafNLgKy
-EPDLKvbdNPxRVmgT
-EPDKjvbdHlBznXQk
-EPCkKvbdCEQBWKMf
-EObjjvbdtcDUwWOo
-DoCjjvbdZMSDtNlN
-DoDLKvbdvAcxrneI
-EObjjvbdIxUCILpp
-EOcKjvbdfSBWzkbo
-EObkKvbdShzKRAAl
-DnbjjvbdGZUuBDxC
-EObkKvbdqlzKYkhJ
-EPDKjvbdZyEKNbkr
-DoDLKvbdsrrTYzFD
-DoCkKvbdfSAvzkcP
-DnbjjvbdqlzKYlHi
-EPDKjvbdYTLaNToY
-EPCjjvbdjEjgUoAO
-EOcKjvbdTJZjRABM
-EObkKvbdYORAXtvU
-DoDLKvbdGKdrcHmV
-DoDLKvbdbrcLUEJa
-DncLKvbdqvpLcJZR
-DnbkKvbdFeiqnIsq
-EPDKjvbdZnnIeEzK
-EPCjjvbdnUtzLKRf
-DoDLKvbdDxXlUUTl
-DoDKjvbdiMEcnUby
-EObkKvbdYzbeqjWZ
-DncKjvbdTvLojUAq
-EOcLKvbdjuvmdBxX
-DnbjjvbdzoPpdcMY
-DoDKjvbdrovOibuf
-DoDKjvbdFWZPomJe
-DoDKjvbdqGDeUWBI
-DoCkKvbdWWiYVdEg
-EObkKvbdtvOXiqTA
-DnbjjvbdqZPIGpdY
-EObkKvbdLBKgNCYR
-DoCjjvbdLBKgNCYR
-EObjjvbdZsiJZESn
-DoCkKvbdTqROtuIN
-EPCjjvbdyfyMAMdw
-EOcLKvbdptTgSSLU
-DncLKvbdPxmAHTSK
-DnbjjvbdRkZFtfkT
-EPDLKvbdtlXvaUAw
-EPCkKvbdqBJFAWhE
-EPCkKvbdIidAJogE
-EPDLKvbdKQydoGOF
-EObkKvbdauCGwkTh
-EPCjjvbdNddUIiKd
-DoDLKvbdFfKRmhsq
-EPCkKvbdeEnqbXCj
-EObkKvbdJvVGDdfi
-DoDKjvbdWRmwaeLc
-EObkKvbdSCDeLiZL
-EPDKjvbdDoDLLWcE
-EPDLKvbdiMEcnUby
-DnbjjvbdLBLGmBxR
-EPCjjvbdZnmiEdyj
-EObjjvbdVhXuwgYz
-DncLKvbdUtNTfMVj
-EPDLKvbdKaKgMaxR
-DncKjvbdJcJbpicY
-DnbkKvbdSKyGVHLT
-DoDKjvbdzROlhjXA
-DnbkKvbdlrZUysEJ
-DoCkKvbdnQZyWLYb
-DoCjjvbdeFOqbWbj
-EOcLKvbdjgfkfGOL
-EObkKvbdiHJbyWKV
-DnbkKvbdGdLVibJj
-DoDKjvbdGLErcINV
-EPCjjvbdNGcPlpUk
-EOcKjvbdjFLGtoAO
-EOcKjvbdsBfMlGkZ
-EObjjvbdhtydvquC
-DoCjjvbdznpRFCkx
-DncLKvbdYSkaNUOx
-DoCjjvbdVvhxVdFH
-EPDLKvbdNeETiJLE
-DoDKjvbdcScLTdJa
-EOcLKvbdQwNdDLgc
-DoDLKvbdUMWPBWPJ
-DncKjvbdqFdEtVaI
-EObjjvbdhbPCeXRR
-DoCjjvbdKeehCApu
-DncKjvbdYNqAXuVt
-DoDLKvbdjmCLzFGo
-DoCkKvbdtlXwBUAw
-EObkKvbdwtmEqYlO
-EObjjvbdrovOjCvG
-EObkKvbdqrVLOLBN
-DoCjjvbdSBcdkhxk
-DncLKvbdrEEhomua
-EObkKvbdtbbtvuno
-EPDLKvbdZjShQGaf
-EPCjjvbdTAFJHbPE
-DnbjjvbdcScLTcia
-EObkKvbdbsDLUDia
-DnbkKvbdkyTSTYgU
-DncKjvbdySmhmSCH
-DoCjjvbdnBivxPNu
-DncKjvbdEXxLtTtM
-EObjjvbdZshhyESn
-DoDKjvbdkMbLzEfo
-EObjjvbdssRrxyeD
-DoDKjvbdcSbkTdKB
-EPDLKvbdHDjvJbKK
-DncLKvbdsQVnjCvG
-DnbjjvbdJSyBTMwl
-EOcLKvbddZxpYYqC
-EPCjjvbdrXQLcJZR
-DoCkKvbdnHEwlmfy
-EOcKjvbdGZUuBDwb
-EObjjvbdvOszqKnt
-EOcLKvbdRosgKFdX
-EPCjjvbdMpXqWNfs
-EPCkKvbdJbibqJcY
-DncKjvbdJvVFdEgJ
-EObkKvbdqwPkcIyR
-DnbkKvbdDwxMUTtM
-DncKjvbdtcDVXVno
-EPDLKvbdlZSrSxft
-DoCkKvbdKeehCApu
-EPDLKvbdQlxCYmtz
-EOcLKvbdYqNFJNFR
-DoCkKvbdnCKWwoOV
-EObjjvbdwzIFfYEr
-EOcKjvbdkDMLQfuH
-EPCjjvbdrSUjnLBN
-EPCkKvbdTfznMXVe
-EPCkKvbdZxdKNcMS
-DoCjjvbdJXsaglRQ
-DoCjjvbdNPwqWNgT
-DoCjjvbdLqwMzUpz
-EOcKjvbdCDoaWJlf
-DnbjjvbdlYsRsZGt
-DncKjvbdeOdsLUUS
-EOcKjvbdEvZQPmJe
-DoCkKvbdqBJFAXHd
-DnbjjvbdtkwwBUBX
-EObjjvbdLFfHaaQu
-DoDLKvbdbLMFoNcA
-EPDLKvbdiLdcnUby
-DnbkKvbdUQqPVUgm
-EOcLKvbdEOcLLXDE
-DoDKjvbdrEEhpOWB
-DncKjvbdkCkkQftg
-DncLKvbdMfbpNQUk
-DnbjjvbdTulQKUAq
-DoDLKvbdUtNUFkvK
-DncKjvbddndsKtTr
-EPDKjvbdliDsqVSB
-EPCkKvbdhbOcEvqR
-DoCkKvbdqceJQNua
-DoCkKvbdrWpLcIyR
-DncKjvbdrSVLNkAm
-DoDLKvbdyOShYTJD
-DncKjvbdyYJKBoyk
-DnbjjvbdZQldiNFR
-EPDLKvbdePEsKstS
-EPCjjvbdcScKtDia
-DncLKvbdxsOJNRbH
-EObjjvbdEYXlUUTl
-DoCkKvbdxUldqZMO
-EOcKjvbdRjxeuGkT
-EOcLKvbdqrVLNjaN
-DoCkKvbdDwwktUUM
-EOcLKvbdZQmEiNFR
-EPCkKvbdMSXMytpz
-DnbkKvbdnUtzKiqf
-DoCjjvbdREDAoqDr
-EPCjjvbdZyDinDMS
-EPCjjvbdiCPDEwRR
-EPCkKvbdmSZUzSci
-DoDKjvbdkWWmdCXw
-DnbkKvbdmJDsqVRa
-EPDKjvbdhzVGLpnG
-DoCkKvbdsPuoKDWG
-DoDLKvbdrylPsAgn
-EPCjjvbdsPuoJbuf
-EOcKjvbdrEFJQOVa
-EPCjjvbdEPDLLXCd
-DncKjvbdkVwOEBxX
-EPCkKvbdqGEFUWAh
-DncLKvbdtbcUvuno
-EOcKjvbdWIYWYGxz
-EPDLKvbdZLqcsmkm
-DoDKjvbdmaivwnnV
-DoCkKvbdOYPVzcmt
-DoCjjvbdVwIwvDeH
-DoCjjvbdYkrETmkm
-DoDKjvbdLFfHbAqV
-EObjjvbdkIHLefOL
-EPDKjvbdZjShPfaf
-DoCjjvbdehLWSORH
-DncLKvbdKfFgbBQu
-EObkKvbdsPunjDVf
-DncKjvbdiMEdNuCy
-DncKjvbdFfKSNhtR
-EOcKjvbdFVxpQNKF
-DncLKvbdfHkVrORH
-EObjjvbdKefIBaQu
-EPDKjvbduCbtvuoP
-EPCkKvbdGdLWKCKK
-DncLKvbdLAkGmBwq
-DncLKvbdZshiZESn
-DnbjjvbdySmhmSCH
-DoDKjvbdACqxJyiQ
-DncLKvbdmajXYOmu
-DnbjjvbdxVNFRZMO
-DnbjjvbdVqmxBdlD
-DnbkKvbdIGgZyYXg
-DncKjvbdddnrBvcK
-EPCjjvbdUGzmkwVe
-DncLKvbdaNLCTVNH
-DoCkKvbdWWhwucdg
-DncKjvbdkWWmcaxX
-DoDKjvbdaRfChUGL
-EPDLKvbdOEcsiJKd
-DoDLKvbdGLFTChMu
-EObjjvbdjmBkzFHP
-DncLKvbdrWokcJYq
-EObjjvbdDHMGHAzc
-EObkKvbdRyjITCvA
-DnbjjvbdWRnXbElD
-DoCjjvbdEARiNZvw
-DnbkKvbdRjyFtfjs
-DoCkKvbdMgDQNQVL
-DoDKjvbdCEPaWJmG
-DoCkKvbdUtNTfLuj
-DoDKjvbdNGcQMpVL
-DoDKjvbdZQmFImEq
-EObjjvbdyYIibPyk
-DoDLKvbdcSbjtDjB
-EPCjjvbdPxmAGsSK
-EPCjjvbdnUuZjirG
-EPCkKvbddijSVtzn
-EOcKjvbdxUmEqYlO
-EOcKjvbdxrmiNRag
-EPCkKvbdjmBlZeHP
-EOcKjvbdvBDySndh
-EObjjvbdliDsqVSB
-EOcKjvbdTvMQKUBR
-DncLKvbdRNXbYnUz
-DnbjjvbdyYIiaozL
-DoCkKvbdhbPDEwRR
-EPDKjvbdptUGrSLU
-DoDKjvbdFjeTChMu
-DnbkKvbdFVxoomJe
-EObkKvbdlYrrSyGt
-EPDLKvbdVZHszKnn
-DncLKvbdDwwktUUM
-DncLKvbdDnbkKvcE
-EPCkKvbdjJfHjMwr
-EPDKjvbdUtNTfMWK
-EObjjvbdbhlikGWx
-DncLKvbdKfFhCBQu
-DoDKjvbdVgwvXgYz
-EPDLKvbdiBoCdwRR
-EPDLKvbdzdzOzeZp
-EObkKvbdMoxRWNgT
-EPDKjvbdjvXNdBww
-EObkKvbdUtMsfLuj
-EOcLKvbdnUuZjjRf
-DnbkKvbduCbtwVoP
-EPDLKvbdGGKRmhsq
-EObkKvbdePEsLTtS
-DoCjjvbdSKyGUgLT
-EOcLKvbdRbDdlIyL
-DoDLKvbdNxPVzcnU
-EObjjvbdkCkkRGtg
-DncKjvbdVTmUFkvK
-DncKjvbdUsltFkuj
-EPDKjvbdSCEElJZL
-EOcKjvbdZxcjNcMS
-DoCjjvbdEJgjWYKA
-DncLKvbdREDBQRDr
-DncKjvbddoErjtUS
-EPDLKvbdADSYJyiQ
-EPDKjvbdatafxKsh
-EPDLKvbdkIGkeemk
-DoDLKvbdmRxtzSci
-DnbkKvbdTlWPAvPJ
-DncKjvbdjJegjMwr
-DoCkKvbdqTtHSSKt
-EOcKjvbdkMakzFHP
-DncLKvbddZyPwxpb
-DnbkKvbdTppnuUgm
-EObkKvbdnPyxukZC
-DoDKjvbdbiNJjewY
-EPDKjvbdJSyArlwl
-EPDLKvbdvvlBVaVu
-EOcLKvbdjJfIKMxS
-EPDLKvbdliETqVRa
-DoCkKvbdWXJXvEFH
-DncLKvbdiHKDZWKV
-EObkKvbdEXwktUUM
-EOcKjvbdRWnDcMID
-EPDLKvbdbhljKfWx
-DnbkKvbdVTlsfMVj
-DnbjjvbdZoOIdeZj
-DoDKjvbdDxYLtUTl
-EObjjvbdmIdTqUqa
-EPCjjvbdiZtekqNf
-DoDLKvbdMfcPmPtk
-EPDLKvbdKxpirztf
-DnbkKvbdEARhlzWw
-EOcKjvbdqiAJeMne
-DnbjjvbdUsltGMWK
-DnbkKvbdMoxRWNfs
-EPCjjvbdTqQntuIN
-EPDKjvbdLFfHbApu
-EOcLKvbdANIZSwZx
-DoCjjvbdSLZGUfjs
-DoDLKvbdJSyArlxM
-EOcLKvbddZxoxZRC
-DoDLKvbdRpTfjFcw
-EObjjvbdKefHbBRV
-EPCkKvbdjlakyeGo
-DoDLKvbdiBncFXRR
-EObkKvbdkHfkefOL
-DnbjjvbdfILVrORH
-DnbjjvbdbsDKtDia
-DoCjjvbdqiAKElne
-EObkKvbdEXxMTtUM
-DncKjvbdHfgZxxXg
-EPDKjvbdQvnDcMID
-DoDKjvbdCSaCsewS
-DncLKvbdSZigsDWA
-DnbkKvbdiUyeXSUb
-DnbkKvbdZRNFJMeR
-EPDKjvbdDxXlTstM
-EPCjjvbdkNBlZdfo
-DnbkKvbdhuZdvqtb
-DncLKvbdHDkWJajK
-EOcKjvbdhficZWKV
-DoDLKvbdxwiKCPyk
-EPDLKvbdZQleJMeR
-DoDLKvbdLrXMytpz
-DncKjvbdcTCjtEJa
-DnbkKvbdUMVnaWPJ
-DoCjjvbdnBjXYPOV
-EObjjvbduWNwjQsA
-DoCjjvbdRpUHJecw
-DnbkKvbdJYUBglQp
-EOcLKvbduoTzqKoU
-EObjjvbdZMRctNlN
-EObkKvbdziuPpESt
-DoDLKvbduLxWaTaX
-EOcLKvbdhgKDZWKV
-DnbkKvbdZQldhmFR
-EOcLKvbdcyyPxZQb
-EOcKjvbdRWnDcLgc
-DncLKvbdxZgfFweS
-EPCkKvbdyqOliJwA
-DnbjjvbdsPvPKCuf
-DoCjjvbdMgCpNQVL
-DncLKvbdOEdTiJKd
-EPDKjvbdEARiMyvw
-EOcLKvbdJbibqKDY
-DoCkKvbdeEnrCWbj
-DoCkKvbdGKdrcIMu
-DnbkKvbdUMWOaVoJ
-DoCkKvbdKaKgNCXq
-DnbkKvbdoAKztHdO
-EPDKjvbdDxXlUUTl
-EOcLKvbdFVxoomJe
-EOcKjvbdpyPHfpdY
-EPCjjvbdxwiJaoyk
-DoCkKvbdlqxtyrci
-EOcKjvbdfHkWRmpg
-DoCjjvbdkMalZdfo
-EPCjjvbdJpyePGOF
-DncLKvbdqUUHRqjt
-DoDLKvbdziuQPdSt
-DoDKjvbdBhjajiGK
-EPDKjvbdjcLjpftg
-EPDKjvbdVwJYWEFH
-DnbjjvbdNdcsiJLE
-DoCjjvbdQwODcLgc
-EOcLKvbdtkxXAtAw
-EPDKjvbdwMvANEEm
-DoCjjvbdqFdEsuaI
-EObjjvbdrSUjmjaN
-DoDLKvbdnGeYMnGy
-EOcLKvbdPyNAHTSK
-DnbkKvbdMowpvNgT
-DoCjjvbdGdLVibKK
-DoDLKvbdtcDVXVno
-EObkKvbdtlXwBUAw
-DoCjjvbdSPsgKGEX
-EPCjjvbdURQntuHm
-DncLKvbdrMyjZLgi
-EPDKjvbdwXMAvBVu
-EOcLKvbdRjxfUfkT
-DnbkKvbdGFjRnJTq
-DoCkKvbdbUbHYLTh
-EPDKjvbdoznEKxPA
-EPCjjvbdLiBlQxAS
-DncKjvbdfVzxPizs
-DnbjjvbdSKyFtgLT
-EPDKjvbdrXPlCiZR
-DncLKvbdhzVGLpnG
-EObjjvbdVwJYVdFH
-EPDKjvbdwXLaWBVu
-EPCjjvbdjhHMGFmk
-EObkKvbdKyQjSzuG
-DoCjjvbdmfeYNOHZ
-DoDLKvbdZirgofaf
-EOcLKvbdZoOIdeZj
-EPCkKvbdLFfHbApu
-EPCkKvbdjvWnEBww
-DoDKjvbdcScLUEKB
-DoCkKvbdkCkjqHUg
-DoDKjvbdyTNhmSBg
-DoCkKvbdkHgLfFnL
-EPCjjvbdzoQQdcLx
-DoCjjvbdOTTvHEtp
-EPCkKvbdznopeDLx
-EPCkKvbdGFjRmhtR
-EPCkKvbdUaCQrpqy
-EOcKjvbdnGeXmOHZ
-DoDKjvbdiCPDEwRR
-DoCjjvbdRbEFLiYk
-DncKjvbdRXOECkgc
-EPCjjvbdKWUedEgJ
-DncKjvbdDjIJvYKA
-DoDKjvbdyTOJNRbH
-DoCjjvbdePFTKtTr
-DoDKjvbdhtyeWrVC
-EPCkKvbdqvolCiZR
-DoDLKvbdapHHELzd
-EObjjvbdlhdUQtrB
-EOcKjvbdptUGrRkU
-EPCjjvbdqUTfqrLU
-EPCkKvbdcJMikGWx
-DoDKjvbdlhctRVRa
-EOcLKvbdANHyTXZx
-EPDKjvbdpssfqrKt
-EPCkKvbdFeiqnJTq
-DoCkKvbdxZgfGXdr
-EOcLKvbdRWmcblHc
-DncLKvbdjggMFemk
-DoDKjvbdKeegbBQu
diff --git a/hotspot/test/runtime/7158804/Test7158804.sh b/hotspot/test/runtime/7158804/Test7158804.sh
new file mode 100644
index 0000000..bce5197
--- /dev/null
+++ b/hotspot/test/runtime/7158804/Test7158804.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+
+##
+## @test Test7158804.sh
+## @bug 7158804
+## @summary Improve config file parsing
+## @run shell Test7158804.sh
+##
+
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+
+rm -f .hotspotrc
+echo -XX:+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >.hotspotrc
+${TESTJAVA}/bin/java ${TESTVMOPTS} -XX:+IgnoreUnrecognizedVMOptions -XX:Flags=.hotspotrc -version
+if [ $? -ne 0 ]
+then
+ echo "Test Failed"
+ exit 1
+fi
+rm -f .hotspotrc
+exit 0
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 5c32913..0ab55b0 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -183,3 +183,4 @@
af9e8b0f1900b631a8a0fcccff9f1514fe58c808 jdk8-b59
2d1dff5310daaf226421a8c92823cb8afcf35f31 jdk8-b60
6b1db0b41d2f6e2a7b3bdbc8a8db823b47752906 jdk8-b61
+5d0fa0108d028c05753a47bcf2a598357dabf0c0 jdk8-b62
diff --git a/jaxp/makefiles/BuildJaxp.gmk b/jaxp/makefiles/BuildJaxp.gmk
new file mode 100644
index 0000000..8564984
--- /dev/null
+++ b/jaxp/makefiles/BuildJaxp.gmk
@@ -0,0 +1,61 @@
+#
+# Copyright (c) 2007, 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.
+#
+
+# This must be the first rule
+default: all
+
+-include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
+
+# The generate new bytecode uses the new compiler for to generate bytecode
+# for the new jdk that is being built. The code compiled by this setup
+# cannot necessarily be run with the boot jdk.
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
+ JVM:=$(JAVA),\
+ JAVAC:=$(JAVAC_JARS),\
+ FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+$(eval $(call SetupJavaCompilation,BUILD_JAXP,\
+ SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
+ SRC:=$(JAXP_TOPDIR)/src,\
+ CLEAN:=.properties,\
+ BIN:=$(JAXP_OUTPUTDIR)/classes,\
+ SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
+
+$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP),\
+ SRCS:=$(JAXP_OUTPUTDIR)/classes,\
+ SUFFIXES:=.class .properties,\
+ JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
+
+all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip
+
+.PHONY: default all
diff --git a/jaxp/makefiles/Makefile b/jaxp/makefiles/Makefile
index 8564984..9539fe0 100644
--- a/jaxp/makefiles/Makefile
+++ b/jaxp/makefiles/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,39 +23,27 @@
# questions.
#
-# This must be the first rule
-default: all
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
--include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+ $(info Will run $(subsystem_name) target on top-level Makefile)
+ $(info WARNING: This is a non-recommended way of building!)
+ $(info ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
+endif
-# The generate new bytecode uses the new compiler for to generate bytecode
-# for the new jdk that is being built. The code compiled by this setup
-# cannot necessarily be run with the boot jdk.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
- JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
-
-$(eval $(call SetupJavaCompilation,BUILD_JAXP,\
- SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
- SRC:=$(JAXP_TOPDIR)/src,\
- CLEAN:=.properties,\
- BIN:=$(JAXP_OUTPUTDIR)/classes,\
- SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
-
-$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP),\
- SRCS:=$(JAXP_OUTPUTDIR)/classes,\
- SUFFIXES:=.class .properties,\
- JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
-
-all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip
-
-.PHONY: default all
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
index d6680ec..8a2b594 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
@@ -806,6 +806,7 @@
* where the entity encoding is not auto-detected (e.g.
* internal entities or a document entity that is
* parsed from a java.io.Reader).
+ * @param augs Additional information that may include infoset augmentations
*
* @throws XNIException Thrown by handler to signal an error.
*/
@@ -833,7 +834,7 @@
// call handler
if (fDocumentHandler != null && !fScanningAttribute) {
if (!name.equals("[xml]")) {
- fDocumentHandler.startGeneralEntity(name, identifier, encoding, null);
+ fDocumentHandler.startGeneralEntity(name, identifier, encoding, augs);
}
}
@@ -845,6 +846,7 @@
* are just specified by their name.
*
* @param name The name of the entity.
+ * @param augs Additional information that may include infoset augmentations
*
* @throws XNIException Thrown by handler to signal an error.
*/
@@ -869,7 +871,7 @@
// call handler
if (fDocumentHandler != null && !fScanningAttribute) {
if (!name.equals("[xml]")) {
- fDocumentHandler.endGeneralEntity(name, null);
+ fDocumentHandler.endGeneralEntity(name, augs);
}
}
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 7d6a6df..f3854b4 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -183,3 +183,4 @@
ae107401be116f9e384d3a23192f543828e03da5 jdk8-b59
5c5a65ad5291b7cefcdc308f627cf2b195cf2b69 jdk8-b60
97e5e74e2a341d9142ce28043912a3c255e28e03 jdk8-b61
+d265b9b4c0f55c23a1c9fda02a8052fd9df2eec5 jdk8-b62
diff --git a/jaxws/makefiles/BuildJaxws.gmk b/jaxws/makefiles/BuildJaxws.gmk
new file mode 100644
index 0000000..a745ec8
--- /dev/null
+++ b/jaxws/makefiles/BuildJaxws.gmk
@@ -0,0 +1,92 @@
+#
+# Copyright (c) 2007, 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.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
+
+# The generate new bytecode uses the new compiler for to generate bytecode
+# for the new jdk that is being built. The code compiled by this setup
+# cannot necessarily be run with the boot jdk.
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
+ JVM:=$(JAVA),\
+ JAVAC:=$(JAVAC_JARS),\
+ FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+# Dummy here is needed to trigger copying of META-INF
+$(eval $(call SetupJavaCompilation,BUILD_JAF,\
+ SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
+ SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\
+ CLEAN:=.properties,\
+ COPY:="dummy",\
+ BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes))
+
+$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\
+ SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
+ SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\
+ CLEAN:=.properties,\
+ BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\
+ COPY:=.xsd,\
+ COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
+ $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java,\
+ ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
+
+$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
+ $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
+ mkdir -p $(@D)
+ cp $< $@
+
+$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \
+ $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
+ mkdir -p $(@D)
+ cp $< $@
+
+# There are two META-INF services files that are needed, add these to the list of goals
+BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+ $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
+
+$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF),\
+ SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\
+ SUFFIXES:=.class .properties .xsd .java \
+ com.sun.mirror.apt.AnnotationProcessorFactory \
+ com.sun.tools.internal.xjc.Plugin,\
+ JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar))
+
+$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\
+ SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\
+ ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip))
+
+all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip
+
+.PHONY: default all
diff --git a/jaxws/makefiles/Makefile b/jaxws/makefiles/Makefile
index a745ec8..9539fe0 100644
--- a/jaxws/makefiles/Makefile
+++ b/jaxws/makefiles/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,70 +23,27 @@
# questions.
#
-# This must be the first rule
-default: all
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
-JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+ $(info Will run $(subsystem_name) target on top-level Makefile)
+ $(info WARNING: This is a non-recommended way of building!)
+ $(info ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
+endif
-# The generate new bytecode uses the new compiler for to generate bytecode
-# for the new jdk that is being built. The code compiled by this setup
-# cannot necessarily be run with the boot jdk.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
- JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
-
-# Dummy here is needed to trigger copying of META-INF
-$(eval $(call SetupJavaCompilation,BUILD_JAF,\
- SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
- SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\
- CLEAN:=.properties,\
- COPY:="dummy",\
- BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes))
-
-$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\
- SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
- SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\
- CLEAN:=.properties,\
- BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\
- COPY:=.xsd,\
- COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
- $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java,\
- ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
-
-$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
- $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
- mkdir -p $(@D)
- cp $< $@
-
-$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \
- $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
- mkdir -p $(@D)
- cp $< $@
-
-# There are two META-INF services files that are needed, add these to the list of goals
-BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
- $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
-
-$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF),\
- SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\
- SUFFIXES:=.class .properties .xsd .java \
- com.sun.mirror.apt.AnnotationProcessorFactory \
- com.sun.tools.internal.xjc.Plugin,\
- JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar))
-
-$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\
- SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\
- ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip))
-
-all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip
-
-.PHONY: default all
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jdk/.hgtags b/jdk/.hgtags
index c0a4c32..de1a543 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -183,3 +183,4 @@
abad1f417bd3df4296631fc943cd3b7f5062c88a jdk8-b59
cec8fa02f15634acd7d02d04b0b2d8c044cdbaaa jdk8-b60
61ddb3fd000a09ab05bff1940b0ac211661e94cf jdk8-b61
+50b8b17449d200c66bfd68fb4f3a9197432c9e2b jdk8-b62
diff --git a/jdk/THIRD_PARTY_README b/jdk/THIRD_PARTY_README
index 759733b..6dc1b33 100644
--- a/jdk/THIRD_PARTY_README
+++ b/jdk/THIRD_PARTY_README
@@ -2,11 +2,11 @@
-----------------------------
%% This notice is provided with respect to ASM Bytecode Manipulation
-Framework v3.1, which is included with JRE 7, JDK 7, and OpenJDK 7.
+Framework v4.0, which is included with JRE 8, and JDK 8.
--- begin of LICENSE ---
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2011 France Télécom
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/jdk/make/Makefile b/jdk/make/Makefile
index 2e5032d..ceb1492 100644
--- a/jdk/make/Makefile
+++ b/jdk/make/Makefile
@@ -233,7 +233,7 @@
all build:: sanity-all post-sanity-all
-SUBDIRS = tools java javax sun com
+SUBDIRS = tools java javax sun com jdk
ifeq ($(PLATFORM), macosx)
SUBDIRS += apple
endif
diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
index 2f2b1693..15aa7c9 100644
--- a/jdk/make/common/Release.gmk
+++ b/jdk/make/common/Release.gmk
@@ -348,15 +348,15 @@
sun/tools/serialver \
sun/tools/tree \
sun/tools/util \
- sun/security/tools/JarBASE64Encoder.class \
- sun/security/tools/JarSigner.class \
- sun/security/tools/JarSignerParameters.class \
- sun/security/tools/JarSignerResources.class \
- sun/security/tools/JarSignerResources_ja.class \
- sun/security/tools/JarSignerResources_zh_CN.class \
- sun/security/tools/SignatureFile\$$Block.class \
- sun/security/tools/SignatureFile.class \
- sun/security/tools/TimestampedSigner.class \
+ sun/security/tools/jarsigner/JarBASE64Encoder.class \
+ sun/security/tools/jarsigner/Main.class \
+ sun/security/tools/jarsigner/JarSignerParameters.class \
+ sun/security/tools/jarsigner/Resources.class \
+ sun/security/tools/jarsigner/Resources_ja.class \
+ sun/security/tools/jarsigner/Resources_zh_CN.class \
+ sun/security/tools/jarsigner/SignatureFile\$$Block.class \
+ sun/security/tools/jarsigner/SignatureFile.class \
+ sun/security/tools/jarsigner/TimestampedSigner.class \
sun/rmi/rmic \
sun/applet \
sun/jvmstat \
@@ -572,15 +572,15 @@
$(ECHO) "sun/tools/serialver/" >> $@
$(ECHO) "sun/tools/tree/" >> $@
$(ECHO) "sun/tools/util/" >> $@
- $(ECHO) "sun/security/tools/JarBASE64Encoder.class" >> $@
- $(ECHO) "sun/security/tools/JarSigner.class" >> $@
- $(ECHO) "sun/security/tools/JarSignerParameters.class" >> $@
- $(ECHO) "sun/security/tools/JarSignerResources.class" >> $@
- $(ECHO) "sun/security/tools/JarSignerResources_ja.class" >> $@
- $(ECHO) "sun/security/tools/JarSignerResources_zh_CN.class" >> $@
- $(ECHO) "sun/security/tools/SignatureFile\$$Block.class" >> $@
- $(ECHO) "sun/security/tools/SignatureFile.class" >> $@
- $(ECHO) "sun/security/tools/TimestampedSigner.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/JarBASE64Encoder.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/Main.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/JarSignerParameters.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/Resources.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/Resources_ja.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/Resources_zh_CN.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/SignatureFile\$$Block.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/SignatureFile.class" >> $@
+ $(ECHO) "sun/security/tools/jarsigner/TimestampedSigner.class" >> $@
$(ECHO) "sun/security/provider/Sun.class" >> $@
$(ECHO) "sun/security/rsa/SunRsaSign.class" >> $@
$(ECHO) "sun/security/ssl/" >> $@
diff --git a/jdk/make/common/internal/Defs-jaxws.gmk b/jdk/make/common/internal/Defs-jaxws.gmk
index f0ba12b..2cee63a 100644
--- a/jdk/make/common/internal/Defs-jaxws.gmk
+++ b/jdk/make/common/internal/Defs-jaxws.gmk
@@ -34,6 +34,10 @@
javax/xml/ws \
javax/jws \
javax/annotation \
+ com/sun/org/glassfish \
+ com/sun/istack/internal \
+ com/sun/istack/internal/localization \
+ com/sun/istack/internal/logging \
com/sun/xml/internal/bind \
com/sun/xml/internal/fastinfoset \
com/sun/xml/internal/messaging \
diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index 6693a82..b2d1c5a 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -64,13 +64,11 @@
include Exportedfiles.gmk
ifeq ($(PLATFORM),windows)
-FILES_java += java/io/Win32FileSystem.java \
- java/io/WinNTFileSystem.java \
+FILES_java += java/io/WinNTFileSystem.java \
java/util/prefs/WindowsPreferences.java \
java/util/prefs/WindowsPreferencesFactory.java
FILES_c += ProcessImpl_md.c \
- Win32FileSystem_md.c \
WinNTFileSystem_md.c \
canonicalize_md.c \
dirent_md.c \
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-amd64 b/jdk/make/jdk/Makefile
similarity index 73%
rename from jdk/makefiles/mapfiles/launchers/mapfile-amd64
rename to jdk/make/jdk/Makefile
index 760fcc1..b8ac742 100644
--- a/jdk/makefiles/mapfiles/launchers/mapfile-amd64
+++ b/jdk/make/jdk/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -22,18 +22,17 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
+
#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
+# Makefile for building all of java
#
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
+BUILDDIR = ..
+PRODUCT = jdk
+include $(BUILDDIR)/common/Defs.gmk
- local:
- *;
-};
+SUBDIRS = asm
+include $(BUILDDIR)/common/Subdirs.gmk
+
+all build clean clobber::
+ $(SUBDIRS-loop)
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-amd64 b/jdk/make/jdk/asm/Makefile
similarity index 73%
copy from jdk/makefiles/mapfiles/launchers/mapfile-amd64
copy to jdk/make/jdk/asm/Makefile
index 760fcc1..48b8f60 100644
--- a/jdk/makefiles/mapfiles/launchers/mapfile-amd64
+++ b/jdk/make/jdk/asm/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
@@ -22,18 +22,19 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
+BUILDDIR = ../..
+PACKAGE = jdk.internal.org.objectweb.asm
+PRODUCT = jdk
+JAVAC_LINT_OPTIONS=-Xlint:all
+include $(BUILDDIR)/common/Defs.gmk
- local:
- *;
-};
+#
+# Files to compile
+#
+AUTO_FILES_JAVA_DIRS = jdk/internal/org/objectweb/asm
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
index f41a227..2c1eb2c 100644
--- a/jdk/make/jprt.properties
+++ b/jdk/make/jprt.properties
@@ -77,20 +77,18 @@
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+ ${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
diff --git a/jdk/make/launchers/Makefile b/jdk/make/launchers/Makefile
index 9979d97..3d95114 100644
--- a/jdk/make/launchers/Makefile
+++ b/jdk/make/launchers/Makefile
@@ -58,7 +58,7 @@
$(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , )
$(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , )
$(call make-launcher, jar, sun.tools.jar.Main, , )
-$(call make-launcher, jarsigner, sun.security.tools.JarSigner, , )
+$(call make-launcher, jarsigner, sun.security.tools.jarsigner.Main, , )
$(call make-launcher, javac, com.sun.tools.javac.Main, , )
$(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
$(call make-launcher, javah, com.sun.tools.javah.Main, , )
diff --git a/jdk/make/sun/net/FILES_java.gmk b/jdk/make/sun/net/FILES_java.gmk
index 6c140ab..9c5feb4 100644
--- a/jdk/make/sun/net/FILES_java.gmk
+++ b/jdk/make/sun/net/FILES_java.gmk
@@ -128,8 +128,6 @@
sun/net/www/content/audio/x_wav.java \
sun/net/www/protocol/ftp/Handler.java \
sun/net/www/protocol/ftp/FtpURLConnection.java \
- sun/net/www/protocol/gopher/GopherClient.java \
- sun/net/www/protocol/gopher/Handler.java \
sun/net/www/protocol/mailto/Handler.java \
sun/net/www/protocol/mailto/MailToURLConnection.java \
sun/net/idn/Punycode.java \
diff --git a/jdk/make/sun/security/tools/Makefile b/jdk/make/sun/security/tools/Makefile
index f46070d..a03f85d 100644
--- a/jdk/make/sun/security/tools/Makefile
+++ b/jdk/make/sun/security/tools/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -37,7 +37,7 @@
# Resources
#
LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_JAVA = sun/security/tools/JarSignerResources.java
+RESOURCE_BUNDLES_JAVA = sun/security/tools/jarsigner/Resources.java
#
# Rules
@@ -45,7 +45,7 @@
include $(BUILDDIR)/common/Classes.gmk
build:
- $(call make-launcher, keytool, sun.security.tools.KeyTool, , )
+ $(call make-launcher, keytool, sun.security.tools.keytool.Main, , )
ifndef BUILD_HEADLESS_ONLY
$(call make-launcher, policytool, sun.security.tools.policytool.PolicyTool, , )
endif
diff --git a/jdk/makefiles/BuildJdk.gmk b/jdk/makefiles/BuildJdk.gmk
new file mode 100644
index 0000000..b5bad77
--- /dev/null
+++ b/jdk/makefiles/BuildJdk.gmk
@@ -0,0 +1,124 @@
+#
+# Copyright (c) 1995, 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.
+#
+
+# This must be the first rule
+default: all
+
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include NativeCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+
+# Setup the build tools.
+include Tools.gmk
+
+import: $(BUILD_TOOLS) import-only
+import-only:
+# Import (corba jaxp jaxws langtools hotspot)
+ +$(MAKE) -f Import.gmk
+
+gensrc: import gensrc-only
+gensrc-only:
+ +$(MAKE) -f GenerateJavaSources.gmk
+# Ok, now gensrc is fully populated.
+
+gendata: gensrc gendata-only
+gendata-only:
+ +$(MAKE) -f GenerateData.gmk
+
+classes: gendata classes-only
+classes-only:
+ +$(MAKE) -f CompileJavaClasses.gmk
+# The classes are now built and
+# any javah files have now been generated.
+
+libs: classes libs-only
+libs-only:
+ +$(MAKE) -f CompileNativeLibraries.gmk
+
+launchers: libs launchers-only
+launchers-only:
+# Finally compile the launchers.
+ +$(MAKE) -f CompileLaunchers.gmk
+
+genclasses: launchers genclasses-only
+genclasses-only:
+# Generate classes that have other sources. Needs
+# to execute launchers.
+ +$(MAKE) -f GenerateClasses.gmk
+
+jdk: genclasses
+# Now we have a complete jdk, which you can run.
+# It is not yet wrapped up as an installed image.
+
+demos:
+# The demos are compiled against this jdk.
+ +$(MAKE) -f CompileDemos.gmk
+# Now copy the sample sources into the jdk.
+ +$(MAKE) -f CopySamples.gmk
+
+# Create the final jdk and jre images, to be wrapped up
+# into packages, or installed.
+images:
+ +$(MAKE) -f CreateJars.gmk
+ +$(MAKE) -f Images.gmk
+
+overlay-images:
+ +$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
+ +$(MAKE) -f Images.gmk overlay-images
+
+# Create platform specific image layouts
+bundles:
+ +$(MAKE) -f Bundles.gmk
+
+BINARIES:=$(notdir $(wildcard $(IMAGES_OUTPUTDIR)/j2sdk-image/bin/*))
+INSTALLDIR:=openjdk-$(RELEASE)
+
+# Install the jdk image, in a very crude way. Not taking into
+# account, how to install properly on macosx or windows etc.
+install:
+ echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+ echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
+ $(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+ $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
+ $(CP) -rp $(IMAGES_OUTPUTDIR)/j2sdk-image/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+ $(MKDIR) -p $(INSTALL_PREFIX)/bin
+ $(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
+ $(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
+
+# The all target builds the JDK, but not the images
+all: jdk
+
+.PHONY: import gensrc gendata classes libs launchers genclasses
+.PHONY: import-only gensrc-only gendata-only classes-only libs-only launchers-only genclasses-only
+.PHONY: all jdk demos images overlay-images bundles install
diff --git a/jdk/makefiles/Bundles.gmk b/jdk/makefiles/Bundles.gmk
new file mode 100644
index 0000000..8b1183a
--- /dev/null
+++ b/jdk/makefiles/Bundles.gmk
@@ -0,0 +1,141 @@
+#
+# Copyright (c) 2011, 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 $(SPEC)
+include MakeBase.gmk
+
+default: bundles
+
+# Only macosx has bundles defined.
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+bundles: jre-bundle jdk-bundle
+
+
+JDK_BUNDLE_DIR := $(IMAGES_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JRE_BUNDLE_DIR := $(IMAGES_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents
+
+MACOSX_SRC := $(JDK_TOPDIR)/src/macosx
+
+# All these OPENJDK checks are needed since there is no coherency between
+# these values in open and closed. Should probably be fixed.
+ifndef OPENJDK
+ BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION)
+else
+ BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE)
+endif
+BUNDLE_ID_JRE := $(BUNDLE_ID).jre
+BUNDLE_ID_JDK := $(BUNDLE_ID).jdk
+
+BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION)
+BUNDLE_NAME_JRE := $(BUNDLE_NAME)
+BUNDLE_NAME_JDK := $(BUNDLE_NAME)
+
+ifndef OPENJDK
+ BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION)
+else
+ BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) ($(JDK_VERSION))
+endif
+BUNDLE_INFO_JRE := $(BUNDLE_INFO)
+BUNDLE_INFO_JDK := $(BUNDLE_INFO)
+
+BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
+BUNDLE_VERSION := $(JDK_VERSION)
+ifeq ($(COMPANY_NAME),N/A)
+ BUNDLE_VENDOR := UNDEFINED
+else
+ BUNDLE_VENDOR := $(COMPANY_NAME)
+endif
+
+
+JDK_FILE_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/j2sdk-image ! -type d)
+JRE_FILE_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/j2re-image ! -type d)
+
+JDK_TARGET_LIST := $(subst $(IMAGES_OUTPUTDIR)/j2sdk-image,$(JDK_BUNDLE_DIR)/Home,$(JDK_FILE_LIST))
+JRE_TARGET_LIST := $(subst $(IMAGES_OUTPUTDIR)/j2re-image,$(JRE_BUNDLE_DIR)/Home,$(JRE_FILE_LIST))
+
+# The old builds implementation of this did not preserve symlinks so
+# make sure they are followed and the contents copied instead.
+# To fix this, just replace copy with install-file macro.
+$(JDK_BUNDLE_DIR)/Home/%: $(IMAGES_OUTPUTDIR)/j2sdk-image/%
+ $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(CP) -f -R -L '$<' '$@'
+
+$(JRE_BUNDLE_DIR)/Home/%: $(IMAGES_OUTPUTDIR)/j2re-image/%
+ $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(CP) -f -R -L '$<' '$@'
+
+$(JDK_BUNDLE_DIR)/MacOS/libjli.dylib:
+ $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(LN) -s ../Home/lib/jli/libjli.dylib $@
+
+$(JRE_BUNDLE_DIR)/MacOS/libjli.dylib:
+ $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(LN) -s ../Home/lib/jli/libjli.dylib $@
+
+$(JDK_BUNDLE_DIR)/Info.plist: $(SPEC)
+ $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" \
+ -e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" \
+ -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" \
+ -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
+ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
+ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
+ < $(MACOSX_SRC)/bundle/JDK-Info.plist > $@
+
+$(JRE_BUNDLE_DIR)/Info.plist: $(SPEC)
+ $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(MKDIR) -p $(@D)
+ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JRE)/g" \
+ -e "s/@@NAME@@/$(BUNDLE_NAME_JRE)/g" \
+ -e "s/@@INFO@@/$(BUNDLE_INFO_JRE)/g" \
+ -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
+ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
+ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
+ < $(MACOSX_SRC)/bundle/JRE-Info.plist > $@
+
+jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \
+ $(JDK_BUNDLE_DIR)/Info.plist
+ $(SETFILE) -a B $(dir $(JDK_BUNDLE_DIR))
+
+jre-bundle: $(JRE_TARGET_LIST) $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib \
+ $(JRE_BUNDLE_DIR)/Info.plist
+ $(SETFILE) -a B $(dir $(JRE_BUNDLE_DIR))
+
+else # Not macosx
+
+bundles:
+ $(ECHO) "No bundles defined for $(OPENJDK_TARGET_OS)"
+
+endif # macosx
+
+.PHONY: jdk-bundle jre-bundle bundles
diff --git a/jdk/makefiles/CompileDemos.gmk b/jdk/makefiles/CompileDemos.gmk
index 4f84b5c..7de9166 100644
--- a/jdk/makefiles/CompileDemos.gmk
+++ b/jdk/makefiles/CompileDemos.gmk
@@ -107,10 +107,7 @@
$1_JARFILE := $1.jar
endif
- # Compile java classes if there are any.
- $1_JAVA_FILES_EXIST := $$(shell $$(FIND) $$($1_MAIN_SRC) -name "*.java")
-
- ifneq ($$($1_JAVA_FILES_EXIST),)
+ ifeq ($(findstring $1,Laffy SwingSet3),)
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\
SETUP:=GENERATE_USINGJDKBYTECODE,\
ADD_JAVAC_FLAGS:=$3,\
@@ -264,9 +261,9 @@
LDFLAGS_SUFFIX_linux:=$8,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$$(RC_FLAGS) \
- /D "JDK_FNAME=$1.dll" \
- /D "JDK_INTERNAL_NAME=$1" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=$1.dll" \
+ -D "JDK_INTERNAL_NAME=$1" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\
LIBRARY:=$1))
@@ -456,7 +453,7 @@
$(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
$(MKDIR) -p $(@D)
$(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo
- $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -o $<
+ $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $<
$(MV) $(JDK_OUTPUTDIR)/demo/demo $(JDK_OUTPUTDIR)/demo/db
$(TOUCH) $@
diff --git a/jdk/makefiles/CompileJavaClasses.gmk b/jdk/makefiles/CompileJavaClasses.gmk
index 879ffad..460d9e2 100644
--- a/jdk/makefiles/CompileJavaClasses.gmk
+++ b/jdk/makefiles/CompileJavaClasses.gmk
@@ -76,9 +76,14 @@
SolarisAclFileAttributeView.java \
SolarisLoginModule.java \
SolarisSystem.java \
+ sun/nio/ch/DevPollArrayWrapper.java \
+ sun/nio/ch/DevPollSelectorImpl.java \
+ sun/nio/ch/DevPollSelectorProvider.java \
sun/nio/ch/EventPortSelectorImpl.java \
sun/nio/ch/EventPortSelectorProvider.java \
sun/nio/ch/EventPortWrapper.java \
+ sun/nio/ch/SolarisAsynchronousChannelProvider.java \
+ sun/nio/ch/SolarisEventPort.java \
sun/tools/attach/SolarisAttachProvider.java \
sun/tools/attach/SolarisVirtualMachine.java
endif
@@ -105,18 +110,27 @@
ifneq ($(OPENJDK_TARGET_OS),linux)
EXFILES+=sun/tools/attach/LinuxAttachProvider.java \
- sun/tools/attach/LinuxVirtualMachine.java \
- sun/nio/fs/LinuxDosFileAttributeView.java \
- sun/nio/fs/LinuxFileStore.java \
- sun/nio/fs/LinuxFileSystem.java \
- sun/nio/fs/LinuxFileSystemProvider.java \
- sun/nio/fs/LinuxNativeDispatcher.java \
- sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
- sun/nio/fs/LinuxWatchService.java
+ sun/tools/attach/LinuxVirtualMachine.java \
+ sun/nio/ch/EPoll.java \
+ sun/nio/ch/EPollArrayWrapper.java \
+ sun/nio/ch/EPollPort.java \
+ sun/nio/ch/EPollSelectorImpl.java \
+ sun/nio/ch/EPollSelectorProvider.java \
+ sun/nio/ch/LinuxAsynchronousChannelProvider.java \
+ sun/nio/fs/LinuxDosFileAttributeView.java \
+ sun/nio/fs/LinuxFileStore.java \
+ sun/nio/fs/LinuxFileSystem.java \
+ sun/nio/fs/LinuxFileSystemProvider.java \
+ sun/nio/fs/LinuxNativeDispatcher.java \
+ sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
+ sun/nio/fs/LinuxWatchService.java
endif
ifneq ($(OPENJDK_TARGET_OS),macosx)
- EXFILES+=sun/nio/fs/BsdFileStore.java \
+ EXFILES+=sun/nio/ch/BsdAsynchronousChannelProvider.java \
+ sun/nio/ch/KQueue.java \
+ sun/nio/ch/KQueuePort.java \
+ sun/nio/fs/BsdFileStore.java \
sun/nio/fs/BsdFileSystem.java \
sun/nio/fs/BsdFileSystemProvider.java \
sun/nio/fs/BsdNativeDispatcher.java \
@@ -147,51 +161,48 @@
endif
ifneq ($(OPENJDK_TARGET_OS), macosx)
-#
-# Not in rt.jar on solaris and linux...(windows not checked)
-# in rt.jar on macosx ??
-EXFILES+=sun/awt/X11/ScreenFormat.java \
- sun/awt/X11/XArc.java \
- sun/awt/X11/XChar2b.java \
- sun/awt/X11/XCharStruct.java \
- sun/awt/X11/XClassHint.java \
- sun/awt/X11/XComposeStatus.java \
- sun/awt/X11/XExtCodes.java \
- sun/awt/X11/XFontProp.java \
- sun/awt/X11/XFontSetExtents.java \
- sun/awt/X11/XFontStruct.java \
- sun/awt/X11/XGCValues.java \
- sun/awt/X11/XHostAddress.java \
- sun/awt/X11/XIMCallback.java \
- sun/awt/X11/XIMHotKeyTrigger.java \
- sun/awt/X11/XIMHotKeyTriggers.java \
- sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
- sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
- sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
- sun/awt/X11/XIMStatusDrawCallbackStruct.java \
- sun/awt/X11/XIMStringConversionCallbackStruct.java \
- sun/awt/X11/XIMStringConversionText.java \
- sun/awt/X11/XIMStyles.java \
- sun/awt/X11/XIMText.java \
- sun/awt/X11/XIMValuesList.java \
- sun/awt/X11/XImage.java \
- sun/awt/X11/XKeyboardControl.java \
- sun/awt/X11/XKeyboardState.java \
- sun/awt/X11/XOMCharSetList.java \
- sun/awt/X11/XOMFontInfo.java \
- sun/awt/X11/XOMOrientation.java \
- sun/awt/X11/XPoint.java \
- sun/awt/X11/XRectangle.java \
- sun/awt/X11/XSegment.java \
- sun/awt/X11/XStandardColormap.java \
- sun/awt/X11/XTextItem.java \
- sun/awt/X11/XTextItem16.java \
- sun/awt/X11/XTextProperty.java \
- sun/awt/X11/XTimeCoord.java \
- sun/awt/X11/XWindowChanges.java \
- sun/awt/X11/XdbeSwapInfo.java \
- sun/awt/X11/XmbTextItem.java \
- sun/awt/X11/XwcTextItem.java
+ EXFILES+=sun/awt/X11/ScreenFormat.java \
+ sun/awt/X11/XArc.java \
+ sun/awt/X11/XChar2b.java \
+ sun/awt/X11/XCharStruct.java \
+ sun/awt/X11/XClassHint.java \
+ sun/awt/X11/XComposeStatus.java \
+ sun/awt/X11/XExtCodes.java \
+ sun/awt/X11/XFontProp.java \
+ sun/awt/X11/XFontSetExtents.java \
+ sun/awt/X11/XFontStruct.java \
+ sun/awt/X11/XGCValues.java \
+ sun/awt/X11/XHostAddress.java \
+ sun/awt/X11/XIMCallback.java \
+ sun/awt/X11/XIMHotKeyTrigger.java \
+ sun/awt/X11/XIMHotKeyTriggers.java \
+ sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
+ sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
+ sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
+ sun/awt/X11/XIMStatusDrawCallbackStruct.java \
+ sun/awt/X11/XIMStringConversionCallbackStruct.java \
+ sun/awt/X11/XIMStringConversionText.java \
+ sun/awt/X11/XIMStyles.java \
+ sun/awt/X11/XIMText.java \
+ sun/awt/X11/XIMValuesList.java \
+ sun/awt/X11/XImage.java \
+ sun/awt/X11/XKeyboardControl.java \
+ sun/awt/X11/XKeyboardState.java \
+ sun/awt/X11/XOMCharSetList.java \
+ sun/awt/X11/XOMFontInfo.java \
+ sun/awt/X11/XOMOrientation.java \
+ sun/awt/X11/XPoint.java \
+ sun/awt/X11/XRectangle.java \
+ sun/awt/X11/XSegment.java \
+ sun/awt/X11/XStandardColormap.java \
+ sun/awt/X11/XTextItem.java \
+ sun/awt/X11/XTextItem16.java \
+ sun/awt/X11/XTextProperty.java \
+ sun/awt/X11/XTimeCoord.java \
+ sun/awt/X11/XWindowChanges.java \
+ sun/awt/X11/XdbeSwapInfo.java \
+ sun/awt/X11/XmbTextItem.java \
+ sun/awt/X11/XwcTextItem.java
endif
# Exclude another implicitly not included file.
@@ -229,31 +240,24 @@
EXFILES+=sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
endif
-ifdef DISABLE_NIMBUS
- # TODO: need to check when it happens
- # Exclude nimus if disabled
- EXCLUDES+= javax/swing/plaf/nimbus \
- com/sun/java/swing/plaf/nimbus
-else
-#
-# These are never put into rt.jar
-#
-EXFILES+= javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
- javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
- javax/swing/plaf/nimbus/ScrollBarPainter.java \
- javax/swing/plaf/nimbus/SliderPainter.java \
- javax/swing/plaf/nimbus/SpinnerPainter.java \
- javax/swing/plaf/nimbus/SplitPanePainter.java \
- javax/swing/plaf/nimbus/TabbedPanePainter.java
-endif
+# Exclude nimbus files from rt.jar
+EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+ javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+ javax/swing/plaf/nimbus/ScrollBarPainter.java \
+ javax/swing/plaf/nimbus/SliderPainter.java \
+ javax/swing/plaf/nimbus/SpinnerPainter.java \
+ javax/swing/plaf/nimbus/SplitPanePainter.java \
+ javax/swing/plaf/nimbus/TabbedPanePainter.java
# Acquire a list of files that should be copied straight over to the classes.
include CopyIntoClasses.gmk
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
ifndef OPENJDK
- CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
- $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
+ CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes
+ ifneq ($(OPENJDK_TARGET_OS_API_DIR),windows)
+ CLOSED_SRC_DIRS += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
+ endif
endif
MACOSX_SRC_DIRS :=
@@ -294,7 +298,6 @@
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
$(MACOSX_SRC_DIRS) \
$(JDK_OUTPUTDIR)/gensrc \
- $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo \
$(CLOSED_SRC_DIRS),\
INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
EXCLUDES:=$(EXCLUDES),\
@@ -326,7 +329,7 @@
# Set prereqs to the java files since make doesn't know about the class files. Add BUILD_JDK
# as an order only dependency to avoid race with the java compilation.
-$(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers: $(JDK_BASE_HEADER_JAVA_FILES) | $(BUILD_JDK)
+$(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers: $(JDK_BASE_HEADER_JAVA_FILES) | $(BUILD_JDK)
$(ECHO) Generating headers for jdk base classes
$(JAVAH) -bootclasspath $(JDK_OUTPUTDIR)/classes -d $(JDK_OUTPUTDIR)/gensrc_headers \
$(JDK_BASE_HEADER_CLASSES)
@@ -416,6 +419,6 @@
# copy with -a to preserve timestamps so dependencies down the line aren't messed up
all: $(BUILD_JDK) $(JARS) $(COPY_EXTRA) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
- $(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers
+ $(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers
.PHONY: all
diff --git a/jdk/makefiles/CompileLaunchers.gmk b/jdk/makefiles/CompileLaunchers.gmk
index ce65167..586ecd4 100644
--- a/jdk/makefiles/CompileLaunchers.gmk
+++ b/jdk/makefiles/CompileLaunchers.gmk
@@ -1,557 +1,591 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-defalt: all
-
-include $(SPEC)
-include MakeBase.gmk
-include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-
-# Build tools
-include Tools.gmk
-
-BUILD_LAUNCHERS=
-
-# When building a legacy overlay image (on solaris 64 bit), the launchers
-# need to be built with a different rpath and a different output dir.
-ifeq ($(OVERLAY_IMAGES),true)
- ORIGIN_ROOT:=/../..
- OUTPUT_SUBDIR:=$(OPENJDK_TARGET_CPU_ISADIR)
-else
- ORIGIN_ROOT:=/..
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN)
-else
- ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
- $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
-endif
-
-#
-# Applications expect to be able to link against libjawt without invoking
-# System.loadLibrary("jawt") first. This was the behaviour described in the
-# devloper documentation of JAWT and what worked with OpenJDK6.
-#
-ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),)
- ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
- $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR))
-endif
-
-define SetupLauncher
- # TODO: Fix mapfile on solaris. Won't work with ld as linker.
- # Parameter 1 is the name of the launcher (java,javac,jar...)
- # Parameter 2 is extra CFLAGS
- # Parameter 3 is extra LDFLAGS
- # Parameter 4 is extra LDFLAGS_SUFFIX_posix
- # Parameter 5 is extra LDFLAGS_SUFFIX_windows
- # Parameter 6 is optional Windows JLI library (full path)
- # Parameter 7 is optional Windows resource (RC) flags
- # Parameter 8 is optional Windows version resource file (.rc)
- # Parameter 9 is different output dir
- # Parameter 10 if set, link statically with c runtime on windows.
- # Parameter 11 if set, override plist file on macosx.
-
- $1_WINDOWS_JLI_LIB:=$(JDK_OUTPUTDIR)/objs/libjli/jli.lib
- ifneq ($6,)
- $1_WINDOWS_JLI_LIB:=$6
- endif
- $1_VERSION_INFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc
- ifneq ($8,)
- $1_VERSION_INFO_RESOURCE:=$8
- endif
-
- $1_LDFLAGS := $3
- $1_LDFLAGS_SUFFIX :=
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- $1_PLIST_FILE:=Info-cmdline.plist
- ifneq ($(11),)
- $1_PLIST_FILE:=$(11)
- endif
-
- $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
- -framework Cocoa -framework Security -framework ApplicationServices \
- -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
- $1_LDFLAGS_SUFFIX += -pthread
- endif
-
- ifeq ($(USE_EXTERNAL_LIBZ), true)
- $1_LDFLAGS_SUFFIX += -lz
- endif
-
- $1_OUTPUT_DIR_ARG:=$9
- ifeq (,$$($1_OUTPUT_DIR_ARG))
- $1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin
- endif
-
- # TODO: maybe it's better to move this if-statement out of this function
- ifeq ($1,java)
- $1_OPTIMIZATION_ARG:=HIGH
- $1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
- else
- $1_OPTIMIZATION_ARG:=LOW
- endif
-
- $1_CFLAGS:=$(CFLAGS_JDKEXE)
- ifeq ($(10),true)
- $1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
- endif
-
- $(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\
- SRC:=$(JDK_TOPDIR)/src/share/bin,\
- INCLUDE_FILES:=main.c,\
- LANG:=C,\
- OPTIMIZATION:=$$($1_OPTIMIZATION_ARG), \
- CFLAGS:=$$($1_CFLAGS) \
- -I$(JDK_TOPDIR)/src/share/bin \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
- -DFULL_VERSION='"$(FULL_VERSION)"' \
- -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
- -DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
- -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
- -DPROGNAME='"$1"' $(DPACKAGEPATH) \
- $2,\
- CFLAGS_linux:=-fPIC,\
- CFLAGS_solaris:=-KPIC -DHAVE_GETHRTIME,\
- LDFLAGS:=$(LDFLAGS_JDKEXE) \
- $(ORIGIN_ARG) \
- $$($1_LDFLAGS),\
- LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_NAME,$1),\
- LDFLAGS_linux:=-lpthread \
- $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
- LDFLAGS_solaris:=$$($1_LDFLAGS_solaris) \
- $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU), \
- LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX),\
- LDFLAGS_SUFFIX_posix:=$4,\
- LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
- $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\
- LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\
- OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\
- PROGRAM:=$1,\
- DEBUG_SYMBOLS:=true,\
- VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\
- RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=$1$(EXE_SUFFIX)" \
- /D "JDK_INTERNAL_NAME=$1" \
- /D "JDK_FTYPE=0x1L" \
- $7,\
- MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest)
-
- BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
-
- ifeq ($(OPENJDK_TARGET_OS),macosx)
- $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
- endif
-
- ifeq ($(OPENJDK_TARGET_OS),windows)
- $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
- $$($1_WINDOWS_JLI_LIB)
- endif
-endef
-
-##########################################################################################
-
-XLIBS:=$(X_LIBS) -lX11
-ifeq ($(OPENJDK_TARGET_OS),macosx)
- DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"'
- XLIBS:=
-endif
-
-ifdef OPENJDK
- JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
-else
- JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
-endif
-
-# On windows, the debuginfo files get the same name as for java.dll. Build
-# into another dir and copy selectively so debuginfo for java.dll isn't
-# overwritten.
-$(eval $(call SetupLauncher,java,\
- -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
- $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
- $(JDK_TOPDIR)/src/windows/resource/java.rc,$(JDK_OUTPUTDIR)/objs/java_objs,true))
-
-$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
-
-BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
-
-ifeq ($(OPENJDK_TARGET_OS),windows)
- $(eval $(call SetupLauncher,javaw,\
- -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
- $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
- $(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
-endif
-
-
-ifndef BUILD_HEADLESS_ONLY
-$(eval $(call SetupLauncher,appletviewer,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',,\
- $(XLIBS)))
-endif
-
-$(eval $(call SetupLauncher,extcheck,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,idlj,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jar,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jarsigner,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.JarSigner"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,javac,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,javadoc,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,javah,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,javap,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }'))
-
-BUILD_LAUNCHER_jconsole_CFLAGS_windows:=-DJAVAW
-BUILD_LAUNCHER_jconsole_LDFLAGS_windows:=user32.lib
-
-$(eval $(call SetupLauncher,jconsole,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }'))
-
-$(eval $(call SetupLauncher,jdb,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }'))
-
-$(eval $(call SetupLauncher,jhat,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jinfo,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
- "sun.tools.jinfo.JInfo"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(eval $(call SetupLauncher,jmap,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
- "sun.tools.jmap.JMap"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(eval $(call SetupLauncher,jps,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jrunscript,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jsadebugd,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(eval $(call SetupLauncher,jstack,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
- "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
- "sun.tools.jstack.JStack"$(COMMA) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(eval $(call SetupLauncher,jstat,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jstatd,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,keytool,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.KeyTool"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,native2ascii,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
-
-ifndef BUILD_HEADLESS_ONLY
-$(eval $(call SetupLauncher,policytool,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',,\
- $(XLIBS)))
-endif
-
-$(eval $(call SetupLauncher,rmic,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,schemagen,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,serialver,\
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,xjc,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,wsgen,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,wsimport,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,orbd,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
- "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
- "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
- "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
- "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,servertool,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,tnameserv,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
- "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
- "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
- "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
- "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,pack200,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }'))
-
-$(eval $(call SetupLauncher,rmid,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,rmiregistry,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jcmd,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
-
-ifeq ($(OPENJDK_TARGET_OS),windows)
- $(eval $(call SetupLauncher,kinit,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
-
- $(eval $(call SetupLauncher,klist,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
-
- $(eval $(call SetupLauncher,ktab,\
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
-endif
-
-##########################################################################################
-# The order of the object files on the link command line affects the size of the resulting
-# binary (at least on linux) which causes the size to differ between old and new build.
-ifeq ($(USE_EXTERNAL_LIBZ), true)
-UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
-UNPACKEXE_ZIPOBJS := -lz
-else
-UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
-UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
- $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
-
-endif
-
-ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- UNPACKEXE_CFLAGS += -xregs=no%appl
-endif
-
-UNPACKEXE_LANG:=C
-ifeq ($(OPENJDK_TARGET_OS),solaris)
- UNPACKEXE_LANG:=C++
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\
- SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\
- EXCLUDE_FILES:=jni.cpp,\
- LANG:=$(UNPACKEXE_LANG),\
- OPTIMIZATION := LOW, \
- CFLAGS:=$(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE)\
- -DFULL, \
- CFLAGS_release:=-DPRODUCT,\
- CFLAGS_linux:=-fPIC,\
- CFLAGS_solaris := -KPIC, \
- CFLAGS_macosx := -fPIC, \
- MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200, \
- LDFLAGS:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(UNPACKEXE_ZIPOBJS),\
- LDFLAGS_linux:=-lc,\
- LDFLAGS_SUFFIX:=$(LIBCXX),\
- LDFLAGS_SUFFIX_solaris:=-lc,\
- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\
- OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR),\
- PROGRAM:=unpack200,\
- VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
- RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=unpack200.exe" \
- /D "JDK_INTERNAL_NAME=unpack200" \
- /D "JDK_FTYPE=0x1L",\
- MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
-
-ifneq ($(USE_EXTERNAL_LIBZ), true)
-
-$(BUILD_UNPACKEXE) : $(UNPACKEXE_ZIPOBJS)
-
-endif
-
-BUILD_LAUNCHERS += $(BUILD_UNPACKEXE)
-
-##########################################################################################
-
-
-BUILD_JEXEC :=
-BUILD_JEXEC_SRC :=
-BUILD_JEXEC_INC :=
-BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
-
-#
-# UNHANDLED:
-# - COMPILE_APPROACH = normal
-#
-
-#
-# jdk/make/java/Makefile
-#
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- BUILD_JEXEC := 1
- endif
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_JEXEC := 1
-endif # OPENJDK_TARGET_OS
-
-#
-# jdk/make/java/jexec/Makefile
-#
-ifeq ($(BUILD_JEXEC), 1)
-
- ifeq ($(OPENJDK_TARGET_OS),windows)
- else ifeq ($(OPENJDK_TARGET_OS),macosx)
- BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
- else
- BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
- BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
- endif
-endif
-
-#
-# Note that the two Makefile's seems to contradict each other,
-# and that src/macosx/bin/jexec.c seems unused
-#
-ifneq ($(BUILD_JEXEC_SRC),)
- $(eval $(call SetupNativeCompilation,BUILD_JEXEC,\
- SRC:=$(BUILD_JEXEC_SRC),\
- INCLUDE_FILES:=jexec.c,\
- LANG:=C,\
- OPTIMIZATION := LOW, \
- CFLAGS:=$(CFLAGS_JDKEXE)\
- $(BUILD_JEXEC_INC), \
- CFLAGS_linux:=-fPIC,\
- CFLAGS_solaris:=-KPIC,\
- LDFLAGS:=$(LDFLAGS_JDKEXE) \
- $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
- OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
- PROGRAM:=jexec))
-
- BUILD_LAUNCHERS += $(BUILD_JEXEC)
-endif
-
-##########################################################################################
-
-#
-# The java-rmi.cgi script in bin/ only gets delivered in certain situations
-#
-JAVA_RMI_CGI:=$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
-endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
- endif
-endif
-
-# TODO:
-# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
-# this time anyway. Since jdk6, it has been built from the wrong source and resulted
-# in a copy of the standard java launcher named "java-rmi.exe" ending up in the final
-# images bin dir. This weird behavior is mimicked here in the converted makefiles for
-# now. Should probably just be deleted.
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
-ifeq ($(OPENJDK_TARGET_OS),windows)
- $(eval $(call SetupLauncher,java-rmi,\
- -DEXPAND_CLASSPATH_WILDCARDS,\
- $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
-else
- $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
- $(MKDIR) -p $(@D)
- $(CP) $< $@
- $(CHMOD) a+x $@
-endif
-
-##########################################################################################
-
-$(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
-
-all: $(BUILD_LAUNCHERS)
-
-.PHONY: all
+#
+# Copyright (c) 2011, 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.
+#
+
+defalt: all
+
+include $(SPEC)
+include MakeBase.gmk
+include NativeCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+
+# Build tools
+include Tools.gmk
+
+BUILD_LAUNCHERS=
+
+# When building a legacy overlay image (on solaris 64 bit), the launchers
+# need to be built with a different rpath and a different output dir.
+ifeq ($(OVERLAY_IMAGES),true)
+ ORIGIN_ROOT:=/../..
+ OUTPUT_SUBDIR:=$(OPENJDK_TARGET_CPU_ISADIR)
+else
+ ORIGIN_ROOT:=/..
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN)
+else
+ ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
+ $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
+endif
+
+#
+# Applications expect to be able to link against libjawt without invoking
+# System.loadLibrary("jawt") first. This was the behaviour described in the
+# devloper documentation of JAWT and what worked with OpenJDK6.
+#
+ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),)
+ ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
+ $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR))
+endif
+
+define SetupLauncher
+ # TODO: Fix mapfile on solaris. Won't work with ld as linker.
+ # Parameter 1 is the name of the launcher (java,javac,jar...)
+ # Parameter 2 is extra CFLAGS
+ # Parameter 3 is extra LDFLAGS
+ # Parameter 4 is extra LDFLAGS_SUFFIX_posix
+ # Parameter 5 is extra LDFLAGS_SUFFIX_windows
+ # Parameter 6 is optional Windows JLI library (full path)
+ # Parameter 7 is optional Windows resource (RC) flags
+ # Parameter 8 is optional Windows version resource file (.rc)
+ # Parameter 9 is different output dir
+ # Parameter 10 if set, link statically with c runtime on windows.
+ # Parameter 11 if set, override plist file on macosx.
+
+ $1_WINDOWS_JLI_LIB:=$(JDK_OUTPUTDIR)/objs/libjli/jli.lib
+ ifneq ($6,)
+ $1_WINDOWS_JLI_LIB:=$6
+ endif
+ $1_VERSION_INFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc
+ ifneq ($8,)
+ $1_VERSION_INFO_RESOURCE:=$8
+ endif
+
+ $1_LDFLAGS := $3
+ $1_LDFLAGS_SUFFIX :=
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $1_PLIST_FILE:=Info-cmdline.plist
+ ifneq ($(11),)
+ $1_PLIST_FILE:=$(11)
+ endif
+
+ $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
+ -framework Cocoa -framework Security -framework ApplicationServices \
+ -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
+ $1_LDFLAGS_SUFFIX += -pthread
+ endif
+
+ ifeq ($(USE_EXTERNAL_LIBZ), true)
+ $1_LDFLAGS_SUFFIX += -lz
+ endif
+
+ $1_OUTPUT_DIR_ARG:=$9
+ ifeq (,$$($1_OUTPUT_DIR_ARG))
+ $1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin
+ endif
+
+ # TODO: maybe it's better to move this if-statement out of this function
+ ifeq ($1,java)
+ $1_OPTIMIZATION_ARG:=HIGH
+ $1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
+ else
+ $1_OPTIMIZATION_ARG:=LOW
+ endif
+
+ $1_CFLAGS:=$(CFLAGS_JDKEXE)
+ ifeq ($(10),true)
+ $1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
+ endif
+
+ ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)),)
+ $1_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
+ else
+ $1_MAPFILE:=
+ endif
+
+ $(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\
+ SRC:=$(JDK_TOPDIR)/src/share/bin,\
+ INCLUDE_FILES:=main.c,\
+ LANG:=C,\
+ OPTIMIZATION:=$$($1_OPTIMIZATION_ARG), \
+ CFLAGS:=$$($1_CFLAGS) \
+ -I$(JDK_TOPDIR)/src/share/bin \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
+ -DFULL_VERSION='"$(FULL_VERSION)"' \
+ -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
+ -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
+ -DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
+ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
+ -DPROGNAME='"$1"' $(DPACKAGEPATH) \
+ $2,\
+ CFLAGS_linux:=-fPIC,\
+ CFLAGS_solaris:=-KPIC -DHAVE_GETHRTIME,\
+ LDFLAGS:=$(LDFLAGS_JDKEXE) \
+ $(ORIGIN_ARG) \
+ $$($1_LDFLAGS),\
+ LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_NAME,$1),\
+ LDFLAGS_linux:=-lpthread \
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
+ LDFLAGS_solaris:=$$($1_LDFLAGS_solaris) \
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
+ MAPFILE := $$($1_MAPFILE), \
+ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX),\
+ LDFLAGS_SUFFIX_posix:=$4,\
+ LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
+ $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\
+ LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\
+ OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\
+ PROGRAM:=$1,\
+ DEBUG_SYMBOLS:=true,\
+ VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\
+ RC_FLAGS:=$(RC_FLAGS)\
+ -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
+ -D "JDK_INTERNAL_NAME=$1" \
+ -D "JDK_FTYPE=0x1L" \
+ $7,\
+ MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest)
+
+ BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
+
+ ifeq ($(OPENJDK_TARGET_OS),macosx)
+ $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS),windows)
+ $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
+ $$($1_WINDOWS_JLI_LIB)
+ endif
+endef
+
+##########################################################################################
+
+XLIBS:=$(X_LIBS) -lX11
+ifeq ($(OPENJDK_TARGET_OS),macosx)
+ DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"'
+ XLIBS:=
+endif
+
+ifdef OPENJDK
+ JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
+else
+ JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
+endif
+
+# On windows, the debuginfo files get the same name as for java.dll. Build
+# into another dir and copy selectively so debuginfo for java.dll isn't
+# overwritten.
+$(eval $(call SetupLauncher,java,\
+ -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
+ $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
+ $(JDK_TOPDIR)/src/windows/resource/java.rc,$(JDK_OUTPUTDIR)/objs/java_objs,true))
+
+$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
+
+BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
+
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ $(eval $(call SetupLauncher,javaw,\
+ -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
+ $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
+ $(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
+endif
+
+
+ifndef BUILD_HEADLESS_ONLY
+$(eval $(call SetupLauncher,appletviewer,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',,\
+ $(XLIBS)))
+endif
+
+$(eval $(call SetupLauncher,extcheck,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,idlj,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jar,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jarsigner,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarSigner.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,javac,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
+
+ifeq ($(ENABLE_SJAVAC),yes)
+$(eval $(call SetupLauncher,sjavac,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
+endif
+
+$(eval $(call SetupLauncher,javadoc,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,javah,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,javap,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }'))
+
+BUILD_LAUNCHER_jconsole_CFLAGS_windows:=-DJAVAW
+BUILD_LAUNCHER_jconsole_LDFLAGS_windows:=user32.lib
+
+$(eval $(call SetupLauncher,jconsole,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }'))
+
+$(eval $(call SetupLauncher,jdb,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }'))
+
+$(eval $(call SetupLauncher,jhat,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jinfo,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
+ "sun.tools.jinfo.JInfo"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(eval $(call SetupLauncher,jmap,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
+ "sun.tools.jmap.JMap"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(eval $(call SetupLauncher,jps,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jrunscript,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jsadebugd,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(eval $(call SetupLauncher,jstack,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
+ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
+ "sun.tools.jstack.JStack"$(COMMA) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(eval $(call SetupLauncher,jstat,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jstatd,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,keytool,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,native2ascii,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
+
+ifndef BUILD_HEADLESS_ONLY
+$(eval $(call SetupLauncher,policytool,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',,\
+ $(XLIBS)))
+endif
+
+$(eval $(call SetupLauncher,rmic,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,schemagen,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,serialver,\
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,xjc,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,wsgen,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,wsimport,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,orbd,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
+ "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
+ "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
+ "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
+ "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,servertool,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,tnameserv,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
+ "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
+ "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
+ "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
+ "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,pack200,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }'))
+
+$(eval $(call SetupLauncher,rmid,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,rmiregistry,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jcmd,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
+
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ $(eval $(call SetupLauncher,kinit,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
+
+ $(eval $(call SetupLauncher,klist,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
+
+ $(eval $(call SetupLauncher,ktab,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
+endif
+
+##########################################################################################
+# The order of the object files on the link command line affects the size of the resulting
+# binary (at least on linux) which causes the size to differ between old and new build.
+ifeq ($(USE_EXTERNAL_LIBZ), true)
+UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
+UNPACKEXE_ZIPOBJS := -lz
+else
+UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
+ $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
+
+endif
+
+ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ UNPACKEXE_CFLAGS += -xregs=no%appl
+ UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
+endif
+
+UNPACKEXE_LANG:=C
+ifeq ($(OPENJDK_TARGET_OS),solaris)
+ UNPACKEXE_LANG:=C++
+endif
+# On windows, unpack200 is linked completely differently to all other
+# executables, using the compiler with the compiler arguments.
+# It's also linked incrementally, producing a .ilk file that needs to
+# be kept away.
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ BUILD_UNPACKEXE_LDEXE:=$(CC)
+ EXE_OUT_OPTION_save:=$(EXE_OUT_OPTION)
+ EXE_OUT_OPTION:=-Fe
+endif
+$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\
+ SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\
+ EXCLUDE_FILES:=jni.cpp,\
+ LANG:=$(UNPACKEXE_LANG),\
+ OPTIMIZATION:=LOW, \
+ CFLAGS:=$(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE)\
+ -DFULL, \
+ CFLAGS_release:=-DPRODUCT,\
+ CFLAGS_linux:=-fPIC,\
+ CFLAGS_solaris:=-KPIC, \
+ CFLAGS_macosx:=-fPIC, \
+ MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200,\
+ LDFLAGS:=$(UNPACKEXE_ZIPOBJS),\
+ LDFLAGS_windows:=$(CXXFLAGS_JDKEXE),\
+ LDFLAGS_posix:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
+ $(call SET_SHARED_LIBRARY_ORIGIN),\
+ LDFLAGS_linux:=-lc,\
+ LDFLAGS_solaris:=$(UNPACKEXE_LDFLAGS_solaris) -lc,\
+ LDFLAGS_SUFFIX:=$(LIBCXX),\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\
+ OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\
+ PROGRAM:=unpack200,\
+ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
+ RC_FLAGS:=$(RC_FLAGS)\
+ -D "JDK_FNAME=unpack200.exe" \
+ -D "JDK_INTERNAL_NAME=unpack200" \
+ -D "JDK_FTYPE=0x1L",\
+ MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
+
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ EXE_OUT_OPTION:=$(EXE_OUT_OPTION_save)
+endif
+
+ifneq ($(USE_EXTERNAL_LIBZ), true)
+
+$(BUILD_UNPACKEXE) : $(UNPACKEXE_ZIPOBJS)
+
+endif
+
+# Build into object dir and copy executable afterwards to avoid .ilk file in
+# image. The real fix would be clean up linking of unpack200 using
+# -link -incremental:no
+# like all other launchers.
+$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
+ $(MKDIR) -p $(@D)
+ $(CP) '$<' '$@'
+
+BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
+
+##########################################################################################
+
+
+BUILD_JEXEC :=
+BUILD_JEXEC_SRC :=
+BUILD_JEXEC_INC :=
+BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
+
+#
+# UNHANDLED:
+# - COMPILE_APPROACH = normal
+#
+
+#
+# jdk/make/java/Makefile
+#
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ BUILD_JEXEC := 1
+ endif
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_JEXEC := 1
+endif # OPENJDK_TARGET_OS
+
+#
+# jdk/make/java/jexec/Makefile
+#
+ifeq ($(BUILD_JEXEC), 1)
+
+ ifeq ($(OPENJDK_TARGET_OS),windows)
+ else ifeq ($(OPENJDK_TARGET_OS),macosx)
+ BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
+ else
+ BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
+ BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
+ endif
+endif
+
+#
+# Note that the two Makefile's seems to contradict each other,
+# and that src/macosx/bin/jexec.c seems unused
+#
+ifneq ($(BUILD_JEXEC_SRC),)
+ $(eval $(call SetupNativeCompilation,BUILD_JEXEC,\
+ SRC:=$(BUILD_JEXEC_SRC),\
+ INCLUDE_FILES:=jexec.c,\
+ LANG:=C,\
+ OPTIMIZATION := LOW, \
+ CFLAGS:=$(CFLAGS_JDKEXE)\
+ $(BUILD_JEXEC_INC), \
+ CFLAGS_linux:=-fPIC,\
+ CFLAGS_solaris:=-KPIC,\
+ LDFLAGS:=$(LDFLAGS_JDKEXE) \
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
+ OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
+ PROGRAM:=jexec))
+
+ BUILD_LAUNCHERS += $(BUILD_JEXEC)
+endif
+
+##########################################################################################
+
+#
+# The java-rmi.cgi script in bin/ only gets delivered in certain situations
+#
+JAVA_RMI_CGI:=$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
+endif
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
+ endif
+endif
+
+# TODO:
+# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
+# this time anyway. Since jdk6, it has been built from the wrong source and resulted
+# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in
+# the final images bin dir. This weird behavior is mimicked here in the converted
+# makefiles for now. Should probably just be deleted.
+# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ $(eval $(call SetupLauncher,java-rmi,,\
+ $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
+else
+ $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
+ $(MKDIR) -p $(@D)
+ $(CP) $< $@
+ $(CHMOD) a+x $@
+endif
+
+##########################################################################################
+
+$(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
+
+all: $(BUILD_LAUNCHERS)
+
+.PHONY: all
diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk
index 5a3be46..47c9050 100644
--- a/jdk/makefiles/CompileNativeLibraries.gmk
+++ b/jdk/makefiles/CompileNativeLibraries.gmk
@@ -146,9 +146,9 @@
LDFLAGS_SUFFIX_windows:=jvm.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS) \
- /D "JDK_FNAME=verify.dll" \
- /D "JDK_INTERNAL_NAME=verify" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=verify.dll" \
+ -D "JDK_INTERNAL_NAME=verify" \
+ -D "JDK_FTYPE=0x2L",\
REORDER:=$(BUILD_LIBVERIFY_REORDER),\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libverify,\
DEBUG_SYMBOLS:=true))
@@ -171,15 +171,19 @@
$(JDK_TOPDIR)/src/share/native/java/util \
$(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
+
ifneq ($(OPENJDK_TARGET_OS),macosx)
LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
else
LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
endif
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
+endif
+
LIBJAVA_CFLAGS:=$(foreach dir,$(LIBJAVA_SRC_DIRS),-I$(dir)) \
-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
@@ -209,7 +213,6 @@
else
LIBJAVA_EXCLUDE_FILES += \
ProcessImpl_md.c \
- Win32FileSystem_md.c \
WinNTFileSystem_md.c \
dirent_md.c \
WindowsPreferences.c \
@@ -236,21 +239,21 @@
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows:=-export:winFileHandleOpen -export:handleLseek \
- $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) jvm.lib \
- shell32.lib delayimp.lib /DELAYLOAD:shell32.dll \
- advapi32.lib,\
LDFLAGS_SUFFIX_posix:=-ljvm -lverify, \
LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc,\
LDFLAGS_SUFFIX_linux:=$(LIBDL) $(BUILD_LIBFDLIBM),\
LDFLAGS_SUFFIX_macosx:=-L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
-framework CoreFoundation \
-framework Security -framework SystemConfiguration, \
+ LDFLAGS_SUFFIX_windows:=-export:winFileHandleOpen -export:handleLseek \
+ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
+ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
+ advapi32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=java.dll" \
- /D "JDK_INTERNAL_NAME=java" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=java.dll" \
+ -D "JDK_INTERNAL_NAME=java" \
+ -D "JDK_FTYPE=0x2L",\
REORDER:=$(LIBJAVA_REORDER), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -299,9 +302,9 @@
$(LDFLAGS_JDKLIB_SUFFIX),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=mlib_image.dll" \
- /D "JDK_INTERNAL_NAME=mlib_image" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=mlib_image.dll" \
+ -D "JDK_INTERNAL_NAME=mlib_image" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -423,10 +426,12 @@
$(CFLAGS_JDKLIB), \
MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
- $(BUILD_LIBMLIB_LDLIBS) \
+ $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
$(call SET_SHARED_LIBRARY_ORIGIN),\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v))
+$(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
+
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
endif
@@ -439,7 +444,6 @@
$(JDK_TOPDIR)/src/share/native/sun/awt/image \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- $(JDK_TOPDIR)/src/share/native/sun/awt/shell \
$(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
$(JDK_TOPDIR)/src/share/native/sun/awt/utility \
@@ -450,12 +454,17 @@
$(JDK_TOPDIR)/src/share/native/sun/awt/image \
$(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
- $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/font
+
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ LIBAWT_DIRS+=\
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
-
+else
+ LIBAWT_DIRS+=\
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
+endif
LIBAWT_CFLAGS:=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
$(X_CFLAGS) \
@@ -650,7 +659,21 @@
DllUtil.cpp \
initIDs.cpp \
MouseInfo.cpp \
- rect.c
+ rect.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ WGLGraphicsConfig.c \
+ WGLSurfaceData.c
LIBAWT_LANG:=C++
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
@@ -685,15 +708,6 @@
ASFLAGS:=$(LIBAWT_ASFLAGS),\
MAPFILE:=$(LIBAWT_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_windows:=advapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
- imm32.lib ole32.lib uuid.lib shell32.lib \
- comdlg32.lib winmm.lib comctl32.lib \
- shlwapi.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib \
- /DELAYLOAD:user32.dll /DELAYLOAD:gdi32.dll \
- /DELAYLOAD:shell32.dll /DELAYLOAD:winmm.dll \
- /DELAYLOAD:winspool.drv /DELAYLOAD:imm32.dll \
- /DELAYLOAD:ole32.dll /DELAYLOAD:comdlg32.dll \
- /DELAYLOAD:comctl32.dll /DELAYLOAD:shlwapi.dll,\
LDFLAGS_solaris:=-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
LDFLAGS_SUFFIX_linux:=-ljvm $(LIBM) $(LIBDL) -ljava,\
LDFLAGS_SUFFIX_solaris:=-ljvm $(LIBM) $(LIBDL) -ljava,\
@@ -706,11 +720,20 @@
-framework ApplicationServices \
-framework AudioToolbox \
-ljava,\
+ LDFLAGS_SUFFIX_windows:=kernel32.lib user32.lib gdi32.lib winspool.lib \
+ imm32.lib ole32.lib uuid.lib shell32.lib \
+ comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
+ delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
+ -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
+ -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
+ -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
+ -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll,\
VERSIONINFO_RESOURCE:=$(LIBAWT_VERSIONINFO_RESOURCE),\
RC_FLAGS:=$(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
- /D "JDK_FNAME=awt.dll" \
- /D "JDK_INTERNAL_NAME=awt" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=awt.dll" \
+ -D "JDK_INTERNAL_NAME=awt" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -864,9 +887,9 @@
LDFLAGS_SUFFIX:=$(LIBAWT_XAWT_LDFLAGS_SUFFIX),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=xawt.dll" \
- /D "JDK_INTERNAL_NAME=xawt" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=xawt.dll" \
+ -D "JDK_INTERNAL_NAME=xawt" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_xawt))
$(BUILD_LIBAWT_XAWT) : $(BUILD_LIBJAVA)
@@ -947,9 +970,9 @@
LDFLAGS_SUFFIX_macosx:=$(LIBZ) -ljava -ljvm,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=zip.dll" \
- /D "JDK_INTERNAL_NAME=zip" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=zip.dll" \
+ -D "JDK_INTERNAL_NAME=zip" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libzip,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -972,15 +995,15 @@
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_windows:=-map:$(JDK_OUTPUTDIR)/objs/unpack.map /debug \
+ LDFLAGS_windows:=-map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
jvm.lib $(WIN_JAVA_LIB),\
LDFLAGS_SUFFIX_posix:=-ljvm $(LIBCXX) -ljava -lc,\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libunpack,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=unpack.dll" \
- /D "JDK_INTERNAL_NAME=unpack" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=unpack.dll" \
+ -D "JDK_INTERNAL_NAME=unpack" \
+ -D "JDK_FTYPE=0x2L",\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
$(BUILD_LIBUNPACK) : $(BUILD_LIBJAVA)
@@ -1021,14 +1044,14 @@
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS) \
- /D "JDK_FNAME=attach.dll" \
- /D "JDK_INTERNAL_NAME=attach" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=attach.dll" \
+ -D "JDK_INTERNAL_NAME=attach" \
+ -D "JDK_FTYPE=0x2L",\
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
LDFLAGS_solaris:=-ldoor,\
- LDFLAGS_windows:=psapi.lib advapi32.lib $(WIN_JAVA_LIB) jvm.lib,\
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
+ LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib psapi.lib,\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libattach,\
DEBUG_SYMBOLS:=true))
@@ -1059,9 +1082,9 @@
LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=dt_socket.dll" \
- /D "JDK_INTERNAL_NAME=dt_socket" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=dt_socket.dll" \
+ -D "JDK_INTERNAL_NAME=dt_socket" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_socket,\
DEBUG_SYMBOLS:=true))
@@ -1091,9 +1114,9 @@
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=dt_shmem.dll" \
- /D "JDK_INTERNAL_NAME=dt_shmem" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=dt_shmem.dll" \
+ -D "JDK_INTERNAL_NAME=dt_shmem" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1126,9 +1149,9 @@
LDFLAGS_SUFFIX:=,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jdwp.dll" \
- /D "JDK_INTERNAL_NAME=jdwp" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jdwp.dll" \
+ -D "JDK_INTERNAL_NAME=jdwp" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1167,9 +1190,9 @@
EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS) \
- /D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
- /D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjaas,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1197,9 +1220,9 @@
LDFLAGS_SUFFIX:=,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jsdt.dll" \
- /D "JDK_INTERNAL_NAME=jsdt" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jsdt.dll" \
+ -D "JDK_INTERNAL_NAME=jsdt" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsdt, \
DEBUG_SYMBOLS:=true))
@@ -1241,10 +1264,11 @@
LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=lcms.dll" \
- /D "JDK_INTERNAL_NAME=lcms" \
- /D "JDK_FTYPE=0x2L",\
- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms))
+ -D "JDK_FNAME=lcms.dll" \
+ -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FTYPE=0x2L",\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
+ DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
BUILD_LIBRARIES += $(BUILD_LIBLCMS)
@@ -1300,9 +1324,9 @@
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jpeg.dll" \
- /D "JDK_INTERNAL_NAME=jpeg" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jpeg.dll" \
+ -D "JDK_INTERNAL_NAME=jpeg" \
+ -D "JDK_FTYPE=0x2L",\
REORDER:=$(BUILD_LIBJPEG_REORDER),\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1314,7 +1338,7 @@
##########################################################################################
ifndef OPENJDK
- FONT_HEADERS:=-I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
+ FONT_HEADERS:=-I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
BUILD_LIBFONTMANAGER_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
else
@@ -1369,16 +1393,18 @@
MAPFILE:=$(BUILD_LIBFONTMANAGER_MAPFILE), \
LDFLAGS:=$(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_windows:=advapi32.lib user32.lib gdi32.lib $(WIN_AWT_LIB) $(WIN_JAVA_LIB),\
LDFLAGS_SUFFIX:=$(BUILD_LIBFONTMANAGER_FONTLIB),\
LDFLAGS_SUFFIX_linux:=-lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc,\
LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm,\
- LDFLAGS_SUFFIX_macosx:=-lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup -ljava -ljvm,\
+ LDFLAGS_SUFFIX_macosx:=-lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
+ -ljava -ljvm,\
+ LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
+ $(WIN_AWT_LIB),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=fontmanager.dll" \
- /D "JDK_INTERNAL_NAME=fontmanager" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=fontmanager.dll" \
+ -D "JDK_INTERNAL_NAME=fontmanager" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1433,9 +1459,9 @@
LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=t2k.dll" \
- /D "JDK_INTERNAL_NAME=t2k" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=t2k.dll" \
+ -D "JDK_INTERNAL_NAME=t2k" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libt2k,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1470,9 +1496,9 @@
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jawt.dll" \
- /D "JDK_INTERNAL_NAME=jawt" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jawt.dll" \
+ -D "JDK_INTERNAL_NAME=jawt" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1583,9 +1609,9 @@
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBJDBCODBC_SONAME),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=JdbcOdbc.dll" \
- /D "JDK_INTERNAL_NAME=JdbcOdbc" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=JdbcOdbc.dll" \
+ -D "JDK_INTERNAL_NAME=JdbcOdbc" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(LIBJDBCODBC_DIR),\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1694,9 +1720,9 @@
LDFLAGS_SUFFIX_linux:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=instrument.dll" \
- /D "JDK_INTERNAL_NAME=instrument" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=instrument.dll" \
+ -D "JDK_INTERNAL_NAME=instrument" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(LIBINSTRUMENT_DIR),\
DEBUG_SYMBOLS:=true))
@@ -1755,14 +1781,14 @@
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib advapi32.lib psapi.lib,\
LDFLAGS_solaris:=-lkstat,\
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
+ LDFLAGS_SUFFIX_windows:=jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=management.dll" \
- /D "JDK_INTERNAL_NAME=management" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=management.dll" \
+ -D "JDK_INTERNAL_NAME=management" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmanagement,\
DEBUG_SYMBOLS:=true))
@@ -1811,9 +1837,9 @@
LDFLAGS_SUFFIX:=$(BUILD_LIBHPROF_LDFLAGS),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=hprof.dll" \
- /D "JDK_INTERNAL_NAME=hprof" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=hprof.dll" \
+ -D "JDK_INTERNAL_NAME=hprof" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libhprof_jvmti,\
DEBUG_SYMBOLS:=true))
@@ -1834,9 +1860,9 @@
$(call SET_SHARED_LIBRARY_ORIGIN),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=java_crw_demo.dll" \
- /D "JDK_INTERNAL_NAME=java_crw_demo" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=java_crw_demo.dll" \
+ -D "JDK_INTERNAL_NAME=java_crw_demo" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava_crw_demo,\
DEBUG_SYMBOLS:=true))
@@ -1860,9 +1886,9 @@
LDFLAGS_SUFFIX_windows:=-export:nptInitialize -export:nptTerminate,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=npt.dll" \
- /D "JDK_INTERNAL_NAME=npt" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=npt.dll" \
+ -D "JDK_INTERNAL_NAME=npt" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnpt,\
DEBUG_SYMBOLS:=true))
@@ -1873,10 +1899,14 @@
LIBNET_SRC_DIRS:=$(JDK_TOPDIR)/src/share/native/java/net \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
+ifeq ($(OPENJDK_TARGET_OS),windows)
+ LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
+else
+ LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
+endif
+
LIBNET_CFLAGS:=$(foreach dir,$(LIBNET_SRC_DIRS),-I$(dir))
LIBNET_EXCLUDE_FILES:=
@@ -1911,14 +1941,14 @@
LDFLAGS_SUFFIX_macosx:=-ljvm -ljava,\
LDFLAGS_SUFFIX_solaris:=-ljvm -ljava -lnsl -lsocket $(LIBDL) ,\
LDFLAGS_SUFFIX_linux:=$(LIBDL) -ljvm -lpthread -ljava,\
- LDFLAGS_SUFFIX_windows:=ws2_32.lib $(JVMLIB) secur32.lib iphlpapi.lib \
- delayimp.lib $(WIN_JAVA_LIB) jvm.lib advapi32.lib \
- /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll, \
+ LDFLAGS_SUFFIX_windows:=ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
+ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=net.dll" \
- /D "JDK_INTERNAL_NAME=net" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=net.dll" \
+ -D "JDK_INTERNAL_NAME=net" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnet,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -1927,7 +1957,7 @@
BUILD_LIBRARIES += $(BUILD_LIBNET)
$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
- $(ECHO) Copying $(@F)
+ $(ECHO) $(LOG_INFO) Copying $(@F)
$(MKDIR) -p $(@D)
$(CP) $< $@
@@ -1935,7 +1965,7 @@
ifeq ($(OPENJDK_TARGET_OS), solaris)
$(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template : $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
- $(ECHO) Copying $(@F)
+ $(ECHO) $(LOG_INFO) Copying $(@F)
$(MKDIR) -p $(@D)
$(CP) $< $@
@@ -2047,18 +2077,18 @@
LDFLAGS_SUFFIX_linux:=-ljava -lnet -lpthread $(LIBDL),\
LDFLAGS_SUFFIX_solaris:=-ljvm -lsocket -lposix4 $(LIBDL) \
-lsendfile -ljava -lnet -lc,\
- LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) \
- $(WIN_JAVA_LIB) $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
- advapi32.lib jvm.lib ws2_32.lib\
+ LDFLAGS_SUFFIX_windows:=jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
+ $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
$(JDK_OUTPUTDIR)/objs/libjava/io_util.obj \
- $(JDK_OUTPUTDIR)/objs/libjava/FileDescriptor_md.obj ,\
+ $(JDK_OUTPUTDIR)/objs/libjava/FileDescriptor_md.obj \
+ advapi32.lib,\
LDFLAGS_SUFFIX_macosx:=-ljava -lnet -pthread -framework CoreFoundation,\
LDFLAGS_SUFFIX:=,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=nio.dll" \
- /D "JDK_INTERNAL_NAME=nio" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=nio.dll" \
+ -D "JDK_INTERNAL_NAME=nio" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnio,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2218,9 +2248,9 @@
user32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS) \
- /D "JDK_FNAME=jli.dll" \
- /D "JDK_INTERNAL_NAME=jli" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jli.dll" \
+ -D "JDK_INTERNAL_NAME=jli" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2267,6 +2297,7 @@
##########################################################################################
+ifndef OPENJDK
ifeq ($(ENABLE_JFR), true)
$(eval $(call SetupNativeCompilation,BUILD_LIBJFR,\
@@ -2282,15 +2313,16 @@
$(call SET_SHARED_LIBRARY_ORIGIN),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jfr.dll" \
- /D "JDK_INTERNAL_NAME=jfr" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jfr.dll" \
+ -D "JDK_INTERNAL_NAME=jfr" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjfr,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
BUILD_LIBRARIES += $(BUILD_LIBJFR)
endif
+endif
##########################################################################################
@@ -2332,9 +2364,9 @@
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=kcms.dll" \
- /D "JDK_INTERNAL_NAME=kcms" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=kcms.dll" \
+ -D "JDK_INTERNAL_NAME=kcms" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkcms,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2614,7 +2646,7 @@
else ifneq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
else # OPENJDK_TARGET_OS
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
endif # OPENJDK_TARGET_OS
$(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN,\
@@ -2631,9 +2663,9 @@
LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=splashscreen.dll" \
- /D "JDK_INTERNAL_NAME=splashscreen" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=splashscreen.dll" \
+ -D "JDK_INTERNAL_NAME=splashscreen" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2673,9 +2705,9 @@
LDFLAGS_SUFFIX_posix:=-lm,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=dcpr.dll" \
- /D "JDK_INTERNAL_NAME=dcpr" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=dcpr.dll" \
+ -D "JDK_INTERNAL_NAME=dcpr" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdcpr,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2706,9 +2738,9 @@
LDFLAGS_SUFFIX_windows:=winscard.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=j2pcsc.dll" \
- /D "JDK_INTERNAL_NAME=j2pcsc" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=j2pcsc.dll" \
+ -D "JDK_INTERNAL_NAME=j2pcsc" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2743,10 +2775,9 @@
BUILD_LIBKRB5_NAME:=w2k_lsa_auth
BUILD_LIBKRB5_FILES:=NativeCreds.c WindowsDirectory.c
BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
- BUILD_LIBKRB5_LIBS:=Secur32.lib netapi32.lib \
- kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
- odbccp32.lib wsock32.lib
+ BUILD_LIBKRB5_LIBS:=advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
+ gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
else ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBKRB5_NAME:=osxkrb5
BUILD_LIBKRB5_FILES:=nativeccache.c
@@ -2770,9 +2801,9 @@
LDFLAGS_SUFFIX:=$(BUILD_LIBKRB5_LIBS) ,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
- /D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2786,22 +2817,20 @@
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\
LIBRARY:=sunmscapi,\
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
- SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/mscapi \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\
+ SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\
INCLUDE_FILES:=security.cpp, \
LANG:=C++,\
OPTIMIZATION:=LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/mscapi \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi ,\
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
LDFLAGS_SUFFIX:=Crypt32.Lib advapi32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=sunmscapi.dll" \
- /D "JDK_INTERNAL_NAME=sunmscapi" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=sunmscapi.dll" \
+ -D "JDK_INTERNAL_NAME=sunmscapi" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2830,9 +2859,9 @@
LDFLAGS_SUFFIX_posix:=$(LIBDL), \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=j2pkcs11.dll" \
- /D "JDK_INTERNAL_NAME=j2pkcs11" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=j2pkcs11.dll" \
+ -D "JDK_INTERNAL_NAME=j2pkcs11" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -2879,9 +2908,9 @@
LDFLAGS_SUFFIX_solaris:=-lc ,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=sunec.dll" \
- /D "JDK_INTERNAL_NAME=sunec" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=sunec.dll" \
+ -D "JDK_INTERNAL_NAME=sunec" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunec,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -3019,13 +3048,13 @@
-framework CoreServices -framework AudioUnit $(LIBCXX) \
-framework CoreMIDI -framework AudioToolbox,\
LDFLAGS_windows:=$(WIN_JAVA_LIB) advapi32.lib winmm.lib,\
- LDFLAGS_SUFFIX:=-ljava -ljvm,\
+ LDFLAGS_SUFFIX_posix:=-ljava -ljvm,\
LDFLAGS_SUFFIX_solaris:=-lc ,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jsound.dll" \
- /D "JDK_INTERNAL_NAME=jsound" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jsound.dll" \
+ -D "JDK_INTERNAL_NAME=jsound" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsound,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -3090,9 +3119,9 @@
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
- /D "JDK_FNAME=jsoundds.dll" \
- /D "JDK_INTERNAL_NAME=jsoundds" \
- /D "JDK_FTYPE=0x2L",\
+ -D "JDK_FNAME=jsoundds.dll" \
+ -D "JDK_INTERNAL_NAME=jsoundds" \
+ -D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -3182,6 +3211,7 @@
OPTIMIZATION:=LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\
LDFLAGS:=$(LDFLAGS_JDKLIB)\
@@ -3354,6 +3384,8 @@
INCLUDE_FILES:=$(LIBAWT_LWAWT_FILES),\
OPTIMIZATION:=LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \
+ $(X_CFLAGS) \
+ $(X_LIBS) \
$(foreach dir,$(LIBAWT_LWAWT_DIRS),-I$(dir)) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
diff --git a/jdk/makefiles/CopyFiles.gmk b/jdk/makefiles/CopyFiles.gmk
index b52a411..e0c8d62 100644
--- a/jdk/makefiles/CopyFiles.gmk
+++ b/jdk/makefiles/CopyFiles.gmk
@@ -263,16 +263,16 @@
##########################################################################################
-# Copy msvcr100.dll on windows
+# Copy msvcrXX.dll on windows
ifeq ($(OPENJDK_TARGET_OS),windows)
- MSVCRNN_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCRNN_DLL))
- $(MSVCRNN_TARGET): $(MSVCRNN_DLL)
+ MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
+ $(MSVCR_TARGET): $(MSVCR_DLL)
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
- COPY_FILES += $(MSVCRNN_TARGET)
+ COPY_FILES += $(MSVCR_TARGET)
endif
##########################################################################################
@@ -553,7 +553,7 @@
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so
$(MKDIR) -p $(@D)
$(RM) $@
- $(LN) -s $< $@
+ $(LN) -s $(<F) $@
COPY_FILES += $(DGALIBS)
diff --git a/jdk/makefiles/CopyIntoClasses.gmk b/jdk/makefiles/CopyIntoClasses.gmk
index 5519f29..213b79b 100644
--- a/jdk/makefiles/CopyIntoClasses.gmk
+++ b/jdk/makefiles/CopyIntoClasses.gmk
@@ -143,13 +143,11 @@
endif
# END: Swing plaf resources
-# The exception handling of swing beaninfo
-# These resources violates the convention of having code and resources together under
-# $(JDK_TOPDIR)/src/.../classes directories
SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images
SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
-OUT_BEANINFO_RESOURCES = $(addprefix $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/,\
- $(shell $(PRINTF) "$(SWING_BEANINFO_RESOURCES_SRC)\n" | $(SED) -e 's|/[^ ]*/beaninfo/images/||g'))
+OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%,\
+ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%,\
+ $(SWING_BEANINFO_RESOURCES_SRC))
COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
# END: Swing beaninfo resources
@@ -228,7 +226,7 @@
# Eval the newly created rules to incorporate them into the make tree.
define addto_meta-inf_services
$1
- echo Installing META-INF/services/$$(@F)
+ echo $(LOG_INFO) Installing META-INF/services/$$(@F)
$(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
endef
$(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i)))
diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
index 27ac93f..b5d5013 100644
--- a/jdk/makefiles/CreateJars.gmk
+++ b/jdk/makefiles/CreateJars.gmk
@@ -42,35 +42,30 @@
JARS:=
+$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib))
+
##########################################################################################
-JCONSOLE_JAR_DEPS := \
- $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/tools/jconsole/ -name "_the.package") \
- $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/com/sun/tools/jconsole/ -name "_the.package")
-
-$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,$(JCONSOLE_JAR_DEPS),\
+$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
SUFFIXES:=.class .gif .png .properties,\
INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\
JARMAIN:=sun.tools.jconsole.JConsole,\
- JAR:=$(JDK_OUTPUTDIR)/lib/jconsole.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\
SKIP_METAINF:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar
##########################################################################################
-DNS_JAR_DEPS := \
- $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/net/spi/nameservice/dns/ -name "_the.package") \
-
-$(eval $(call SetupArchive,BUILD_DNS_JAR,$(DNS_JAR_DEPS),\
+$(eval $(call SetupArchive,BUILD_DNS_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
INCLUDES:=sun/net/spi/nameservice/dns,\
EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
- JAR:=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\
SKIP_METAINF:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar
##########################################################################################
@@ -83,10 +78,10 @@
SUFFIXES:=.class _dict _th,\
INCLUDES:=$(LOCALEDATA_INCLUDES),\
EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
- JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\
SKIP_METAINF:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar
##########################################################################################
# rt.jar and resources.jar are being built in the same way as in the old build. They require
@@ -131,15 +126,15 @@
sun/tools/serialver \
sun/tools/tree \
sun/tools/util \
- sun/security/tools/JarBASE64Encoder.class \
- sun/security/tools/JarSigner.class \
- sun/security/tools/JarSignerParameters.class \
- sun/security/tools/JarSignerResources.class \
- sun/security/tools/JarSignerResources_ja.class \
- sun/security/tools/JarSignerResources_zh_CN.class \
- sun/security/tools/SignatureFile\$$$$Block.class \
- sun/security/tools/SignatureFile.class \
- sun/security/tools/TimestampedSigner.class \
+ sun/security/tools/jarsigner/JarBASE64Encoder.class \
+ sun/security/tools/jarsigner/Main.class \
+ sun/security/tools/jarsigner/JarSignerParameters.class \
+ sun/security/tools/jarsigner/Resources.class \
+ sun/security/tools/jarsigner/Resources_ja.class \
+ sun/security/tools/jarsigner/Resources_zh_CN.class \
+ sun/security/tools/jarsigner/SignatureFile\$$$$Block.class \
+ sun/security/tools/jarsigner/SignatureFile.class \
+ sun/security/tools/jarsigner/TimestampedSigner.class \
sun/security/provider/Sun.class \
sun/security/rsa/SunRsaSign.class \
sun/security/ssl \
@@ -249,23 +244,15 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
RT_JAR_EXCLUDES += com/sun/nio/sctp \
sun/nio/ch/sctp \
- sun/jdbc \
- sun/nio/ch/DevPollArrayWrapper\$$$$Updator.class \
- sun/nio/ch/DevPollArrayWrapper.class \
- sun/nio/ch/DevPollSelectorImpl.class \
- sun/nio/ch/DevPollSelectorProvider.class \
- sun/nio/ch/EPollArrayWrapper\$$$$Updator.class \
- sun/nio/ch/EPollArrayWrapper.class \
- sun/nio/ch/EPollSelectorImpl.class \
- sun/nio/ch/EPollSelectorProvider.class
+ sun/jdbc
endif
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \
| $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state')
-RT_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.rt.jar_manifest
-RESOURCE_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.resources.jar_manifest
+RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest
+RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
$(MKDIR) -p $(@D)
@@ -285,40 +272,40 @@
$(MAINMANIFEST) >> $@.tmp
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE)
+$(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE)
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/classlist : $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
+$(IMAGES_OUTPUTDIR)/lib/classlist : $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
$(MAKEFILE)
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
$(TOOL_ADDJSUM) $< $@.tmp
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/lib/_the.jars.exclude \
- $(ALL_FILES_IN_CLASSES) $(JDK_OUTPUTDIR)/lib/classlist
+$(IMAGES_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude \
+ $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
($(CD) $(JDK_OUTPUTDIR)/classes && \
$(TOOL_JARREORDER) \
- -o $@.tmp $(JDK_OUTPUTDIR)/lib/classlist $(JDK_OUTPUTDIR)/lib/_the.jars.exclude . )
+ -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude . )
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents
+$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
- $(GREP) -e '\.class$$' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
+ $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents
+$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
$(GREP) -v -e '\.class$$' \
-e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
- $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
+ $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
$(MV) $@.tmp $@
RT_JAR_CREATE_OPTIONS := c0fm
@@ -326,31 +313,29 @@
RT_JAR_CREATE_OPTIONS := cfm
endif
-$(JDK_OUTPUTDIR)/lib/rt.jar: $(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE)
+$(IMAGES_OUTPUTDIR)/lib/rt.jar: $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE)
$(ECHO) Creating rt.jar
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
$(CD) $(JDK_OUTPUTDIR)/classes && \
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
- @$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents
+ @$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents
$(MV) $@.tmp $@
-$(JDK_OUTPUTDIR)/lib/resources.jar: $(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents \
+$(IMAGES_OUTPUTDIR)/lib/resources.jar: $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents \
$(RESOURCE_JAR_MANIFEST_FILE)
$(ECHO) Creating resources.jar
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
$(CD) $(JDK_OUTPUTDIR)/classes && \
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
- @$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents
+ @$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents
$(MV) $@.tmp $@
-JARS+=$(JDK_OUTPUTDIR)/lib/rt.jar $(JDK_OUTPUTDIR)/lib/resources.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/lib/resources.jar
##########################################################################################
-CHARSETS_JAR_DEPS :=
-
ifneq ($(OPENJDK_TARGET_OS), windows)
CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \
sun/awt/motif/X11GB2312\$$$$Decoder.class \
@@ -362,32 +347,34 @@
sun/awt/motif/X11KSC5601.class
endif
-$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,$(CHARSETS_JAR_DEPS),\
+$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class .dat,\
INCLUDES:=sun/nio/cs/ext,\
EXTRA_FILES := sun/awt/HKSCS.class \
$(CHARSETS_EXTRA_FILES) \
META-INF/services/java.nio.charset.spi.CharsetProvider, \
- JAR:=$(JDK_OUTPUTDIR)/lib/charsets.jar, \
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
SKIP_METAINF := true, \
CHECK_COMPRESS_JAR:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/charsets.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/charsets.jar
##########################################################################################
+ifndef OPENJDK
ifeq ($(ENABLE_JFR), true)
$(eval $(call SetupArchive,BUILD_JFR_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
INCLUDES:=com/oracle/jrockit/jfr \
oracle/jrockit/jfr,\
- JAR:=$(JDK_OUTPUTDIR)/lib/jfr.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
SKIP_METAINF:=true,\
MANIFEST:=$(MAINMANIFEST), \
CHECK_COMPRESS_JAR:=true))
- JARS+=$(JDK_OUTPUTDIR)/lib/jfr.jar
+ JARS+=$(IMAGES_OUTPUTDIR)/lib/jfr.jar
+endif
endif
##########################################################################################
@@ -398,30 +385,30 @@
sun/security/rsa/SunRsaSign.class \
sun/security/ssl \
com/sun/net/ssl/internal/ssl,\
- JAR:=$(JDK_OUTPUTDIR)/lib/jsse.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\
SKIP_METAINF:=true,\
MANIFEST:=$(MAINMANIFEST), \
CHECK_COMPRESS_JAR:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/jsse.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/jsse.jar
##########################################################################################
-SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar
+SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
ifndef OPENJDK
SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
else
- $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,$(SUNPKCS11_JAR_DEPS),\
+ $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\
INCLUDES:=sun/security/pkcs11,\
@@ -434,14 +421,14 @@
##########################################################################################
-SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar
+SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
ifndef OPENJDK
SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
$(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt SunEC provider..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
@@ -467,26 +454,26 @@
INCLUDES:=javax/swing sun/swing,\
EXCLUDES:=javax/swing/plaf,\
EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\
- JAR:=$(JDK_OUTPUTDIR)/lib/dt.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\
SKIP_METAINF:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/dt.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar
##########################################################################################
-SUNJCE_PROVIDER_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunjce_provider.jar
+SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
ifndef OPENJDK
SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
$(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt SunJCE provider..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
else
- $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,$(SUNJCE_PROVIDER_JAR_DEPS),\
+ $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\
INCLUDES:= com/sun/crypto/provider,\
@@ -498,21 +485,21 @@
JARS += $(SUNJCE_PROVIDER_JAR_DST)
-JCE_JAR_DST := $(JDK_OUTPUTDIR)/lib/jce.jar
+JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
ifndef OPENJDK
JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
$(JCE_JAR_DST) : $(JCE_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt jce.jar..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
else
-$(eval $(call SetupArchive,BUILD_JCE_JAR,$(JCE_JAR_DEPS),\
+$(eval $(call SetupArchive,BUILD_JCE_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\
INCLUDES:= javax/crypto sun/security/internal,\
@@ -532,9 +519,12 @@
# TODO fix so that SetupArchive does not write files into SRCS
# then we don't need this extra copying
#
-US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
+# NOTE: We currently do not place restrictions on our limited export
+# policy. This was not a typo.
+#
+US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
-US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp
+US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
$(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
$(MKDIR) -p $(@D)
@@ -563,11 +553,19 @@
# TODO fix so that SetupArchive does not write files into SRCS
# then we don't need this extra copying
#
-LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar
-LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
-LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp
+LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
+LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
-LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy $(LOCAL_POLICY_JAR_TMP)/default_local.policy
+ifeq ($(UNLIMITED_CRYPTO), true)
+ LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
+ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
+ LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
+else
+ LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
+ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_TMP)/default_local.policy
+ LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
+endif
$(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
$(MKDIR) -p $(@D)
@@ -578,7 +576,7 @@
SRCS:=$(LOCAL_POLICY_JAR_TMP),\
SUFFIXES:= .policy,\
JAR:=$(LOCAL_POLICY_JAR_DST), \
- EXTRA_MANIFEST_ATTR := Crypto-Strength: limited, \
+ EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
SKIP_METAINF := true))
JARS += $(LOCAL_POLICY_JAR_DST)
@@ -589,26 +587,24 @@
ifeq ($(OPENJDK_TARGET_OS),windows)
-SUNMSCAPI_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunmscapi.jar
+SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
ifndef OPENJDK
SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt SunMSCAPI provider..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
else
-$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,$(SUNMSCAPI_JAR_DEPS),\
+$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\
INCLUDES:= sun/security/mscapi,\
JAR:=$(SUNMSCAPI_JAR_DST), \
- MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \
- EXTRA_MANIFEST_ATTR:=Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \
SKIP_METAINF:=true))
endif
@@ -621,11 +617,11 @@
ifeq ($(OPENJDK_TARGET_OS),solaris)
ifndef OPENJDK
-UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar
+UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
- @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
@@ -640,9 +636,9 @@
# Get the CLDRVERSION
include GensrcCLDR.gmk
-CLDRDATA_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/cldrdata.jar
+CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
-$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,$(CLDRDATA_DEPS),\
+$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
SUFFIXES:=.class,\
INCLUDES:=sun/text/resources/cldr \
@@ -715,21 +711,25 @@
sun/tools/jinfo \
sun/tools/jmap
-$(eval $(call SetupArchive,BUILD_TOOLS_JAR,$(TOOLS_JAR_DEPS),\
+# The sjavac tools is not ready for public consumption.
+TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac
+
+$(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
SUFFIXES:=.class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
Tool aliasmap options,\
INCLUDES:=$(TOOLS_JAR_INCLUDES),\
+ EXCLUDES:=$(TOOLS_JAR_EXCLUDES),\
EXTRA_FILES:=META-INF/services/com.sun.jdi.connect.Connector \
META-INF/services/com.sun.jdi.connect.spi.TransportService \
META-INF/services/com.sun.tools.attach.spi.AttachProvider \
META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
META-INF/services/com.sun.tools.internal.xjc.Plugin,\
- JAR:=$(JDK_OUTPUTDIR)/lib/tools.jar,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\
SKIP_METAINF:=true, \
CHECK_COMPRESS_JAR:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/tools.jar
+JARS+=$(IMAGES_OUTPUTDIR)/lib/tools.jar
##########################################################################################
@@ -761,7 +761,7 @@
com.oracle.net \
com.oracle.nio
-$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(JDK_OUTPUTDIR)/lib/rt.jar
+$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
$(JAVA) \
@@ -769,19 +769,19 @@
$(JAVAC_JARS) \
-XDprocess.packages -proc:only \
-processor com.sun.tools.javac.sym.CreateSymbols \
- -Acom.sun.tools.javac.sym.Jar=$(JDK_OUTPUTDIR)/lib/rt.jar \
+ -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
-Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
$(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
$(TOUCH) $@
-MAKE_SURE_DIR_EXISTS_DUMMY := $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols)
+$(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols)
$(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
INCLUDES:=META-INF/sym,\
- JAR:=$(JDK_OUTPUTDIR)/lib/ct.sym, \
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
CHECK_COMPRESS_JAR:=true))
-JARS+=$(JDK_OUTPUTDIR)/lib/ct.sym
+JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym
##########################################################################################
@@ -861,11 +861,12 @@
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
-# This dir needs to exsist before macro is evaluated to avoid warning from find.
-MAKE_SURE_DIR_EXISTS_DUMMY := $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/src)
+# This dir needs to exist before macro is evaluated to avoid warning from find.
+$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/src))
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP,\
SRC:=$(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src,\
INCLUDES:=$(SRC_ZIP_INCLUDES) launcher,\
+ EXCLUDES:=javax/swing/beaninfo,\
SUFFIXES:=.java .c .h,\
ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\
EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC)))
diff --git a/jdk/makefiles/GendataBreakIterator.gmk b/jdk/makefiles/GendataBreakIterator.gmk
index 52c6f6e..e07c90b 100644
--- a/jdk/makefiles/GendataBreakIterator.gmk
+++ b/jdk/makefiles/GendataBreakIterator.gmk
@@ -75,7 +75,7 @@
$(BIFILES): $(DATA_PKG_DIR)/_the.bifiles
$(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
$(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
- $(ECHO) "Generating BreakIteratorData"
+ $(ECHO) $(LOG_INFO) "Generating BreakIteratorData"
$(MKDIR) -p $(DATA_PKG_DIR)
$(RM) $(BIFILES)
$(TOOL_GENERATEBREAKITERATORDATA) \
@@ -86,7 +86,7 @@
$(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th
$(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
$(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
- $(ECHO) "Generating BreakIteratorData_th"
+ $(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th"
$(MKDIR) -p $(DATA_PKG_DIR)/th
$(RM) $(BIFILES_TH)
$(TOOL_GENERATEBREAKITERATORDATA) \
diff --git a/jdk/makefiles/GendataFontConfig.gmk b/jdk/makefiles/GendataFontConfig.gmk
index d748998..7f53908 100644
--- a/jdk/makefiles/GendataFontConfig.gmk
+++ b/jdk/makefiles/GendataFontConfig.gmk
@@ -75,7 +75,6 @@
$(RM) $@
$(MKDIR) -p $(@D)
$(CP) $< $@
- $(CHMOD) 644 $@
$(GENDATA_FONT_CONFIG_DST)/%.bfc : \
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties
diff --git a/jdk/makefiles/GendataHtml32dtd.gmk b/jdk/makefiles/GendataHtml32dtd.gmk
index f1a2c95..45a705d 100644
--- a/jdk/makefiles/GendataHtml32dtd.gmk
+++ b/jdk/makefiles/GendataHtml32dtd.gmk
@@ -30,6 +30,6 @@
$(ECHO) "Generating HTML DTD file"
$(MKDIR) -p $(@D)
$(RM) $@
- ($(TOOL_DTDBUILDER) html32 > $@) || exit 1
+ ($(TOOL_DTDBUILDER) $(LOG_INFO) html32 > $@) || exit 1
-GENDATA_HTML32DTD += $(HTML32DTD)
\ No newline at end of file
+GENDATA_HTML32DTD += $(HTML32DTD)
diff --git a/jdk/makefiles/GenerateClasses.gmk b/jdk/makefiles/GenerateClasses.gmk
index 4ebc56c..3ee2a05 100644
--- a/jdk/makefiles/GenerateClasses.gmk
+++ b/jdk/makefiles/GenerateClasses.gmk
@@ -32,13 +32,13 @@
# To ensure the latest stub generator files are picked up from corba repo
# when available, we need to run with latest rmic version available.
ifneq ($(COMPILE_TYPE),cross)
- RMIC := $(UNCYGDRIVE) $(JDK_OUTPUTDIR)/bin/rmic
+ RMIC := $(FIXPATH) $(JDK_OUTPUTDIR)/bin/rmic
endif
CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
# NOTE: If the smart javac dependency management is reintroduced, these classes risk
# interfering with the dependency checking. In that case they will need to be kept separate.
-STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/rmicclasses
+STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic
GENCLASSES :=
@@ -91,8 +91,10 @@
##########################################################################################
-all: $(GENCLASSES)
+$(RMIC_GENSRC_DIR)/_the.classes.removed: $(GENCLASSES)
$(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE)
- $(CP) -rp $(STUB_CLASSES_DIR)/* $(CLASSES_DIR)
+ $(TOUCH) $@
+
+all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(GENCLASSES)
.PHONY: all
diff --git a/jdk/makefiles/GenerateJavaSources.gmk b/jdk/makefiles/GenerateJavaSources.gmk
index 546b7e9..db70c73 100644
--- a/jdk/makefiles/GenerateJavaSources.gmk
+++ b/jdk/makefiles/GenerateJavaSources.gmk
@@ -67,7 +67,11 @@
ifneq ($(OPENJDK_TARGET_OS),windows)
include GensrcIcons.gmk
-GENSRC += $(GENSRC_ICONS)
+GENSRC += $(GENSRC_X11_ICONS)
+
+ifeq ($(OPENJDK_TARGET_OS),macosx)
+GENSRC += $(GENSRC_OSX_ICONS)
+endif
include GensrcX11Wrappers.gmk
GENSRC += $(GENSRC_X11WRAPPERS)
@@ -77,9 +81,7 @@
GENSRC += $(GENSRC_CLDR)
include GensrcSwing.gmk
-ifndef DISABLE_NIMBUS
- GENSRC += $(GENSRC_SWING_NIMBUS)
-endif
+GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS)
ifeq ($(OPENJDK_TARGET_OS), macosx)
include GensrcJObjC.gmk
@@ -88,34 +90,7 @@
$(GENSRC) : $(BUILD_TOOLS)
-# The exception handling of swing beaninfo
-# gensrc_swing/javax/swing/beaninfo/* have not be in src.zip
-all: $(GENSRC) $(GENSRC_SWING_BEANINFO)
- $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc
- (cd $(JDK_OUTPUTDIR) && \
- $(CHMOD) -R u+rw gensrc && \
- $(CP) -rp gensrc_characterdata/* gensrc && \
- $(CP) -rp gensrc_properties/* gensrc && \
- $(CP) -rp gensrc_localedatametainfo/* gensrc && \
- $(CP) -rp gensrc_jdwp/* gensrc && \
- $(CP) -rp gensrc_misc/* gensrc && \
- $(CP) -rp gensrc_charsetmapping/* gensrc && \
- $(CP) -rp gensrc_charsetcoder/* gensrc && \
- $(CP) -rp gensrc_exceptions/* gensrc && \
- $(CP) -rp gensrc_buffer/* gensrc && \
- $(CP) -rp gensrc_cldr/* gensrc)
- if [ -d $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/plaf ] ; then \
- (cd $(JDK_OUTPUTDIR) && \
- $(MKDIR) -p gensrc/javax/swing/plaf && \
- $(CP) -rp gensrc_swing/javax/swing/plaf/* gensrc/javax/swing/plaf) \
- fi
- if [ -d $(JDK_OUTPUTDIR)/gensrc_jobjc ] ; then \
- (cd $(JDK_OUTPUTDIR) && cp -rp gensrc_jobjc/src/* gensrc) \
- fi
-ifneq ($(OPENJDK_TARGET_OS),windows)
- (cd $(JDK_OUTPUTDIR) && \
- $(CP) -rp gensrc_icons/* gensrc && \
- $(CP) -rp gensrc_x11wrappers/classes/* gensrc)
-endif
+all: $(GENSRC)
+
.PHONY: all
diff --git a/jdk/makefiles/GensrcBuffer.gmk b/jdk/makefiles/GensrcBuffer.gmk
index f2f450b..3e55b1c 100644
--- a/jdk/makefiles/GensrcBuffer.gmk
+++ b/jdk/makefiles/GensrcBuffer.gmk
@@ -25,14 +25,14 @@
GENSRC_BUFFER :=
-GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc_buffer
-GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc_buffer/java/nio
+GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
###
-$(GENSRC_BUFFER_DST)/_the.dir :
+$(GENSRC_BUFFER_DST)/_the.buffer.dir :
$(ECHO) "Generating buffer classes"
$(MKDIR) -p $(@D)
$(TOUCH) $@
@@ -198,7 +198,9 @@
$(if $(12),$1_$(strip $(12)))
$(if $(13),$1_$(strip $(13)))
$(if $(14),$1_$(strip $(14)))
- $(if $(15),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
+ $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
$(call fixRw,$1,$$($1_RW))
$(call typesAndBits,$1,$$($1_type),$$($1_BO))
@@ -225,7 +227,7 @@
$(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven)
endif
-$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.dir
+$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
$(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).tmp \
-K$$($1_type) \
-K$$($1_category) \
diff --git a/jdk/makefiles/GensrcCLDR.gmk b/jdk/makefiles/GensrcCLDR.gmk
index 1cd3749..a86c122 100644
--- a/jdk/makefiles/GensrcCLDR.gmk
+++ b/jdk/makefiles/GensrcCLDR.gmk
@@ -26,7 +26,7 @@
CLDRVERSION := 21.0.1
CLDRSRCDIR := $(JDK_TOPDIR)/src/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
-GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_cldr
+GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc
CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java
diff --git a/jdk/makefiles/GensrcCharacterData.gmk b/jdk/makefiles/GensrcCharacterData.gmk
index 630b547..e720ab8 100644
--- a/jdk/makefiles/GensrcCharacterData.gmk
+++ b/jdk/makefiles/GensrcCharacterData.gmk
@@ -24,7 +24,7 @@
#
#
-# Rules to create $(JDK_OUTPUTDIR)/gensrc_characterdata/sun/lang/CharacterData*.java
+# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
#
GENSRC_CHARACTERDATA:=
@@ -33,18 +33,18 @@
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
define SetupCharacterData
- $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS)
+ $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS)
$(MKDIR) -p $$(@D)
- $(ECHO) Generating $1.java
+ $(ECHO) $(LOG_INFO) Generating $1.java
$(TOOL_GENERATECHARACTER) $2 \
-template $(CHARACTERDATA)/$1.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
- -o $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java -string \
+ -o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \
-usecharforbyte $3
- GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java
+ GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java
endef
$(eval $(call SetupCharacterData,CharacterDataLatin1,,-latin1 8))
@@ -54,12 +54,12 @@
$(eval $(call SetupCharacterData,CharacterData0E,-plane 14,11 4 1))
# Copy two Java files that need no preprocessing.
-$(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/%.java : $(CHARACTERDATA)/%.java.template
+$(JDK_OUTPUTDIR)/gensrc/java/lang/%.java : $(CHARACTERDATA)/%.java.template
$(MKDIR) -p $(@D)
- $(ECHO) Generating $(@F)
+ $(ECHO) $(LOG_INFO) Generating $(@F)
$(CP) -f $< $@
-GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/CharacterDataUndefined.java \
- $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/CharacterDataPrivateUse.java
+GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataUndefined.java \
+ $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataPrivateUse.java
$(GENSRC_CHARACTERDATA) : $(BUILD_TOOLS)
diff --git a/jdk/makefiles/GensrcCharsetCoder.gmk b/jdk/makefiles/GensrcCharsetCoder.gmk
index 74c1a1e..1ae7149 100644
--- a/jdk/makefiles/GensrcCharsetCoder.gmk
+++ b/jdk/makefiles/GensrcCharsetCoder.gmk
@@ -25,8 +25,8 @@
GENSRC_CHARSETCODER :=
-GENSRC_CHARSETCODER_TMP := $(JDK_OUTPUTDIR)/gensrc_charsetcoder
-GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc_charsetcoder/java/nio/charset
+GENSRC_CHARSETCODER_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio/charset
GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
diff --git a/jdk/makefiles/GensrcCharsetMapping.gmk b/jdk/makefiles/GensrcCharsetMapping.gmk
index 6ff21ad..5d32092 100644
--- a/jdk/makefiles/GensrcCharsetMapping.gmk
+++ b/jdk/makefiles/GensrcCharsetMapping.gmk
@@ -25,8 +25,8 @@
GENSRC_CHARSETMAPPING:=
-GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc_charsetmapping
-GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc_charsetmapping/sun/nio/cs
+GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs
GENSRC_SRC := $(JDK_TOPDIR)/make/tools/CharsetMapping
GENSRC_JAVA_SRC := $(JDK_TOPDIR)/make/tools/src/build/tools/charsetmapping
@@ -35,17 +35,17 @@
###
-$(GENSRC_TMP)/_the.dir :
+$(GENSRC_TMP)/_the.charsetmapping.dir :
$(ECHO) Generating charsetmapping classes
$(MKDIR) -p $(GENSRC_DST)/ext
$(TOUCH) $@
###
-GENSRC_SB := $(GENSRC_TMP)/gensrc_the.charsetmapping.sbcs
+GENSRC_SB := $(GENSRC_TMP)/_the.charsetmapping.sbcs
-$(GENSRC_SB) : $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.dir
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST) sbcs
+$(GENSRC_SB) : $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.charsetmapping.dir
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST) sbcs
$(TOUCH) $@
GENSRC_CHARSETMAPPING += $(GENSRC_SB)
@@ -53,28 +53,28 @@
###
$(GENSRC_DST)/ext/sjis0213.dat : $(GENSRC_SRC)/sjis0213.map $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $< $@ sjis0213
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $< $@ sjis0213
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/sjis0213.dat
###
$(GENSRC_DST)/ext/EUC_TWMapping.java : $(GENSRC_JAVA_SRC)/EUC_TW.java $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/EUC_TWMapping.java
###
$(GENSRC_DST)/ext/HKSCSMapping.java : $(GENSRC_JAVA_SRC)/HKSCS.java $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/HKSCSMapping.java
###
$(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs : $(GENSRC_SRC)/extsbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext extsbcs
+ $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext extsbcs
$(TOUCH) $@
GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs
@@ -82,7 +82,7 @@
###
$(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs : $(GENSRC_SRC)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext dbcs
+ $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext dbcs
$(TOUCH) $@
GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs
@@ -93,12 +93,12 @@
$(GENSRC_DST)/StandardCharsets.java : $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
$(GENSRC_CHARSET_PROVIDER_CMD) \
- $(GENSRC_TMP)/_the.dir
+ $(GENSRC_TMP)/_the.charsetmapping.dir
NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
HASHER="$(TOOL_HASHER)" \
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
- $(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $< $(@D)
+ $(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D)
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java
diff --git a/jdk/makefiles/GensrcExceptions.gmk b/jdk/makefiles/GensrcExceptions.gmk
index 1a1f717..a1cd393 100644
--- a/jdk/makefiles/GensrcExceptions.gmk
+++ b/jdk/makefiles/GensrcExceptions.gmk
@@ -25,8 +25,8 @@
GENSRC_EXCEPTIONS :=
-GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc_exceptions
-GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc_exceptions/java/nio
+GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/makefiles/scripts/genExceptions.sh
@@ -35,7 +35,7 @@
###
-$(GENSRC_EXCEPTIONS_DST)/_the.dir :
+$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir :
$(ECHO) "Generating exceptions classes"
$(MKDIR) -p $(@D)
$(TOUCH) $@
@@ -45,9 +45,9 @@
$(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
$(GENSRC_EXCEPTIONS_CMD) \
- $(GENSRC_EXCEPTIONS_DST)/_the.dir
+ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir
$(MKDIR) -p $(@D)/$*
- SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$*
+ SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_INFO)
$(TOUCH) $@
GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D))
diff --git a/jdk/makefiles/GensrcIcons.gmk b/jdk/makefiles/GensrcIcons.gmk
index 52cb418..a6a8a01 100644
--- a/jdk/makefiles/GensrcIcons.gmk
+++ b/jdk/makefiles/GensrcIcons.gmk
@@ -23,84 +23,105 @@
# questions.
#
-GENSRC_ICONS :=
-GENSRC_ICONS_SRC :=
-GENSRC_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc_icons
-GENSRC_ICONS_DST := $(GENSRC_ICONS_TMP)/sun/awt/X11
+GENSRC_X11_ICONS :=
+GENSRC_X11_ICONS_SRC :=
+GENSRC_X11_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_X11_ICONS_DST := $(GENSRC_X11_ICONS_TMP)/sun/awt/X11
ifdef OPENJDK
- ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)
+ X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)
else
- ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris
+ X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris
endif
-GENSRC_ICONS_SRC += \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
+GENSRC_X11_ICONS_SRC += \
+ $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
+ $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
+ $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
+ $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
-ICONPATH := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/awt/X11
+X11_ICONPATH := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/awt/X11
-GENSRC_ICONS_SRC += \
- $(ICONPATH)/security-icon-bw16.png \
- $(ICONPATH)/security-icon-interim16.png \
- $(ICONPATH)/security-icon-yellow16.png \
- $(ICONPATH)/security-icon-bw24.png \
- $(ICONPATH)/security-icon-interim24.png \
- $(ICONPATH)/security-icon-yellow24.png \
- $(ICONPATH)/security-icon-bw32.png \
- $(ICONPATH)/security-icon-interim32.png \
- $(ICONPATH)/security-icon-yellow32.png \
- $(ICONPATH)/security-icon-bw48.png \
- $(ICONPATH)/security-icon-interim48.png \
- $(ICONPATH)/security-icon-yellow48.png
+GENSRC_X11_ICONS_SRC += \
+ $(X11_ICONPATH)/security-icon-bw16.png \
+ $(X11_ICONPATH)/security-icon-interim16.png \
+ $(X11_ICONPATH)/security-icon-yellow16.png \
+ $(X11_ICONPATH)/security-icon-bw24.png \
+ $(X11_ICONPATH)/security-icon-interim24.png \
+ $(X11_ICONPATH)/security-icon-yellow24.png \
+ $(X11_ICONPATH)/security-icon-bw32.png \
+ $(X11_ICONPATH)/security-icon-interim32.png \
+ $(X11_ICONPATH)/security-icon-yellow32.png \
+ $(X11_ICONPATH)/security-icon-bw48.png \
+ $(X11_ICONPATH)/security-icon-interim48.png \
+ $(X11_ICONPATH)/security-icon-yellow48.png
-GENSRC_ICONS_FILES := $(notdir $(GENSRC_ICONS_SRC))
+GENSRC_X11_ICONS_FILES := $(notdir $(GENSRC_X11_ICONS_SRC))
-GENSRC_ICONS_SHORT_NAME = $(subst .,_,$(subst -,_,$(1)))
-GENSRC_ICONS_DST_NAME = XAWTIcon$(2)_$(subst .,_,$(subst -,_,$(1)))
+GENSRC_X11_ICONS_SHORT_NAME = $(subst .,_,$(subst -,_,$(1)))
+GENSRC_X11_ICONS_DST_NAME = XAWTIcon$(2)_$(subst .,_,$(subst -,_,$(1)))
###
-$(GENSRC_ICONS_TMP)/_the.dir :
+$(GENSRC_X11_ICONS_TMP)/_the.icons.dir :
$(ECHO) Generating icon classes
- $(MKDIR) -p $(GENSRC_ICONS_DST)
+ $(MKDIR) -p $(GENSRC_X11_ICONS_DST)
$(TOUCH) $@
###
-define SetupGensrcIcon
+define SetupGensrcX11Icon
# param 1 is for src-file
# param 2 is for src-dir
- $1_SHORTNAME := $(call GENSRC_ICONS_SHORT_NAME,$1)
- $1_NAME32 := $(call GENSRC_ICONS_DST_NAME,$1,32)
- $1_TARGET32 := $(GENSRC_ICONS_DST)/$$($1_NAME32).java
- $1_NAME64 := $(call GENSRC_ICONS_DST_NAME,$1,64)
- $1_TARGET64 := $(GENSRC_ICONS_DST)/$$($1_NAME64).java
+ $1_SHORTNAME := $(call GENSRC_X11_ICONS_SHORT_NAME,$1)
+ $1_NAME32 := $(call GENSRC_X11_ICONS_DST_NAME,$1,32)
+ $1_TARGET32 := $(GENSRC_X11_ICONS_DST)/$$($1_NAME32).java
+ $1_NAME64 := $(call GENSRC_X11_ICONS_DST_NAME,$1,64)
+ $1_TARGET64 := $(GENSRC_X11_ICONS_DST)/$$($1_NAME64).java
-$$($1_TARGET32) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir
+$$($1_TARGET32) : $2/$1 $(GENSRC_X11_ICONS_TMP)/_the.icons.dir
$(RM) $$@ $$@.tmp
$(ECHO) "package sun.awt.X11;" > $$@.tmp
$(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
$(ECHO) "public static int[] $$($1_SHORTNAME) = { " >> $$@.tmp
- $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
+ $(CAT) $$< | $(TOOL_X11_TOBIN) >> $$@.tmp
$(ECHO) "}; }" >> $$@.tmp
$(MV) $$@.tmp $$@
-GENSRC_ICONS += $$($1_TARGET32)
+GENSRC_X11_ICONS += $$($1_TARGET32)
-$$($1_TARGET64) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir
+$$($1_TARGET64) : $2/$1 $(GENSRC_X11_ICONS_TMP)/_the.icons.dir
$(RM) $$@ $$@.tmp
$(ECHO) "package sun.awt.X11;" > $$@.tmp
$(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
$(ECHO) "public static long[] $$($1_SHORTNAME) = { " >> $$@.tmp
- $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
+ $(CAT) $$< | $(TOOL_X11_TOBIN) >> $$@.tmp
$(ECHO) "}; }" >> $$@.tmp
$(MV) $$@.tmp $$@
-GENSRC_ICONS += $$($1_TARGET64)
+GENSRC_X11_ICONS += $$($1_TARGET64)
endef
-$(foreach I,$(GENSRC_ICONS_SRC), $(eval $(call SetupGensrcIcon,$(notdir $(I)),$(dir $(I)))))
+$(foreach I,$(GENSRC_X11_ICONS_SRC), $(eval $(call SetupGensrcX11Icon,$(notdir $(I)),$(dir $(I)))))
+
+###
+
+ifeq ($(OPENJDK_TARGET_OS),macosx)
+
+ GENSRC_OSX_ICONS = $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
+ GENSRC_OSX_ICONS_SRC =
+ GENSRC_OSX_ICONS_TMP = $(JDK_OUTPUTDIR)/gensrc
+ GENSRC_OSX_ICONS_DST = $(GENSRC_OSX_ICONS_TMP)/sun/osxapp
+
+$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: \
+ $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
+ $(RM) $@ $@.tmp
+ $(MKDIR) -p $(dir $@)
+ $(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp
+ $(CAT) $< | $(TOOL_OSX_TOBIN) >> $@.tmp
+ $(ECHO) "};" >> $@.tmp
+ $(MV) $@.tmp $@
+
+endif
+
diff --git a/jdk/makefiles/GensrcJDWP.gmk b/jdk/makefiles/GensrcJDWP.gmk
index 42e9181..e210353 100644
--- a/jdk/makefiles/GensrcJDWP.gmk
+++ b/jdk/makefiles/GensrcJDWP.gmk
@@ -28,20 +28,19 @@
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
-$(JDK_OUTPUTDIR)/gensrc_jdwp/com/sun/tools/jdi/JDWP.java : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
+$(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
$(MKDIR) -p $(@D)
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers
$(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
- $(ECHO) Creating JDWP.java and JDWPCommands.h from jdwp.spec
+ $(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec
$(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
$(MKDIR) -p $(@D)
$(RM) $@
- $(ECHO) Creating $(@F) from jdwp.spec
+ $(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec
$(TOOL_JDWPGEN) $< -doc $@
-GENSRC_JDWP:= $(JDK_OUTPUTDIR)/gensrc_jdwp/com/sun/tools/jdi/JDWP.java \
+GENSRC_JDWP:= $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
-
diff --git a/jdk/makefiles/GensrcJObjC.gmk b/jdk/makefiles/GensrcJObjC.gmk
index 84aebe1..e3c3d7a 100644
--- a/jdk/makefiles/GensrcJObjC.gmk
+++ b/jdk/makefiles/GensrcJObjC.gmk
@@ -64,7 +64,7 @@
if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \
$(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\
else \
- $(GBM) -F complete --framework $1 -o $@.tmp ; \
+ $(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \
fi
$(MV) $@.tmp $@
endef
@@ -88,8 +88,9 @@
# classpath that ends with "JObjC.jar", and emit the new bootclasspath.
#
$(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
+ $(ECHO) Generating jobjc framework bridge
$(RM) $@
- $(JAVA) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp
+ $(JAVA) $(LOG_INFO) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp
$(MV) $@.tmp $@
#
@@ -101,8 +102,14 @@
#
$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath | $(BRIDGESUPPORT)
$(RM) $@
- $(JAVA) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge
+ $(JAVA) $(LOG_INFO) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge
$(TOUCH) $@
-GENSRC_JOBJC += $(JOBJC_TMP)/_the.generator
+# The generator delets all files in the target dir so it has to work in its
+# own dir and have the files copied over to gensrc aftewards.
+$(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files : $(JOBJC_TMP)/_the.generator
+ $(MKDIR) -p $(@D)
+ $(CP) -rp $(JOBJC_DST)/* $(@D)
+ $(TOUCH) $@
+GENSRC_JOBJC += $(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files
diff --git a/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk b/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk
index 811d9d4..5f88ec0 100644
--- a/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk
+++ b/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk
@@ -40,14 +40,14 @@
LOCALE_RESOURCES:=$(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
# Include the list of resources found during the previous compile.
--include $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/_the.locale_resources
+-include $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
MISSING_RESOURCES:=$(filter-out $(LOCALE_RESOURCES),$(PREV_LOCALE_RESOURCES))
NEW_RESOURCES:=$(filter-out $(PREV_LOCALE_RESOURCES),$(LOCALE_RESOURCES))
ifneq (,$(MISSING_RESOURCES)$(NEW_RESOURCES))
# There is a difference in the number of supported resources. Trigger a regeneration.
- $(shell $(RM) $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/locale/provider/LocaleDataMetaInfo.java)
+ $(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java)
endif
# The non-euro zone locales have to be separated from the euro-zone locales.
@@ -93,18 +93,18 @@
SED_ARGS+= -e 's/$(HASH)AvailableLocales_EuroLocales$(HASH)/$(sort $(ALL_EURO_LOCALES))/g'
SED_ARGS+= -e 's/$(HASH)AvailableLocales_NonEuroLocales$(HASH)/$(sort $(ALL_NON_EURO_LOCALES))/g'
-$(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/locale/provider/LocaleDataMetaInfo.java: \
+$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \
$(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
$(MKDIR) -p $(@D)
$(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
- $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/_the.locale_resources
+ $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
$(SED) $(SED_ARGS) $< > $@
-GENSRC_LOCALEDATAMETAINFO:=$(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/locale/provider/LocaleDataMetaInfo.java
+GENSRC_LOCALEDATAMETAINFO:=$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java
###
-GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/CoreResourceBundleControl.java
+GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/util/CoreResourceBundleControl.java
GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh
JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
diff --git a/jdk/makefiles/GensrcMisc.gmk b/jdk/makefiles/GensrcMisc.gmk
index f373462..55f8636 100644
--- a/jdk/makefiles/GensrcMisc.gmk
+++ b/jdk/makefiles/GensrcMisc.gmk
@@ -28,11 +28,11 @@
# string and the runtime name into the Version.java file.
# To be printed by java -version
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java: \
+$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java: \
$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
- $(ECHO) Generating sun/misc/Version.java
+ $(ECHO) $(LOG_INFO) Generating sun/misc/Version.java
$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
-e 's/@@java_version@@/$(RELEASE)/g' \
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
@@ -40,20 +40,20 @@
$< > $@.tmp
$(MV) $@.tmp $@
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java
##########################################################################################
# Version file for jconsole
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java: \
+$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
- $(ECHO) Generating sun/tools/jconsole/Version.java
+ $(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java
$(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp
$(MV) $@.tmp $@
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java
##########################################################################################
@@ -65,14 +65,14 @@
# UNIXProcess.java is different for solaris and linux. We need to copy
# the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
- $(JDK_OUTPUTDIR)/gensrc_misc/java/lang/UNIXProcess.java : \
+ $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java : \
$(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
$(MKDIR) -p $(@D)
- $(ECHO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java
+ $(ECHO) $(LOG_INFO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java
$(CP) $< $@
$(CHMOD) u+rw $@
- GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/java/lang/UNIXProcess.java
+ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
endif
##########################################################################################
@@ -85,16 +85,14 @@
$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc1.c :
$(MKDIR) -p $(@D)
$(RM) $@
- $(ECHO) Creating $@
+ $(ECHO) $(LOG_INFO) Creating $@
$(PRINTF) "void dummyOdbc(void){}\n" > $@
- $(ECHO) Created $@
$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc2.c :
$(MKDIR) -p $(@D)
$(RM) $@
- $(ECHO) Creating $@
+ $(ECHO) $(LOG_INFO) Creating $@
$(PRINTF) "void dummyOdbc(void){}\n" > $@
- $(ECHO) Created $@
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc1.c $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc2.c
endif
@@ -103,11 +101,11 @@
##########################################################################################
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
GENSRC_SOR_SRC := $(JDK_TOPDIR)/src/share/native/sun/nio/ch
GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
-GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc_misc/genSocketOptionRegistry
+GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
@@ -126,15 +124,15 @@
HAS_SOCKET_OPTION_REGISTRY:=true
endif
-ifneq ($(HAS_SOCKET_OTION_REGISTRY),true)
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE)
+ifneq ($(HAS_SOCKET_OPTION_REGISTRY),true)
+$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE)
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
$(BUILD_GENSRC_SOR_EXE) >> $@.tmp
$(MV) $@.tmp $@
else
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
+$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
@@ -144,11 +142,11 @@
ifneq ($(OPENJDK_TARGET_OS),windows)
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
GENSRC_UC_SRC_FILE := genUnixConstants.c
-GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc_misc/genUnixConstants
+GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
@@ -159,6 +157,7 @@
LANG:=C,\
CC:=$(BUILD_CC),\
LDEXE:=$(BUILD_CC),\
+ CFLAGS:=$(filter -D%,$(CFLAGS_JDKEXE)),\
OBJECT_DIR:=$(GENSRC_UC_BIN),\
OUTPUT_DIR:=$(GENSRC_UC_BIN),\
PROGRAM:=genUnixConstants))
@@ -168,14 +167,14 @@
endif
ifneq ($(HAS_UNIX_CONSTANTS),true)
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE)
+$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE)
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
$(BUILD_GENSRC_UC_EXE) >> $@.tmp
$(MV) $@.tmp $@
else
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
+$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
@@ -187,11 +186,11 @@
ifeq ($(OPENJDK_TARGET_OS),solaris)
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
GENSRC_SOL_SRC_FILE := genSolarisConstants.c
-GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc_misc/genSolarisConstants
+GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
@@ -206,7 +205,7 @@
OUTPUT_DIR:=$(GENSRC_SOL_BIN),\
PROGRAM:=genSolarisConstants))
-$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java : $(BUILD_GENSRC_SOL_EXE)
+$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java : $(BUILD_GENSRC_SOL_EXE)
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
diff --git a/jdk/makefiles/GensrcProperties.gmk b/jdk/makefiles/GensrcProperties.gmk
index 8906b60..a00f546 100644
--- a/jdk/makefiles/GensrcProperties.gmk
+++ b/jdk/makefiles/GensrcProperties.gmk
@@ -57,13 +57,13 @@
ALL_COMPILED_PROPSOURCES+=$2
# Generate the list of to be created java files.
- ALL_COMPILED_PROPJAVAS+=$$(patsubst %,$(JDK_OUTPUTDIR)/gensrc_properties/%.java,$$($1_PROPPATHS))
+ ALL_COMPILED_PROPJAVAS+=$$(patsubst %,$(JDK_OUTPUTDIR)/gensrc/%.java,$$($1_PROPPATHS))
# Now generate a sequence of "-compile ...CurrencyNames_sv.properties ...CurrencyNames_sv.java ListResourceBundle"
# suitable to be fed into the CompileProperties command.
COMPILE_PROPCMDLINE+=$$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_,$2), \
$$(addsuffix _SPACE_$(strip $3),\
- $$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc_properties/,\
+ $$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc/,\
$$(addsuffix .java,$$($1_PROPPATHS))))))
endef
@@ -303,13 +303,12 @@
sun.util.resources.LocaleNamesBundle))
# Now setup the rule for the generation of the resource bundles.
-$(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS)
- $(RM) -r $(JDK_OUTPUTDIR)/gensrc_properties/*
+$(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS)
# Generate all output directories in advance since the build tool does not do that...
$(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS)))
$(ECHO) Compiling $(words $(ALL_COMPILED_PROPSOURCES)) properties into resource bundles
- $(call ListPathsSafely,COMPILE_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/gensrc_properties/_the.cmdline)
- $(TOOL_COMPILEPROPERTIES) -quiet @$(JDK_OUTPUTDIR)/gensrc_properties/_the.cmdline
+ $(call ListPathsSafely,COMPILE_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/gensrc/_the.cmdline)
+ $(TOOL_COMPILEPROPERTIES) -quiet @$(JDK_OUTPUTDIR)/gensrc/_the.cmdline
$(TOUCH) $@
# Now setup the rule for the generation of the cleaned properties.
@@ -323,13 +322,13 @@
$(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
$(TOUCH) $@
-$(ALL_COMPILED_PROPJAVAS) : $(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties
+$(ALL_COMPILED_PROPJAVAS) : $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties
$(ALL_CLEANED_PROPOUTPUT) : $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties
# Some zh_HK resources are just copied of zh_TW
-$(JDK_OUTPUTDIR)/gensrc_properties/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.java
+$(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.java
$(MKDIR) -p $(@D)
$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
@@ -338,7 +337,7 @@
sun/security/util/AuthResources_zh_HK.java \
sun/security/util/Resources_zh_HK.java
-ZH_HK_JAVA_FILES:=$(addprefix $(JDK_OUTPUTDIR)/gensrc_properties/,$(ZH_HK_JAVA))
+ZH_HK_JAVA_FILES:=$(addprefix $(JDK_OUTPUTDIR)/gensrc/,$(ZH_HK_JAVA))
GENSRC_PROPERTIES:=$(ALL_COMPILED_PROPJAVAS) $(ALL_CLEANED_PROPOUTPUT) $(ZH_HK_JAVA_FILES)
diff --git a/jdk/makefiles/GensrcSwing.gmk b/jdk/makefiles/GensrcSwing.gmk
index 3c0043e..9218fda 100644
--- a/jdk/makefiles/GensrcSwing.gmk
+++ b/jdk/makefiles/GensrcSwing.gmk
@@ -27,25 +27,25 @@
# Generate java files for javax.swing.plaf package
#
NIMBUS_PACKAGE = javax.swing.plaf
-NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/plaf/nimbus
+NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/plaf/nimbus
NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf
-$(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS)
+$(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS)
$(MKDIR) -p $(@D)
- $(ECHO) "Generating Nimbus source files:"
- $(TOOL_GENERATENIMBUS) \
- -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc_swing \
+ $(ECHO) "Generating Nimbus source files"
+ $(TOOL_GENERATENIMBUS) $(LOG_INFO) \
+ -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc \
-packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus
- $(ECHO) "Finished generating Nimbus source files"
+ $(ECHO) $(LOG_INFO) "Finished generating Nimbus source files"
$(TOUCH) $@
-GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_nimbus
+GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus
#
# Generate beaninfo java files
#
-BEAN_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo
+BEAN_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/beaninfo
DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans
# javax.swing package
@@ -69,9 +69,11 @@
# Dummy variable so far, in the old build system it was false by default
SWINGBEAN_DEBUG_FLAG = false
# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
-$(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_beaninfo: $(BEANS_SRC) $(BEAN_GENSRC_DIR)/SwingBeanInfoBase.java $(BEAN_GENSRC_DIR)/BeanInfoUtils.java $(BUILD_TOOLS)
+$(JDK_OUTPUTDIR)/gensrc/_the.generated_beaninfo: $(BEANS_SRC) $(BEAN_GENSRC_DIR)/SwingBeanInfoBase.java $(BEAN_GENSRC_DIR)/BeanInfoUtils.java $(BUILD_TOOLS)
+ $(ECHO) Generating beaninfo
$(JAVA) -Djava.awt.headless=true -jar $(JAVADOC_JARS) -doclet GenDocletBeanInfo -x $(SWINGBEAN_DEBUG_FLAG) -d $(BEAN_GENSRC_DIR) -t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
- -classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC)
+ -XDignore.symbol.file=true \
+ -classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO)
$(TOUCH) $@
# This file is the part of dt.jar
@@ -88,4 +90,4 @@
$(MKDIR) -p $(@D)
$(CP) $< $@
-GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_beaninfo
+GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc/_the.generated_beaninfo
diff --git a/jdk/makefiles/GensrcX11Wrappers.gmk b/jdk/makefiles/GensrcX11Wrappers.gmk
index 695f6bb..bad84fc 100644
--- a/jdk/makefiles/GensrcX11Wrappers.gmk
+++ b/jdk/makefiles/GensrcX11Wrappers.gmk
@@ -33,6 +33,7 @@
GENSRC_X11WRAPPERS :=
GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers
+GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc
GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
@@ -45,8 +46,8 @@
GENSRC_SIZES := sizes.32 sizes.64
endif
else
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86)
-# As a special case, solaris on x86 (32-bit) also generates the 64-bit version
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+# As a special case, solaris 32-bit also generates the 64-bit version
GENSRC_SIZES := sizes.32 sizes.64
endif
endif
@@ -54,6 +55,7 @@
##########################################################################################
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt
+ $(ECHO) "Generating X11 wrapper ($*-bit version)"
$(MKDIR) -p $(@D)
$(RM) $@
$(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
@@ -62,6 +64,8 @@
$(MKDIR) -p $(@D)
$(RM) $@ $@.tmp
(cd $(@D) && $(BUILD_CC) -m$* -o $@.tmp $< \
+ $(X_CFLAGS) \
+ $(X_LIBS) \
-I$(JDK_OUTPUTDIR)/include \
-I$(JDK_TOPDIR)/src/share/javavm/export \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
@@ -88,10 +92,9 @@
$(CP) $< $@
endif
-$(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
+$(GENSRC_X11WRAPPERS_DST)/_the.generated.x11 : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
$(RM) $@
$(MKDIR) -p $(@D)/sun/awt/X11
- $(RM) $(@D)/sun/awt/X11/*
$(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86_64)
# On solaris-x86_64, as a safety measure, compare the generated file with the checked-in version
@@ -100,4 +103,4 @@
endif
$(TOUCH) $@
-GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes
+GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_DST)/_the.generated.x11
diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk
index 0526f97..64d8bb1 100644
--- a/jdk/makefiles/Images.gmk
+++ b/jdk/makefiles/Images.gmk
@@ -42,35 +42,31 @@
-include $(CUSTOM_MAKE_DIR)/Images.gmk
-ifeq ($(OPENJDK_TARGET_OS),solaris)
-# On Solaris, if the target is a symlink and exists, cp won't overwrite.
-define install-file
- $(MKDIR) -p $(@D)
- $(RM) '$@'
- $(CP) -f -r -P '$<' '$(@D)'
-endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
-define install-file
- $(MKDIR) -p $(@D)
- $(CP) -fpRP '$<' '$@'
-endef
-else
-define install-file
- $(MKDIR) -p $(@D)
- $(CP) -fP '$<' '$@'
-endef
-endif
-
# Processing license files from source area to image area
# These will be modified to have the platform specific EOL chars.
define process-doc-file
- $(ECHO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D)
$(RM) $@
$(SED) 's/$$//g' $< > $@
$(CHMOD) 444 $@
endef
+define AddFileToCopy
+ # Param 1 - src root dir
+ # Param 2 - dest root dir
+ # Param 3 - src file
+ # Param 4 - variable to add targets to
+
+ # Remove src dir root from src file
+ $2_$3_FILE := $$(patsubst $1/%,%,$3)
+
+ $2/$$($2_$3_FILE): $3
+ $(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
+ $$(install-file)
+
+ $4 += $2/$$($2_$3_FILE)
+endef
JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-image
JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-image
@@ -93,31 +89,6 @@
################################################################################
# /bin dir
-$(JRE_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-# Overaly image targets
-$(JRE_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_OVERLAY_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
NOT_JRE_BIN_FILES := \
appletviewer$(EXE_SUFFIX) \
extcheck$(EXE_SUFFIX) \
@@ -154,7 +125,7 @@
WINDOWS_JDK_BIN_FILES = \
$(EXE_SUFFIX) \
$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
- $(notdir $(MSVCRNN_DLL))
+ $(notdir $(MSVCR_DLL))
WINDOWS_JDKJRE_BIN_FILES := \
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
@@ -163,6 +134,9 @@
# Find all files in bin dir
ALL_BIN_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f)
+# Prevent sjavac from entering the images.
+ALL_BIN_LIST := $(filter-out %/sjavac,$(ALL_BIN_LIST))
+
# For unknown reason the debuginfo files for executables are not put into images
# e.g filter them out
ifneq ($(OPENJDK_TARGET_OS),windows)
@@ -176,60 +150,42 @@
ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST))
endif
+JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
+JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
+
ifeq ($(OPENJDK_TARGET_OS),windows)
JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
+ # On windows x86, the server jvm is filtered out from the j2re image. This could possibly
+ # be handled by profiles in the future. If no client jvm is built, leave server in.
+ ifeq ($(OPENJDK_TARGET_CPU),x86)
+ ifeq ($(JVM_VARIANT_CLIENT),true)
+ JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%,$(JRE_BIN_LIST))
+ endif
+ endif
else
JDK_BIN_LIST := $(ALL_BIN_LIST)
endif
-JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
-JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
ifneq ($(OPENJDK_TARGET_CPU_ISADIR),)
OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
endif
-JRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%, \
- $(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
-JDK_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%, \
- $(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
-JDKJRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%, \
- $(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
+$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
+$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
+$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
-JRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_OVERLAY_IMAGE_DIR)/%, \
- $(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
-JDK_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/%, \
- $(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
-JDKJRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/jre/%, \
- $(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
+$(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
+$(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
+$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
################################################################################
# /lib dir
-
-$(JRE_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-# Overlay image targets
-$(JRE_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
-$(JDK_OVERLAY_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-
ifneq ($(OPENJDK_TARGET_OS), macosx)
JDKJRE_LIB_FILES := \
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
@@ -254,52 +210,80 @@
JDK_LIB_FILES += jexec
endif
-ALL_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) )
-JRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),$(ALL_LIB_LIST))
-JDKJRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_LIB_LIST))
-JDK_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_LIB_LIST))
+# Find all files to copy from $(JDK_OUTPUTDIR)/lib
+ALL_JDKOUT_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \
+ \( -name "_the*" -o -name "javac_state " \) )
+# Find all files to copy from $(IMAGES_OUTPUTDIR)/lib
+# This might not exist if building overlay-images
+ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),)
+ ALL_IMAGES_LIB_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \
+ \( -name "_the*" -o -name "javac_state " \) )
+endif
-JRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%,$(JRE_LIB_LIST))
-JDK_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%,$(JDK_LIB_LIST))
-JDKJRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%,$(JDKJRE_LIB_LIST))
+# Filter files to copy for each destination
+JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
+ $(ALL_JDKOUT_LIB_LIST))
+JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))
+JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))
-JRE_OVERLAY_LIB_TARGETS := $(subst $(JRE_IMAGE_DIR),$(JRE_OVERLAY_IMAGE_DIR),\
- $(filter $(JRE_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_LIB_TARGETS)))
-JDK_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
- $(filter $(JDK_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_LIB_TARGETS)))
-JDKJRE_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
- $(filter $(JDK_IMAGE_DIR)/jre/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_LIB_TARGETS)))
+JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
+ $(ALL_IMAGES_LIB_LIST))
+JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))
+JDK_IMAGES_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))
+
+# Iterate over files to copy to create rules for each one
+$(foreach f,$(JRE_JDKOUT_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
+$(foreach f,$(JDK_JDKOUT_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
+$(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
+
+$(foreach f,$(JRE_IMAGES_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
+$(foreach f,$(JDK_IMAGES_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
+$(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\
+ $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
+
+$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS)))
+$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS)))
+$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS)))
# CTE plugin security change require new empty directory lib/applet
$(JRE_IMAGE_DIR)/lib/applet:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $@
$(JDK_IMAGE_DIR)/jre/lib/applet:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $@
# In the old build, JObjC.jar is not part of the meta-index
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
################################################################################
# /man dir
-
-JRE_MAN_PAGES := \
+# Avoid evaluating this whole section on windows for speed and stability
+ifneq ($(OPENJDK_TARGET_OS),windows)
+ JRE_MAN_PAGES := \
java.1 \
keytool.1 \
orbd.1 \
@@ -311,11 +295,11 @@
tnameserv.1 \
unpack200.1
-ifndef OPENJDK
- JRE_MAN_PAGES += javaws.1
-endif
+ ifndef OPENJDK
+ JRE_MAN_PAGES += javaws.1
+ endif
-JDK_MAN_PAGES = \
+ JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \
appletviewer.1 \
extcheck.1 \
@@ -346,186 +330,176 @@
wsimport.1 \
xjc.1
-ifndef OPENJDK
- JDK_MAN_PAGES += jvisualvm.1
-endif
+ ifndef OPENJDK
+ JDK_MAN_PAGES += jvisualvm.1
+ endif
-ifeq ($(OPENJDK_TARGET_OS), linux)
- MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
- MAN1_SUBDIR:=man
-endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
- MAN1_SUBDIR:=sun/man/man1
-endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
- MAN1_SUBDIR:=man
- JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
- JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
-endif
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
+ MAN1_SUBDIR:=man
+ endif
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
+ MAN1_SUBDIR:=sun/man/man1
+ endif
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
+ MAN1_SUBDIR:=man
+ JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
+ JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
+ endif
-$(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
+ $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
-$(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
+ $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
-$(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
+ $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
-$(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
+ $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
-define install-ja-manpage
+ define install-ja-manpage
$(MKDIR) -p $(@D)
$(CAT) $< \
| $(NATIVE2ASCII) -encoding eucJP \
| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
| $(NATIVE2ASCII) -reverse -encoding $1 \
> $@
-endef
+ endef
-$(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,UTF-8)
-$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,UTF-8)
-$(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,PCK)
-$(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,PCK)
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(install-file)
- $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
- $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(install-file)
-endif
+ $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
+ $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(install-file)
+ endif
-# Old build creates empty man page for this, mimicing behaviour.
-$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja/man1/jcmd.1:
- $(ECHO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ # Old build creates empty man page for this, mimicing behaviour.
+ $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja/man1/jcmd.1:
+ $(ECHO) $(LOG_INFO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D)
$(TOUCH) $@
-ifeq ($(OPENJDK_TARGET_OS), linux)
- $(JRE_IMAGE_DIR)/man/ja:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ $(JRE_IMAGE_DIR)/man/ja:
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
- $(JDK_IMAGE_DIR)/man/ja:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
-endif
+ $(JDK_IMAGE_DIR)/man/ja:
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
+ endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(JRE_IMAGE_DIR)/man/ja:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(JRE_IMAGE_DIR)/man/ja:
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
- $(JDK_IMAGE_DIR)/man/ja:
- $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
- $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
-endif
+ $(JDK_IMAGE_DIR)/man/ja:
+ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
+ endif
-ifeq ($(OPENJDK_TARGET_OS), linux)
- JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
- $(JRE_IMAGE_DIR)/man/ja
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
+ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
+ $(JRE_IMAGE_DIR)/man/ja
- JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
- $(JDK_IMAGE_DIR)/man/ja
-endif
+ JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
+ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
+ $(JDK_IMAGE_DIR)/man/ja
+ endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
- $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES))
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
+ $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \
+ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
+ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES))
- JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
- $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES))
-endif
+ JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
+ $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \
+ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
+ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES))
+ endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
- $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
- $(JRE_IMAGE_DIR)/man/ja
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
+ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
+ $(JRE_IMAGE_DIR)/man/ja
- JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
- $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
- $(JDK_IMAGE_DIR)/man/ja
-endif
+ JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
+ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
+ $(JDK_IMAGE_DIR)/man/ja
+ endif
+
+endif # Windows
################################################################################
# /demo dir
-ifndef NO_DEMOS
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
# The db demo contains an empty dir that needs to be copied. The other
# directories will always trigger the rule for recompile since
# _the.list_of_packages files are touched.
- $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
+$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
if [ ! -d "$@" ]; then \
- $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
+ $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
$(MKDIR) -p $(@D); \
if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
fi
# Find all files including directories
- JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
+JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
- # Param 1 is source file
- define CreateOverlayDemoRule
- $1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
+# Param 1 is source file
+define CreateOverlayDemoRule
+ $1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
- $$($1_TARGET): $1
- $(ECHO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
- $(MKDIR) -p $$(@D)
- $(RM) $$@
- $(CP) -f '$$<' '$$@'
+ $$($1_TARGET): $1
+ $(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
+ $$(call install-file)
- JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
- endef
- JDK_OVERLAY_DEMO_SOURCES := $(shell $(FIND) $(JDK_OUTPUTDIR)/demo -name "*$(SHARED_LIBRARY_SUFFIX)")
- $(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
-
-endif
+ JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
+endef
+JDK_OVERLAY_DEMO_SOURCES := $(shell $(FIND) $(JDK_OUTPUTDIR)/demo -name "*$(SHARED_LIBRARY_SUFFIX)")
+$(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
################################################################################
# /sample dir
-ifndef NO_SAMPLES
- $(JDK_IMAGE_DIR)/sample/%: $(JDK_OUTPUTDIR)/sample/%
- $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
- $(install-file)
-
- JDK_SAMPLE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/sample/%,$(JDK_IMAGE_DIR)/sample/%,\
- $(shell $(FIND) $(JDK_OUTPUTDIR)/sample -type f))
-
-endif
+$(foreach f,$(shell $(FIND) $(JDK_OUTPUTDIR)/sample -type f),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS)))
################################################################################
# /db dir
@@ -534,14 +508,13 @@
$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/%
$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
$(MKDIR) -p $(JDK_IMAGE_DIR)/db
- cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $< -x index.html 2> /dev/null
+ cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x index.html 2> /dev/null
$(MKDIR) -p $(@D)
$(TOUCH) $@
$(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html
- $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
+ $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
$(install-file)
- $(CHMOD) 644 $(@)
JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\
$(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*.zip" ! -name "*demo*")) \
@@ -552,12 +525,8 @@
################################################################################
# /include dir
-$(JDK_IMAGE_DIR)/include/%: $(JDK_OUTPUTDIR)/include/%
- $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
- $(install-file)
-
- JDK_INCLUDE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/include/%,$(JDK_IMAGE_DIR)/include/%,\
- $(shell $(FIND) $(JDK_OUTPUTDIR)/include -type f))
+$(foreach f,$(shell $(FIND) $(JDK_OUTPUTDIR)/include -type f),\
+ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS)))
################################################################################
# doc files
@@ -575,12 +544,7 @@
else
JRE_DOC_FILES += README
endif
- ifndef NO_DEMOS
- JDK_DOC_FILES += demo/DEMOS_LICENSE
- endif
- ifndef NO_SAMPLES
- JDK_DOC_FILES += sample/SAMPLES_LICENSE
- endif
+ JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre
JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk
endif
@@ -636,23 +600,23 @@
fi)
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call create-info-file)
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call create-info-file)
$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call create-info-file)
$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
- $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call create-info-file)
$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
- $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
+ $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
################################################################################
@@ -661,7 +625,7 @@
ifneq ($(POST_STRIP_CMD),)
ifeq ($(OPENJDK_TARGET_OS), windows)
EXEC_LIST_BIN:=$(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*.exe \
- -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)")
+ -o -name \*.dll | $(EGREP) -v -i "$(MSVCR_DLL)")
else
# Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
EXEC_LIST_BIN:=$(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX)` \
@@ -672,6 +636,8 @@
EXEC_LIST_LIB:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
endif
endif
+ # Filter out sjavac
+ EXEC_LIST_BIN:=$(filter-out %sjavac$(EXE_SUFFIX),$(EXEC_LIST_BIN))
# Filter out the overlay specific bin files
EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
@@ -708,7 +674,7 @@
endef
define strip-file
- $(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
+ $(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<)
$(CHMOD) u+w $<
$(POST_STRIP_CMD) $<
$(call mcs-file)
diff --git a/jdk/makefiles/Import.gmk b/jdk/makefiles/Import.gmk
index 4c07307..76272da 100644
--- a/jdk/makefiles/Import.gmk
+++ b/jdk/makefiles/Import.gmk
@@ -125,7 +125,7 @@
$1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES))
IMPORT_TARGET_FILES += $$($1_DST_FILES)
$3/% : $2/%
- $(ECHO) Copying $$(@F)
+ $(ECHO) $(LOG_INFO) Copying $$(@F)
$(do-install-file)
endef
@@ -234,19 +234,14 @@
IMPORT_TARGET_FILES += \
$(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar \
- $(JDK_OUTPUTDIR)/lib/security/local_policy.jar \
- $(JDK_OUTPUTDIR)/lib/jce.jar
-
-$(JDK_OUTPUTDIR)/lib/jce.jar : $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
- $(ECHO) Copying $(@F)
- $(install-file)
+ $(JDK_OUTPUTDIR)/lib/security/local_policy.jar
$(JDK_OUTPUTDIR)/lib/security/local_policy.jar: $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
- $(ECHO) Copying $(@F)
+ $(ECHO) $(LOG_INFO) Copying $(@F)
$(install-file)
$(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar: $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
- $(ECHO) Copying $(@F)
+ $(ECHO) $(LOG_INFO) Copying $(@F)
$(install-file)
endif # OPENJDK
diff --git a/jdk/makefiles/Makefile b/jdk/makefiles/Makefile
index 060a483..9539fe0 100644
--- a/jdk/makefiles/Makefile
+++ b/jdk/makefiles/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,102 +23,27 @@
# questions.
#
-# This must be the first rule
-default: all
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-
-# Setup the build tools.
-include Tools.gmk
-
-import: $(BUILD_TOOLS) import-only
-import-only:
-# Import (corba jaxp jaxws langtools hotspot)
- +$(MAKE) -f Import.gmk
-
-gensrc: import gensrc-only
-gensrc-only:
- +$(MAKE) -f GenerateJavaSources.gmk
-# Ok, now gensrc is fully populated.
-
-gendata: gensrc gendata-only
-gendata-only:
- +$(MAKE) -f GenerateData.gmk
-
-classes: gendata classes-only
-classes-only:
- +$(MAKE) -f CompileJavaClasses.gmk
-# The classes are now built and
-# any javah files have now been generated.
-
-libs: classes libs-only
-libs-only:
- +$(MAKE) -f CompileNativeLibraries.gmk
-
-launchers: libs launchers-only
-launchers-only:
-# Finally compile the launchers.
- +$(MAKE) -f CompileLaunchers.gmk
-
-genclasses: launchers genclasses-only
-genclasses-only:
-# Generate classes that have other sources. Needs
-# to execute launchers.
- +$(MAKE) -f GenerateClasses.gmk
-
-demos: genclasses demos-only
-demos-only:
-# Now we have a complete jdk, which you can run.
-# It is not yet wrapped up as an installed image.
-# The demos are compiled against this jdk.
-ifndef NO_DEMOS
- +$(MAKE) -f CompileDemos.gmk
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+ $(info Will run $(subsystem_name) target on top-level Makefile)
+ $(info WARNING: This is a non-recommended way of building!)
+ $(info ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-samples: demos samples-only
-samples-only:
-# Now copy the sample sources into the jdk.
-ifndef NO_SAMPLES
- +$(MAKE) -f CopySamples.gmk
-endif
-
-# The all target builds the JDK, but not the images
-all: import gensrc gendata classes libs launchers genclasses demos samples
-
-.PHONY: all images install overlay-images import-only gensrc-only gendata-only classes-only
-.PHONY: libs-only launchers-only genclasses-only demos-only samples-only
-
-# Create the final jdk and jre images, to be wrapped up
-# into packages, or installed.
-images:
- +$(MAKE) -f CreateJars.gmk
- +$(MAKE) -f Images.gmk
-
-overlay-images:
- +$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
- +$(MAKE) -f Images.gmk overlay-images
-
-BINARIES:=$(shell if test -d $(IMAGES_OUTPUTDIR)/j2sdk-image/bin; then cd $(IMAGES_OUTPUTDIR)/j2sdk-image/bin && $(LS) ; fi)
-INSTALLDIR:=openjdk-$(RELEASE)
-
-# Install the jdk image, in a very crude way. Not taking into
-# account, how to install properly on macosx or windows etc.
-install: images
- echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
- echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
- $(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
- $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
- $(CP) -rp $(IMAGES_OUTPUTDIR)/j2sdk-image/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
- $(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
- $(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jdk/makefiles/Tools.gmk b/jdk/makefiles/Tools.gmk
index 3308756..545fe3d 100644
--- a/jdk/makefiles/Tools.gmk
+++ b/jdk/makefiles/Tools.gmk
@@ -29,14 +29,13 @@
SETUP:=GENERATE_OLDBYTECODE,\
SRC:=$(JDK_TOPDIR)/make/tools/src \
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator \
- $(JDK_TOPDIR)/makefiles/sun/xawt \
+ $(JDK_TOPDIR)/makefiles/sun/awt/X11 \
+ $(JDK_TOPDIR)/makefiles/sun/osxapp \
$(JDK_TOPDIR)/make/tools/swing-beans,\
BIN:=$(JDK_OUTPUTDIR)/btclasses))
endif
-ifndef DISABLE_NIMBUS
-
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template : \
$(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
$(MKDIR) -p $(@D)
@@ -44,9 +43,6 @@
BUILD_TOOLS += $(foreach i,$(wildcard $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/*.template),$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i))
-endif
-
-
# Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
TOOL_ADDJSUM=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.addjsum.AddJsum
@@ -121,9 +117,12 @@
TOOL_WRAPPERGENERATOR=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
WrapperGenerator
-TOOL_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
+TOOL_X11_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
sun.awt.X11.ToBin
+TOOL_OSX_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
+ sun.osxapp.ToBin
+
TOOL_CLDRCONVERTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.cldrconverter.CLDRConverter
diff --git a/jdk/makefiles/docs/CORE_PKGS.gmk b/jdk/makefiles/docs/CORE_PKGS.gmk
deleted file mode 100644
index e292869..0000000
--- a/jdk/makefiles/docs/CORE_PKGS.gmk
+++ /dev/null
@@ -1,293 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-# EXCLUDE_PKGS is the list of packages to exclude from the
-# Java API Specification. Do not add these to CORE_PKGS.
-# The concatenation of EXCLUDE_PKGS and CORE_PKGS
-# should make up the list of all packages under the
-# src/shared/classes directory of the JDK source tree.
-#
-EXCLUDE_PKGS = \
- java.awt.peer \
- java.awt.dnd.peer \
- sun.* \
- com.sun.* \
- org.apache.* \
- org.jcp.* \
- org.w3c.dom.css \
- org.w3c.dom.html \
- org.w3c.dom.stylesheets \
- org.w3c.dom.traversal \
- org.w3c.dom.ranges \
- org.w3c.dom.views \
- org.omg.stub.javax.management.remote.rmi
-
-#
-# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
-# one that is doing its own review. These packages are not included when
-# creating diff pages for the platform's JCP process.
-#
-# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
-# Note:
-# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
-#
-ACTIVE_JSR_PKGS= \
- java.lang.invoke \
- java.sql \
- javax.activation \
- javax.annotation.* \
- javax.jws.* \
- javax.lang.* \
- javax.management.* \
- javax.script \
- javax.sql.* \
- javax.tools.* \
- javax.xml.* \
- org.w3c.* \
- org.xml.sax
-
-#
-# CORE_PKGS is the list of packages that form the
-# Java API Specification.
-#
-### ***IMPORTANT NOTE***
-### There is also a "REGEXP" variable in the docs/makefile that
-### determines which table the packages go in on the main page.
-### Currently, there is only table ("Platform Packages") and
-### everything goes in it, so REGEXP is "*". But if that policy
-### changes, packages added will need to be reflected in that
-### list of wildcard expressions, as well.
-###
-CORE_PKGS = \
- java.applet \
- java.awt \
- java.awt.color \
- java.awt.datatransfer \
- java.awt.dnd \
- java.awt.event \
- java.awt.font \
- java.awt.geom \
- java.awt.im \
- java.awt.im.spi \
- java.awt.image \
- java.awt.image.renderable \
- java.awt.print \
- java.beans \
- java.beans.beancontext \
- java.io \
- java.lang \
- java.lang.annotation \
- java.lang.instrument \
- java.lang.invoke \
- java.lang.management \
- java.lang.ref \
- java.lang.reflect \
- java.math \
- java.net \
- java.nio \
- java.nio.channels \
- java.nio.channels.spi \
- java.nio.charset \
- java.nio.charset.spi \
- java.nio.file \
- java.nio.file.attribute \
- java.nio.file.spi \
- java.rmi \
- java.rmi.activation \
- java.rmi.dgc \
- java.rmi.registry \
- java.rmi.server \
- java.security \
- java.security.acl \
- java.security.cert \
- java.security.interfaces \
- java.security.spec \
- java.sql \
- java.text \
- java.text.spi \
- java.util \
- java.util.concurrent \
- java.util.concurrent.atomic \
- java.util.concurrent.locks \
- java.util.jar \
- java.util.logging \
- java.util.prefs \
- java.util.regex \
- java.util.spi \
- java.util.zip \
- javax.accessibility \
- javax.activation \
- javax.activity \
- javax.annotation \
- javax.annotation.processing \
- javax.crypto \
- javax.crypto.interfaces \
- javax.crypto.spec \
- javax.imageio \
- javax.imageio.event \
- javax.imageio.metadata \
- javax.imageio.plugins.jpeg \
- javax.imageio.plugins.bmp \
- javax.imageio.spi \
- javax.imageio.stream \
- javax.jws \
- javax.jws.soap \
- javax.lang.model \
- javax.lang.model.element \
- javax.lang.model.type \
- javax.lang.model.util \
- javax.management \
- javax.management.loading \
- javax.management.monitor \
- javax.management.relation \
- javax.management.openmbean \
- javax.management.timer \
- javax.management.modelmbean \
- javax.management.remote \
- javax.management.remote.rmi \
- javax.naming \
- javax.naming.directory \
- javax.naming.event \
- javax.naming.ldap \
- javax.naming.spi \
- javax.net \
- javax.net.ssl \
- javax.print \
- javax.print.attribute \
- javax.print.attribute.standard \
- javax.print.event \
- javax.rmi \
- javax.rmi.CORBA \
- javax.rmi.ssl \
- javax.script \
- javax.security.auth \
- javax.security.auth.callback \
- javax.security.auth.kerberos \
- javax.security.auth.login \
- javax.security.auth.spi \
- javax.security.auth.x500 \
- javax.security.cert \
- javax.security.sasl \
- javax.sound.sampled \
- javax.sound.sampled.spi \
- javax.sound.midi \
- javax.sound.midi.spi \
- javax.sql \
- javax.sql.rowset \
- javax.sql.rowset.serial \
- javax.sql.rowset.spi \
- javax.swing \
- javax.swing.border \
- javax.swing.colorchooser \
- javax.swing.filechooser \
- javax.swing.event \
- javax.swing.table \
- javax.swing.text \
- javax.swing.text.html \
- javax.swing.text.html.parser \
- javax.swing.text.rtf \
- javax.swing.tree \
- javax.swing.undo \
- javax.swing.plaf \
- javax.swing.plaf.basic \
- javax.swing.plaf.metal \
- javax.swing.plaf.multi \
- javax.swing.plaf.nimbus \
- javax.swing.plaf.synth \
- javax.tools \
- javax.tools.annotation \
- javax.transaction \
- javax.transaction.xa \
- javax.xml.parsers \
- javax.xml.bind \
- javax.xml.bind.annotation \
- javax.xml.bind.annotation.adapters \
- javax.xml.bind.attachment \
- javax.xml.bind.helpers \
- javax.xml.bind.util \
- javax.xml.soap \
- javax.xml.ws \
- javax.xml.ws.handler \
- javax.xml.ws.handler.soap \
- javax.xml.ws.http \
- javax.xml.ws.soap \
- javax.xml.ws.spi \
- javax.xml.ws.spi.http \
- javax.xml.ws.wsaddressing \
- javax.xml.transform \
- javax.xml.transform.sax \
- javax.xml.transform.dom \
- javax.xml.transform.stax \
- javax.xml.transform.stream \
- javax.xml \
- javax.xml.crypto \
- javax.xml.crypto.dom \
- javax.xml.crypto.dsig \
- javax.xml.crypto.dsig.dom \
- javax.xml.crypto.dsig.keyinfo \
- javax.xml.crypto.dsig.spec \
- javax.xml.datatype \
- javax.xml.validation \
- javax.xml.namespace \
- javax.xml.xpath \
- javax.xml.stream \
- javax.xml.stream.events \
- javax.xml.stream.util \
- org.ietf.jgss \
- org.omg.CORBA \
- org.omg.CORBA.DynAnyPackage \
- org.omg.CORBA.ORBPackage \
- org.omg.CORBA.TypeCodePackage \
- org.omg.stub.java.rmi \
- org.omg.CORBA.portable \
- org.omg.CORBA_2_3 \
- org.omg.CORBA_2_3.portable \
- org.omg.CosNaming \
- org.omg.CosNaming.NamingContextExtPackage \
- org.omg.CosNaming.NamingContextPackage \
- org.omg.SendingContext \
- org.omg.PortableServer \
- org.omg.PortableServer.CurrentPackage \
- org.omg.PortableServer.POAPackage \
- org.omg.PortableServer.POAManagerPackage \
- org.omg.PortableServer.ServantLocatorPackage \
- org.omg.PortableServer.portable \
- org.omg.PortableInterceptor \
- org.omg.PortableInterceptor.ORBInitInfoPackage \
- org.omg.Messaging \
- org.omg.IOP \
- org.omg.IOP.CodecFactoryPackage \
- org.omg.IOP.CodecPackage \
- org.omg.Dynamic \
- org.omg.DynamicAny \
- org.omg.DynamicAny.DynAnyPackage \
- org.omg.DynamicAny.DynAnyFactoryPackage \
- org.w3c.dom \
- org.w3c.dom.events \
- org.w3c.dom.bootstrap \
- org.w3c.dom.ls \
- org.xml.sax \
- org.xml.sax.ext \
- org.xml.sax.helpers
diff --git a/jdk/makefiles/docs/Makefile b/jdk/makefiles/docs/Makefile
deleted file mode 100644
index 5a395da..0000000
--- a/jdk/makefiles/docs/Makefile
+++ /dev/null
@@ -1,1174 +0,0 @@
-# Copyright (c) 1997, 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.
-#
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-BUILDDIR=..
-PRODUCT=docs
-include $(BUILDDIR)/common/Defs.gmk
-
-# Get CopyrightLine macro and other shared variables
-include $(BUILDDIR)/common/shared/Defs-javadoc.gmk
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html
-DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
-
-# Url to Java Language Spec
-#JLS3_URL = http://java.sun.com/docs/books/jls/
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#
-# Definitions for imported components
-#
-include $(BUILDDIR)/common/internal/ImportComponents.gmk
-
-# We override whatever the max VM memory setting is here.
-# NOTE: javadoc will not complete without these larger settings.
-# WARNING: This could cause thrashing on low memory machines.
-ifeq ($(ARCH_DATA_MODEL),64)
- MAX_VM_MEMORY = 1024
-else ifeq ($(ARCH),universal)
- MAX_VM_MEMORY = 1024
-else
- MAX_VM_MEMORY = 612
-endif
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(CLASSPATH_SEPARATOR) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(SHARE_SRC)/classes \
- $(IMPORTSRCDIR) \
- $(GENSRCDIR) \
- $(SHARE_SRC)/../solaris/classes \
- $(SHARE_SRC)/../windows/classes \
- $(SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
- $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS)))
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
-@if [ -f "$@" -a "$?" != "" ] ; then \
- $(ECHO) "# Dependencies have changed: $?"; \
-fi
-$(RM) -r $(@D)
-$(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-$(shell \
- if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
- done; \
- fi \
-)
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
-@if [ "$1" != "" ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- found="false"; \
- for cp in $(ALL_SOURCE_DIRS) ; do \
- if [ -d $${cp}/$${pd} ] ; then \
- $(ECHO) "$${p}" >> $@; \
- found="true"; \
- break; \
- fi; \
- done; \
- if [ "$${found}" = "false" ] ; then \
- $(ECHO) "WARNING: Package not found: $${p}"; \
- fi; \
- done; \
-fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
-@$(ECHO) "# Summary for $@";\
- $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
- $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
-$(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
-$(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
-$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
- $(NO_PROPRIETARY_API_WARNINGS) \
- -quiet \
- -use \
- -keywords \
- $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
- ADDITIONAL_JAVADOCFLAGS = \
- -Xdocrootparent $(DOCS_BASE_URL)
-else
- ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-JDK_IS_FCS = false
-DRAFT_HEADER =
-ifeq ($(JDK_MINOR_VERSION),5)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_MINOR_VERSION),6)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_MINOR_VERSION),7)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_IS_FCS),false)
- ifneq ($(MILESTONE), fcs)
- DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_WINTITLE = $(BUILD_NUMBER)
- # Early access top text (not used in FCS releases)
- COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
- endif
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-# standard control build.
-# b) The docs will be pushed to the web and/or included in
-# the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
- @$(ECHO) ""
- @$(ECHO) "Building core api docs with these values:"
- @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
- @$(ECHO) " MILESTONE = $(MILESTONE)"
- @$(ECHO) ""
- ifeq ($(BUILD_NUMBER), b00)
- @$(ECHO) "ERROR: Build number must be defined"
- @$(ECHO) "MILESTONE is set to $(MILESTONE)"
- @$(ECHO) ""
- exit 1
- endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java™ Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(SHARE_SRC)/classes/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ISO-8859-1) ; \
- $(call OptionPair,-tag,beaninfo:X) ; \
- $(call OptionPair,-tag,revised:X) ; \
- $(call OptionPair,-tag,since.unbundled:X) ; \
- $(call OptionPair,-tag,spec:X) ; \
- $(call OptionPair,-tag,specdefault:X) ; \
- $(call OptionPair,-tag,Note:X) ; \
- $(call OptionPair,-tag,ToDo:X) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ;\
- $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- ) >> $@
-ifdef COREAPI_TOP_EARLYACCESS
- @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
-endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += docletapidocs
-endif
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-breakiterator) ; \
- $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += tagletapidocs
-endif
-
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
- $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
- $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(TAGLETAPI_TEMPDIR) \
- @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
- cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
- cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nonavbar) ; \
- $(call OptionOnly,-noindex) ; \
- $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(IMPORTSRCDIR)/$(TAGLETAPI_FILE)
- $(prep-target)
- @($(ECHO) "$(IMPORTSRCDIR)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(SHARE_SRC)/classes/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-JDWP_SPEC = $(BUILDDIR)/jpda/jdwp/jdwp.spec
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html: $(BUILD_TOOLS) $(JDWP_SPEC)
- $(prep-javadoc)
- $(TOOL_JDWPGEN) $(JDWP_SPEC) -doc $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DOCS_IMPORT_PATH)/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
- @$(prep-javadoc)
- @if [ -f $(JVMTI_HTML) ] ; then \
- $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
- $(CP) $(JVMTI_HTML) $@; \
- else \
- $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
- fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(SHARE_SRC)/classes/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(SHARE_SRC)/classes/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
- $(prep-target)
- $(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(CLOSED_SRC)/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(SHARE_SRC)/classes/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE)
- $(prep-javadoc)
- @if [ -f $(JVM_MIB_SRC) ] ; then \
- $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
- $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
- else \
- $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
- fi
- $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
- $(prep-target)
- $(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
- $(prep-target)
- $(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += treeapidocs
-endif
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTSCTSCTP: GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
- $(prep-target)
- @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
- $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
- $(FIND) $${cp} -type f >> $@; \
- done
-
-#############################################################
-#release version of core packages ########
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
- $(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
- $(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-echovalues:
- @$(ECHO) ""
- @$(ECHO) --------------Imports---------------------------
- @$(ECHO) "IMPORT_PACKAGES = $(IMPORT_PACKAGES)"
- @$(ECHO) "IMPORT_PACKAGE_FILTER = $(IMPORT_PACKAGE_FILTER)"
- @$(ECHO) --------------Imports---------------------------
- @$(ECHO) ""
- @$(ECHO) --------------Shared---------------------------
- @$(ECHO) BUILD_NUMBER = $(BUILD_NUMBER)
- @$(ECHO) FULL_VERSION = $(FULL_VERSION)
- @$(ECHO) JDK_VERSION = $(JDK_VERSION)
- @$(ECHO) JDK_MAJOR_VERSION = $(JDK_MAJOR_VERSION)
- @$(ECHO) JDK_MINOR_VERSION = $(JDK_MINOR_VERSION)
- @$(ECHO) JDK_MICRO_VERSION = $(JDK_MICRO_VERSION)
- @$(ECHO) JDK_UPDATE_VERSION = $(JDK_UPDATE_VERSION)
- @$(ECHO) JDK_MKTG_VERSION = $(JDK_MKTG_VERSION)
- @$(ECHO) JDK_UNDERSCORE_VERSION = $(JDK_UNDERSCORE_VERSION)
- @$(ECHO) JDK_MKTG_UNDERSCORE_VERSION = $(JDK_MKTG_UNDERSCORE_VERSION)
- @$(ECHO) MARKETING_NUMBER = $(MARKETING_NUMBER)
- @$(ECHO) MARKET_NAME = $(MARKET_NAME)
- @$(ECHO) MILESTONE = $(MILESTONE)
- @$(ECHO) RELEASE = $(RELEASE)
- @$(ECHO) USER_RELEASE_SUFFIX = $(USER_RELEASE_SUFFIX)
- @$(ECHO) --------------Shared---------------------------
- @$(ECHO) ""
- @$(ECHO) --------------common/Defs---------------------------
- @$(ECHO) "RELEASEDOCS_SOURCEPATH"
- @$(ECHO) " SHARE_SRC/classes: $(SHARE_SRC)/classes"
- @$(ECHO) " PLATFORM_SRC/classes: $(PLATFORM_SRC)/classes"
- @$(ECHO) " GENSRCDIR: $(GENSRCDIR)"
- @$(ECHO) " SHARE_SRC/doc/stub: $(SHARE_SRC)/doc/stub"
- @$(ECHO) " IMPORTSRCDIR: $(IMPORTSRCDIR)"
- @$(ECHO) --------------common/Defs---------------------------
- @$(ECHO) ""
-
-#############################################################
-.PHONY: all docs coredocs rel-docs echovalues otherdocs rel-coredocs \
- sanitycheckcoredocs $(ALL_OTHER_TARGETS)
-
diff --git a/jdk/makefiles/docs/NON_CORE_PKGS.gmk b/jdk/makefiles/docs/NON_CORE_PKGS.gmk
deleted file mode 100644
index b68208b..0000000
--- a/jdk/makefiles/docs/NON_CORE_PKGS.gmk
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-#
-# This file contains the package names of all the "non-core"
-# API published in the Java 2 SDK documentation. "Non-core" means
-# it includes all published API outside of the JDK API specification.
-#
-# These environment variables are used by javadoc in
-# make/docs/Makefile and are referenced by the localization
-# team when determining which APIs to extract javadoc
-# comments from.
-
-DOMAPI_PKGS = com.sun.java.browser.dom \
- org.w3c.dom \
- org.w3c.dom.bootstrap \
- org.w3c.dom.ls \
- org.w3c.dom.ranges \
- org.w3c.dom.traversal \
- org.w3c.dom.html \
- org.w3c.dom.stylesheets \
- org.w3c.dom.css \
- org.w3c.dom.events \
- org.w3c.dom.views
-
-JDI_PKGS = com.sun.jdi \
- com.sun.jdi.event \
- com.sun.jdi.request \
- com.sun.jdi.connect \
- com.sun.jdi.connect.spi
-
-MGMT_PKGS = com.sun.management
-
-JAAS_PKGS = com.sun.security.auth \
- com.sun.security.auth.callback \
- com.sun.security.auth.login \
- com.sun.security.auth.module
-
-JGSS_PKGS = com.sun.security.jgss
-
-OLD_JSSE_PKGS = com.sun.net.ssl
-
-HTTPSERVER_PKGS = com.sun.net.httpserver \
- com.sun.net.httpserver.spi
-
-NIO_PKGS = com.sun.nio.file
-
-DOCLETAPI_PKGS = com.sun.javadoc
-
-TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-
-ATTACH_PKGS = com.sun.tools.attach \
- com.sun.tools.attach.spi
-
-JCONSOLE_PKGS = com.sun.tools.jconsole
-
-TREEAPI_PKGS = com.sun.source.tree \
- com.sun.source.util
-
-SMARTCARDIO_PKGS = javax.smartcardio
-
-SCTPAPI_PKGS = com.sun.nio.sctp
-
-ifeq ($(PLATFORM), macosx)
-APPLE_EXT_PKGS = com.apple.concurrent \
- com.apple.eawt \
- com.apple.eawt.event \
- com.apple.eio
-endif
-
-# non-core packages in rt.jar
-NON_CORE_PKGS = $(DOMAPI_PKGS) \
- $(MGMT_PKGS) \
- $(JAAS_PKGS) \
- $(JGSS_PKGS) \
- $(NIO_PKGS) \
- $(OLD_JSSE_PKGS) \
- $(HTTPSERVER_PKGS) \
- $(SMARTCARDIO_PKGS) \
- $(SCTPAPI_PKGS) \
- $(APPLE_EXT_PKGS)
-
diff --git a/jdk/makefiles/docs/Notes.html b/jdk/makefiles/docs/Notes.html
deleted file mode 100644
index e3d8ae1..0000000
--- a/jdk/makefiles/docs/Notes.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Doc Process Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h3><a name="REGEXP"></a><br>
-REGEXP</h3>
-<p> REGEXP is a list of wildcard patterns that determines which packages listed
- in CORE_PKGS.gmk go into which summary-table on the main API index page. It
- was motivated by the need to divide the world into "core packages"
- (java.*) and "extension packages" (javax.*). In time, the distinction
- went away. The whole table is now called "Platform Packages"--which
- eliminated the need for this list of regular expressions. But it lingered on,
- accreting all of the packages in the JVM, one by one. I pruned it back to "*",
- so it now covers every package in the Java platform API docs. If some separation
- is needed in the future, it can grow back into a colon-separated list, starting
- with this, which is in all respects equivalent to "*" at this point
- in time:</p>
-<blockquote>
- <pre>REGEXP = "java.*:javax.*:org.ietf*:org.omg.</pre>
-</blockquote>
-<h3><a name="releaseTargets"></a><br>
- Release Targets</h3>
-<p> (Thanks to Kelly O'Hair for this info.)</p>
-<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
- Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
- in the javapubs group's docs-release process. It specifies memory settings accordingly
- to maximize performance.</p>
-<p> The performance settings, like the sanity check, are most important for the
- core docs--the platform APIs. Running javadoc on those APIs takes a significant
- amount of time and memory. Setting the initial heap size as large as possible
- is important to prevent thrashing as the heap grows. Setting the maximum as
- large as necessary is also important to keep the job from failing.</p>
-<blockquote>
- <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
- <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
-</blockquote>
-<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
- and <tt>MILESTONE</tt> are specified properly when docs are built outside of
- the normal release engineering process, with the intention of releasing them
- on the web or in a downloaded docs bundle. (When invoked in release engineering's
- control build, the values are always set properly. But when the targets are
- run by themselves, they default to b00 and "internal"--which silently
- sabotage the result of a build that can take many hours to complete.</p>
-</body>
-</html>
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-i586 b/jdk/makefiles/mapfiles/launchers/mapfile-i586
deleted file mode 100644
index 48061dd..0000000
--- a/jdk/makefiles/mapfiles/launchers/mapfile-i586
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
- ___Argv; # The following are private, but as they are
- _start; # exported from ctr1/crtn, the clever hacker
- _init; # might know about them. However note, that
- _fini; # their use is strictly not supported.
- _lib_version;
-# _mcount;
- __fsr;
- __fsr_init_value;
- __longdouble_used;
-
- local:
- *;
-};
diff --git a/jdk/makefiles/mapfiles/libawt_headless/reorder-i586 b/jdk/makefiles/mapfiles/libawt_headless/reorder-i586
deleted file mode 100644
index 84e923b..0000000
--- a/jdk/makefiles/mapfiles/libawt_headless/reorder-i586
+++ /dev/null
@@ -1 +0,0 @@
-# Temporary file for headless
diff --git a/jdk/makefiles/mapfiles/libjava/reorder-i586 b/jdk/makefiles/mapfiles/libjava/reorder-i586
deleted file mode 100644
index deb78fb..0000000
--- a/jdk/makefiles/mapfiles/libjava/reorder-i586
+++ /dev/null
@@ -1,109 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%_init;
-text: .text%init64IO: OUTPUTDIR/UnixFileSystem_md.o;
-text: .text%JNI_OnLoad;
-text: .text%Canonicalize;
-text: .text%canonicalize;
-text: .text%collapse: OUTPUTDIR/canonicalize_md.o;
-text: .text%Java_java_lang_Object_registerNatives;
-text: .text%Java_java_lang_System_registerNatives;
-text: .text%Java_java_lang_Thread_registerNatives;
-text: .text%Java_java_security_AccessController_getStackAccessControlContext;
-text: .text%Java_java_security_AccessController_getInheritedAccessControlContext;
-text: .text%Java_java_lang_ClassLoader_registerNatives;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
-text: .text%Java_java_lang_Class_registerNatives;
-text: .text%Java_java_lang_Class_getPrimitiveClass;
-text: .text%Java_java_lang_System_initProperties;
-text: .text%GetJavaProperties;
-text: .text%uname: OUTPUTDIR/java_props_md.o;
-text: .text%mapLookup: OUTPUTDIR/java_props_md.o;
-text: .text%setPathEnvironment: OUTPUTDIR/java_props_md.o;
-text: .text%JNU_NewStringPlatform;
-text: .text%JNU_CallStaticMethodByName;
-text: .text%NewStringPlatform;
-text: .text%Java_java_io_FileInputStream_initIDs;
-text: .text%Java_java_io_FileDescriptor_initIDs;
-text: .text%Java_java_io_FileOutputStream_initIDs;
-text: .text%Java_java_lang_System_setIn0;
-text: .text%Java_sun_reflect_Reflection_getCallerClass;
-text: .text%Java_java_lang_Class_forName0;
-text: .text%Java_java_lang_String_intern;
-text: .text%Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
-text: .text%Java_java_lang_Throwable_fillInStackTrace;
-text: .text%Java_java_lang_System_setOut0;
-text: .text%Java_java_lang_System_setErr0;
-text: .text%Java_java_lang_Compiler_registerNatives;
-text: .text%Java_java_io_FileSystem_getFileSystem;
-text: .text%JNU_NewObjectByName;
-text: .text%Java_java_io_UnixFileSystem_initIDs;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
-text: .text%Java_java_io_UnixFileSystem_list;
-text: .text%JNU_GetStringPlatformChars;
-text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%JNU_ClassString;
-text: .text%JNU_CopyObjectArray;
-text: .text%Java_java_io_UnixFileSystem_canonicalize;
-text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0;
-text: .text%Java_java_lang_ClassLoader_findLoadedClass;
-text: .text%Java_java_lang_ClassLoader_findBootstrapClass;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
-text: .text%Java_java_lang_System_mapLibraryName;
-text: .text%cpchars: OUTPUTDIR/System.o;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
-text: .text%Java_java_lang_Float_floatToIntBits;
-text: .text%Java_java_lang_Double_doubleToLongBits;
-text: .text%Java_java_io_FileInputStream_open;
-text: .text%fileOpen;
-text: .text%Java_java_io_UnixFileSystem_getLength;
-text: .text%Java_java_io_FileInputStream_readBytes;
-text: .text%readBytes;
-text: .text%Java_java_io_FileInputStream_close0;
-text: .text%Java_java_lang_Object_getClass;
-text: .text%Java_java_lang_ClassLoader_defineClass0;
-text: .text%VerifyClassCodes;
-# Test Exit
-text: .text%Java_java_lang_Shutdown_halt;
-# Test Hello
-text: .text%Java_java_io_FileOutputStream_writeBytes;
-text: .text%writeBytes;
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_java_util_ResourceBundle_getClassContext;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
-text: .text%JNU_GetEnv;
-text: .text%Java_java_io_UnixFileSystem_checkAccess;
-text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
-text: .text%Java_java_io_FileInputStream_available;
-text: .text%Java_java_lang_reflect_Array_newArray;
-text: .text%Java_java_lang_Throwable_getStackTraceDepth;
-text: .text%Java_java_lang_Throwable_getStackTraceElement;
-text: .text%Java_java_lang_System_identityHashCode;
-text: .text%Java_sun_misc_Signal_findSignal;
-text: .text%Java_sun_misc_Signal_handle0;
-text: .text%JNU_NotifyAll;
-# Test LoadFrame
-text: .text%JNU_CallMethodByName;
-text: .text%JNU_CallMethodByNameV;
-text: .text%Java_java_util_logging_FileHandler_lockFile;
-text: .text%Java_java_io_FileOutputStream_open;
-text: .text%Java_java_io_UnixFileSystem_createDirectory;
-text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
-text: .text%Java_java_io_UnixFileSystem_setLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_unlockFile0;
-text: .text%Java_java_io_FileOutputStream_close0;
-text: .text%Java_java_util_logging_FileHandler_unlockFile;
-# Test LoadJFrame
-text: .text%Java_java_lang_Class_isAssignableFrom;
-text: .text%Java_java_lang_Class_isInstance;
-# Test JHello
-# SwingSet
-text: .text%Java_java_util_TimeZone_getSystemTimeZoneID;
-text: .text%findJavaTZ_md;
-text: .text%Java_java_lang_StrictMath_log;
diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-i586 b/jdk/makefiles/mapfiles/libjpeg/reorder-i586
deleted file mode 100644
index 328c6dc..0000000
--- a/jdk/makefiles/mapfiles/libjpeg/reorder-i586
+++ /dev/null
@@ -1,119 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_initIDs;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_readImage;
-text: .text%jStdError;
-text: .text%jCreaDecompress;
-text: .text%jIMemMgr;
-text: .text%jMemInit;
-text: .text%jGetSmall;
-text: .text%jIMReader;
-text: .text%alloc_small: OUTPUTDIR/jmemmgr.o;
-text: .text%reset_marker_reader: OUTPUTDIR/jdmarker.o;
-text: .text%jIInCtlr;
-# text: .text%GET_ARRAYS: OUTPUTDIR/jpegdecoder.o;
-text: .text%jReadHeader;
-text: .text%jConsumeInput;
-text: .text%reset_input_controller: OUTPUTDIR/jdinput.o;
-text: .text%reset_error_mgr: OUTPUTDIR/jerror.o;
-text: .text%sun_jpeg_init_source;
-text: .text%consume_markers: OUTPUTDIR/jdinput.o;
-text: .text%read_markers: OUTPUTDIR/jdmarker.o;
-# text: .text%first_marker: OUTPUTDIR/jdmarker.o;
-text: .text%sun_jpeg_fill_input_buffer;
-# text: .text%RELEASE_ARRAYS: OUTPUTDIR/jpegdecoder.o;
-# text: .text%get_soi: OUTPUTDIR/jdmarker.o;
-text: .text%emit_message: OUTPUTDIR/jerror.o;
-# text: .text%next_marker: OUTPUTDIR/jdmarker.o;
-text: .text%get_interesting_appn: OUTPUTDIR/jdmarker.o;
-# text: .text%examine_app0: OUTPUTDIR/jdmarker.o;
-text: .text%skip_variable: OUTPUTDIR/jdmarker.o;
-text: .text%sun_jpeg_skip_input_data;
-# text: .text%examine_app14: OUTPUTDIR/jdmarker.o;
-text: .text%get_dqt: OUTPUTDIR/jdmarker.o;
-text: .text%jAlcQTable;
-text: .text%get_sof: OUTPUTDIR/jdmarker.o;
-# text: .text%get_dri: OUTPUTDIR/jdmarker.o;
-text: .text%get_dht: OUTPUTDIR/jdmarker.o;
-text: .text%jAlcHTable;
-text: .text%get_sos: OUTPUTDIR/jdmarker.o;
-# text: .text%initial_setup: OUTPUTDIR/jdinput.o;
-text: .text%jDivRound;
-# text: .text%default_decompress_parms: OUTPUTDIR/jdapimin.o;
-text: .text%jHasMultScn;
-text: .text%jStrtDecompress;
-text: .text%jIDMaster;
-# text: .text%master_selection: OUTPUTDIR/jdmaster.o;
-text: .text%jCalcDimensions;
-# text: .text%use_merged_upsample: OUTPUTDIR/jdmaster.o;
-# text: .text%prepare_range_limit_table: OUTPUTDIR/jdmaster.o;
-text: .text%jIDColor;
-# text: .text%build_ycc_rgb_table: OUTPUTDIR/jdcolor.o;
-text: .text%jIUpsampler;
-text: .text%jRound;
-text: .text%alloc_sarray: OUTPUTDIR/jmemmgr.o;
-text: .text%alloc_large: OUTPUTDIR/jmemmgr.o;
-text: .text%jGetLarge;
-text: .text%jIDPostC;
-text: .text%jIIDCT;
-text: .text%jIHDecoder;
-text: .text%jIDCoefC;
-text: .text%jIDMainC;
-# text: .text%alloc_funny_pointers: OUTPUTDIR/jdmainct.o;
-text: .text%realize_virt_arrays: OUTPUTDIR/jmemmgr.o;
-text: .text%start_input_pass: OUTPUTDIR/jdinput.o;
-# text: .text%per_scan_setup: OUTPUTDIR/jdinput.o;
-# text: .text%latch_quant_tables: OUTPUTDIR/jdinput.o;
-text: .text%start_pass_huff_decoder: OUTPUTDIR/jdhuff.o;
-text: .text%jMkDDerived;
-text: .text%start_input_pass: OUTPUTDIR/jdcoefct.o;
-# text: .text%start_iMCU_row: OUTPUTDIR/jdcoefct.o;
-# text: .text%output_pass_setup: OUTPUTDIR/jdapistd.o;
-text: .text%prepare_for_output_pass: OUTPUTDIR/jdmaster.o;
-text: .text%start_pass: OUTPUTDIR/jddctmgr.o;
-text: .text%start_output_pass: OUTPUTDIR/jdcoefct.o;
-text: .text%start_pass_dcolor: OUTPUTDIR/jdcolor.o;
-text: .text%start_pass_upsample: OUTPUTDIR/jdsample.o;
-text: .text%start_pass_dpost: OUTPUTDIR/jdpostct.o;
-text: .text%start_pass_main: OUTPUTDIR/jdmainct.o;
-# text: .text%make_funny_pointers: OUTPUTDIR/jdmainct.o;
-text: .text%jReadScanlines;
-text: .text%process_data_context_main: OUTPUTDIR/jdmainct.o;
-text: .text%decompress_onepass: OUTPUTDIR/jdcoefct.o;
-text: .text%jZeroFar;
-text: .text%decode_mcu: OUTPUTDIR/jdhuff.o;
-text: .text%jFilBitBuf;
-text: .text%jHufDecode;
-text: .text%jRDislow;
-text: .text%sep_upsample: OUTPUTDIR/jdsample.o;
-text: .text%fullsize_upsample: OUTPUTDIR/jdsample.o;
-text: .text%h2v2_fancy_upsample: OUTPUTDIR/jdsample.o;
-text: .text%ycc_rgb_convert: OUTPUTDIR/jdcolor.o;
-# text: .text%set_wraparound_pointers: OUTPUTDIR/jdmainct.o;
-# text: .text%process_restart: OUTPUTDIR/jdhuff.o;
-text: .text%read_restart_marker: OUTPUTDIR/jdmarker.o;
-text: .text%finish_input_pass: OUTPUTDIR/jdinput.o;
-# text: .text%set_bottom_pointers: OUTPUTDIR/jdmainct.o;
-text: .text%jFinDecompress;
-text: .text%finish_output_pass: OUTPUTDIR/jdmaster.o;
-text: .text%sun_jpeg_term_source;
-text: .text%jAbort;
-text: .text%free_pool: OUTPUTDIR/jmemmgr.o;
-text: .text%jFreeLarge;
-text: .text%jFreeSmall;
-text: .text%jDestDecompress;
-text: .text%jDestroy;
-text: .text%self_destruct: OUTPUTDIR/jmemmgr.o;
-text: .text%jMemTerm;
-text: .text%process_data_simple_main: OUTPUTDIR/jdmainct.o;
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-bsd b/jdk/makefiles/mapfiles/libnio/mapfile-bsd
deleted file mode 100644
index b3f50ff..0000000
--- a/jdk/makefiles/mapfiles/libnio/mapfile-bsd
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_java_nio_MappedByteBuffer_force0;
- Java_java_nio_MappedByteBuffer_isLoaded0;
- Java_java_nio_MappedByteBuffer_load0;
- Java_sun_nio_ch_DatagramChannelImpl_disconnect0;
- Java_sun_nio_ch_DatagramChannelImpl_initIDs;
- Java_sun_nio_ch_DatagramChannelImpl_receive0;
- Java_sun_nio_ch_DatagramChannelImpl_send0;
- Java_sun_nio_ch_DatagramDispatcher_read0;
- Java_sun_nio_ch_DatagramDispatcher_readv0;
- Java_sun_nio_ch_DatagramDispatcher_write0;
- Java_sun_nio_ch_DatagramDispatcher_writev0;
- Java_sun_nio_ch_FileChannelImpl_close0;
- Java_sun_nio_ch_FileChannelImpl_initIDs;
- Java_sun_nio_ch_FileChannelImpl_map0;
- Java_sun_nio_ch_FileChannelImpl_position0;
- Java_sun_nio_ch_FileChannelImpl_transferTo0;
- Java_sun_nio_ch_FileChannelImpl_unmap0;
- Java_sun_nio_ch_FileDispatcherImpl_close0;
- Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
- Java_sun_nio_ch_FileDispatcherImpl_force0;
- Java_sun_nio_ch_FileDispatcherImpl_init;
- Java_sun_nio_ch_FileDispatcherImpl_lock0;
- Java_sun_nio_ch_FileDispatcherImpl_preClose0;
- Java_sun_nio_ch_FileDispatcherImpl_pread0;
- Java_sun_nio_ch_FileDispatcherImpl_pwrite0;
- Java_sun_nio_ch_FileDispatcherImpl_read0;
- Java_sun_nio_ch_FileDispatcherImpl_readv0;
- Java_sun_nio_ch_FileDispatcherImpl_release0;
- Java_sun_nio_ch_FileDispatcherImpl_size0;
- Java_sun_nio_ch_FileDispatcherImpl_truncate0;
- Java_sun_nio_ch_FileDispatcherImpl_write0;
- Java_sun_nio_ch_FileDispatcherImpl_writev0;
- Java_sun_nio_ch_FileKey_init;
- Java_sun_nio_ch_FileKey_initIDs;
- Java_sun_nio_ch_InheritedChannel_close0;
- Java_sun_nio_ch_InheritedChannel_dup;
- Java_sun_nio_ch_InheritedChannel_dup2;
- Java_sun_nio_ch_InheritedChannel_open0;
- Java_sun_nio_ch_InheritedChannel_peerAddress0;
- Java_sun_nio_ch_InheritedChannel_peerPort0;
- Java_sun_nio_ch_InheritedChannel_soType0;
- Java_sun_nio_ch_IOUtil_configureBlocking;
- Java_sun_nio_ch_IOUtil_drain;
- Java_sun_nio_ch_IOUtil_fdVal;
- Java_sun_nio_ch_IOUtil_initIDs;
- Java_sun_nio_ch_IOUtil_makePipe;
- Java_sun_nio_ch_IOUtil_randomBytes;
- Java_sun_nio_ch_IOUtil_setfdVal;
- Java_sun_nio_ch_KQueue_kqueue;
- Java_sun_nio_ch_KQueue_keventRegister;
- Java_sun_nio_ch_KQueue_keventPoll;
- Java_sun_nio_ch_KQueue_keventSize;
- Java_sun_nio_ch_KQueue_identOffset;
- Java_sun_nio_ch_KQueue_filterOffset;
- Java_sun_nio_ch_KQueue_flagsOffset;
- Java_sun_nio_ch_KQueuePort_socketpair;
- Java_sun_nio_ch_KQueuePort_interrupt;
- Java_sun_nio_ch_KQueuePort_drain1;
- Java_sun_nio_ch_KQueuePort_close0;
- Java_sun_nio_ch_NativeThread_current;
- Java_sun_nio_ch_NativeThread_init;
- Java_sun_nio_ch_NativeThread_signal;
- Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0;
- Java_sun_nio_ch_Net_canJoin6WithIPv4Group0;
- Java_sun_nio_ch_Net_socket0;
- Java_sun_nio_ch_Net_bind0;
- Java_sun_nio_ch_Net_connect0;
- Java_sun_nio_ch_Net_listen;
- Java_sun_nio_ch_Net_localPort;
- Java_sun_nio_ch_Net_localInetAddress;
- Java_sun_nio_ch_Net_getIntOption0;
- Java_sun_nio_ch_Net_setIntOption0;
- Java_sun_nio_ch_Net_initIDs;
- Java_sun_nio_ch_Net_isIPv6Available0;
- Java_sun_nio_ch_Net_joinOrDrop4;
- Java_sun_nio_ch_Net_blockOrUnblock4;
- Java_sun_nio_ch_Net_joinOrDrop6;
- Java_sun_nio_ch_Net_blockOrUnblock6;
- Java_sun_nio_ch_Net_setInterface4;
- Java_sun_nio_ch_Net_getInterface4;
- Java_sun_nio_ch_Net_setInterface6;
- Java_sun_nio_ch_Net_getInterface6;
- Java_sun_nio_ch_Net_shutdown;
- Java_sun_nio_ch_PollArrayWrapper_interrupt;
- Java_sun_nio_ch_PollArrayWrapper_poll0;
- Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_SocketChannelImpl_checkConnect;
- Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
- Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
- Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
- Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
- Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
- Java_sun_nio_fs_UnixNativeDispatcher_init;
- Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
- Java_sun_nio_fs_UnixNativeDispatcher_strerror;
- Java_sun_nio_fs_UnixNativeDispatcher_dup;
- Java_sun_nio_fs_UnixNativeDispatcher_access0;
- Java_sun_nio_fs_UnixNativeDispatcher_stat0;
- Java_sun_nio_fs_UnixNativeDispatcher_lstat0;
- Java_sun_nio_fs_UnixNativeDispatcher_fstat;
- Java_sun_nio_fs_UnixNativeDispatcher_fstatat0;
- Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchmod;
- Java_sun_nio_fs_UnixNativeDispatcher_chown0;
- Java_sun_nio_fs_UnixNativeDispatcher_lchown0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchown;
- Java_sun_nio_fs_UnixNativeDispatcher_utimes0;
- Java_sun_nio_fs_UnixNativeDispatcher_futimes;
- Java_sun_nio_fs_UnixNativeDispatcher_open0;
- Java_sun_nio_fs_UnixNativeDispatcher_openat0;
- Java_sun_nio_fs_UnixNativeDispatcher_close;
- Java_sun_nio_fs_UnixNativeDispatcher_read;
- Java_sun_nio_fs_UnixNativeDispatcher_write;
- Java_sun_nio_fs_UnixNativeDispatcher_fopen0;
- Java_sun_nio_fs_UnixNativeDispatcher_fclose;
- Java_sun_nio_fs_UnixNativeDispatcher_opendir0;
- Java_sun_nio_fs_UnixNativeDispatcher_fdopendir;
- Java_sun_nio_fs_UnixNativeDispatcher_readdir;
- Java_sun_nio_fs_UnixNativeDispatcher_closedir;
- Java_sun_nio_fs_UnixNativeDispatcher_link0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlinkat0;
- Java_sun_nio_fs_UnixNativeDispatcher_rename0;
- Java_sun_nio_fs_UnixNativeDispatcher_renameat0;
- Java_sun_nio_fs_UnixNativeDispatcher_mkdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_rmdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_symlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_readlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_realpath0;
- Java_sun_nio_fs_UnixNativeDispatcher_statvfs0;
- Java_sun_nio_fs_UnixNativeDispatcher_pathconf0;
- Java_sun_nio_fs_UnixNativeDispatcher_fpathconf;
- Java_sun_nio_fs_UnixNativeDispatcher_mknod0;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwuid;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
- Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
- Java_sun_nio_fs_UnixCopyFile_transfer;
- handleSocketError;
-
- local:
- *;
-};
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-linux b/jdk/makefiles/mapfiles/libnio/mapfile-linux
index 4cc3b29..37999cb 100644
--- a/jdk/makefiles/mapfiles/libnio/mapfile-linux
+++ b/jdk/makefiles/mapfiles/libnio/mapfile-linux
@@ -116,6 +116,7 @@
Java_sun_nio_ch_Net_setInterface6;
Java_sun_nio_ch_Net_getInterface6;
Java_sun_nio_ch_Net_shutdown;
+ Java_sun_nio_ch_Net_poll;
Java_sun_nio_ch_PollArrayWrapper_interrupt;
Java_sun_nio_ch_PollArrayWrapper_poll0;
Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-macosx b/jdk/makefiles/mapfiles/libnio/mapfile-macosx
index 070646b..45b23ab 100644
--- a/jdk/makefiles/mapfiles/libnio/mapfile-macosx
+++ b/jdk/makefiles/mapfiles/libnio/mapfile-macosx
@@ -108,6 +108,7 @@
Java_sun_nio_ch_Net_setInterface6;
Java_sun_nio_ch_Net_getInterface6;
Java_sun_nio_ch_Net_shutdown;
+ Java_sun_nio_ch_Net_poll;
Java_sun_nio_ch_PollArrayWrapper_interrupt;
Java_sun_nio_ch_PollArrayWrapper_poll0;
Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-solaris b/jdk/makefiles/mapfiles/libnio/mapfile-solaris
index e05ea72..beb13e2 100644
--- a/jdk/makefiles/mapfiles/libnio/mapfile-solaris
+++ b/jdk/makefiles/mapfiles/libnio/mapfile-solaris
@@ -104,6 +104,7 @@
Java_sun_nio_ch_Net_setInterface6;
Java_sun_nio_ch_Net_getInterface6;
Java_sun_nio_ch_Net_shutdown;
+ Java_sun_nio_ch_Net_poll;
Java_sun_nio_ch_PollArrayWrapper_interrupt;
Java_sun_nio_ch_PollArrayWrapper_poll0;
Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
diff --git a/jdk/makefiles/mapfiles/libnio/reorder-i586 b/jdk/makefiles/mapfiles/libnio/reorder-i586
deleted file mode 100644
index b1ef113..0000000
--- a/jdk/makefiles/mapfiles/libnio/reorder-i586
+++ /dev/null
@@ -1,17 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_sun_nio_ch_FileChannelImpl_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_initIDs;
-text: .text%Java_sun_nio_ch_IOUtil_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_read0;
-text: .text%convertReturnVal;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
diff --git a/jdk/makefiles/mapfiles/libverify/reorder-i586 b/jdk/makefiles/mapfiles/libverify/reorder-i586
deleted file mode 100644
index 72f0254..0000000
--- a/jdk/makefiles/mapfiles/libverify/reorder-i586
+++ /dev/null
@@ -1,40 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%VerifyFixClassname;
-text: .text%VerifyClassname;
-text: .text%skip_over_fieldname: OUTPUTDIR/check_format.o;
-text: .text%skip_over_field_signature: OUTPUTDIR/check_format.o;
-text: .text%VerifyClass;
-text: .text%make_class_info_from_name: OUTPUTDIR/check_code.o;
-text: .text%class_name_to_ID: OUTPUTDIR/check_code.o;
-text: .text%make_class_info: OUTPUTDIR/check_code.o;
-text: .text%free_block: OUTPUTDIR/check_code.o;
-text: .text%verify_method: OUTPUTDIR/check_code.o;
-text: .text%verify_opcode_operands: OUTPUTDIR/check_code.o;
-text: .text%initialize_dataflow: OUTPUTDIR/check_code.o;
-text: .text%signature_to_fieldtype: OUTPUTDIR/check_code.o;
-text: .text%check_register_values: OUTPUTDIR/check_code.o;
-text: .text%pop_stack: OUTPUTDIR/check_code.o;
-text: .text%update_registers: OUTPUTDIR/check_code.o;
-text: .text%push_stack: OUTPUTDIR/check_code.o;
-text: .text%merge_into_successors: OUTPUTDIR/check_code.o;
-text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/check_code.o;
-text: .text%set_protected: OUTPUTDIR/check_code.o;
-text: .text%merge_into_one_successor: OUTPUTDIR/check_code.o;
-text: .text%merge_registers: OUTPUTDIR/check_code.o;
-# Test Exit
-# Test Hello
-text: .text%merge_fullinfo_types: OUTPUTDIR/check_code.o;
-text: .text%isAssignableTo: OUTPUTDIR/check_code.o;
-# Test Sleep
-text: .text%isLegalTarget: OUTPUTDIR/check_code.o;
-text: .text%verify_constant_pool_type: OUTPUTDIR/check_code.o;
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%copy_stack: OUTPUTDIR/check_code.o;
-text: .text%ntohl: OUTPUTDIR/check_code.o;
diff --git a/jdk/makefiles/mapfiles/libzip/reorder-i586 b/jdk/makefiles/mapfiles/libzip/reorder-i586
deleted file mode 100644
index 16bc0de..0000000
--- a/jdk/makefiles/mapfiles/libzip/reorder-i586
+++ /dev/null
@@ -1,49 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%ZIP_Open;
-text: .text%ZIP_Open_Generic;
-text: .text%InitializeZip;
-text: .text%allocZip;
-text: .text%readCEN: OUTPUTDIR/zip_util.o;
-text: .text%findEND: OUTPUTDIR/zip_util.o;
-text: .text%hash: OUTPUTDIR/zip_util.o;
-text: .text%isMetaName: OUTPUTDIR/zip_util.o;
-text: .text%addMetaName: OUTPUTDIR/zip_util.o;
-text: .text%ZIP_FindEntry;
-text: .text%ZIP_GetEntry;
-text: .text%ZIP_Lock;
-text: .text%readLOC: OUTPUTDIR/zip_util.o;
-text: .text%ZIP_Unlock;
-text: .text%ZIP_FreeEntry;
-text: .text%Java_java_util_zip_ZipFile_initIDs;
-text: .text%Java_java_util_zip_ZipFile_open;
-text: .text%Java_java_util_zip_ZipFile_getTotal;
-text: .text%Java_java_util_zip_ZipFile_getEntry;
-text: .text%Java_java_util_zip_ZipFile_freeEntry;
-text: .text%Java_java_util_zip_ZipFile_getEntryTime;
-text: .text%Java_java_util_zip_ZipFile_getEntryCrc;
-text: .text%Java_java_util_zip_ZipFile_getEntryCSize;
-text: .text%Java_java_util_zip_ZipFile_getEntrySize;
-text: .text%Java_java_util_zip_ZipFile_getEntryFlag;
-text: .text%Java_java_util_zip_ZipFile_getEntryMethod;
-text: .text%Java_java_util_zip_ZipFile_getEntryBytes;
-text: .text%Java_java_util_zip_Inflater_initIDs;
-text: .text%Java_java_util_zip_Inflater_init;
-text: .text%inflateInit2_;
-text: .text%zcalloc;
-text: .text%inflateReset;
-text: .text%Java_java_util_zip_Inflater_inflateBytes;
-text: .text%inflate;
-text: .text%Java_java_util_zip_ZipFile_read;
-text: .text%ZIP_Read;
-text: .text%huft_build: OUTPUTDIR/inftrees.o;
-text: .text%zcfree;
-text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
-text: .text%ZIP_ReadEntry;
-text: .text%InflateFully;
-text: .text%inflateEnd;
-text: .text%Java_java_util_zip_Inflater_reset;
-text: .text%Java_java_util_zip_ZipFile_close;
-text: .text%ZIP_Close;
-text: .text%Java_java_util_zip_Inflater_end;
diff --git a/jdk/makefiles/sun/xawt/ToBin.java b/jdk/makefiles/sun/awt/X11/ToBin.java
similarity index 100%
rename from jdk/makefiles/sun/xawt/ToBin.java
rename to jdk/makefiles/sun/awt/X11/ToBin.java
diff --git a/jdk/makefiles/sun/osxapp/ToBin.java b/jdk/makefiles/sun/osxapp/ToBin.java
new file mode 100644
index 0000000..9fdcba3
--- /dev/null
+++ b/jdk/makefiles/sun/osxapp/ToBin.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package sun.osxapp;
+
+import java.io.*;
+
+public class ToBin {
+ public static void main(String[] args) throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int nRead;
+ byte[] data = new byte[4096];
+
+ while ((nRead = System.in.read(data, 0, data.length)) != -1) {
+ baos.write(data, 0, nRead);
+ }
+
+ baos.flush();
+
+ byte[] buf = baos.toByteArray();
+ for (int i = 0; i < buf.length; i++) {
+ System.out.print(String.format("0x%1$02X", buf[i]) + ", ");
+ if (i % 20 == 0) {
+ System.out.println();
+ }
+ }
+ }
+}
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java
index f5dba5b..b7598f9 100644
--- a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java
@@ -379,6 +379,19 @@
}
}
updateButtonState(getFileChooser());
+ } else if (prop.equals(JFileChooser.SELECTED_FILES_CHANGED_PROPERTY)) {
+ JFileChooser fileChooser = getFileChooser();
+ if (!fileChooser.isDirectorySelectionEnabled()) {
+ final File[] files = (File[]) e.getNewValue();
+ if (files != null) {
+ for (int selectedRow : fFileList.getSelectedRows()) {
+ File file = (File) fFileList.getValueAt(selectedRow, 0);
+ if (fileChooser.isTraversable(file)) {
+ fFileList.removeSelectedIndex(selectedRow);
+ }
+ }
+ }
+ }
} else if (prop.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY)) {
fFileList.clearSelection();
final File currentDirectory = getFileChooser().getCurrentDirectory();
diff --git a/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java b/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java
index 42c6100..05943ed 100644
--- a/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java
+++ b/jdk/src/macosx/classes/java/util/prefs/MacOSXPreferences.java
@@ -100,7 +100,7 @@
else
this.isUser = isUserNode();
path = isRoot ? absolutePath() : absolutePath() + "/";
- file = cfFileForNode(isUser);
+ file = cfFileForNode(this.isUser);
if (isNew)
newNode = isNew;
else
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
index 431a1e0..2b88453 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -33,9 +33,7 @@
import sun.java2d.opengl.CGLGraphicsConfig;
-import sun.awt.FullScreenCapable;
-
-public class CGraphicsDevice extends GraphicsDevice {
+public final class CGraphicsDevice extends GraphicsDevice {
// CoreGraphics display ID
private final int displayID;
@@ -108,11 +106,6 @@
return nativeGetYResolution(displayID);
}
- public int getScreenResolution() {
- // TODO: report non-72 value when HiDPI is turned on
- return 72;
- }
-
private static native double nativeGetXResolution(int displayID);
private static native double nativeGetYResolution(int displayID);
@@ -194,6 +187,9 @@
@Override
public void setDisplayMode(DisplayMode dm) {
+ if (dm == null) {
+ throw new IllegalArgumentException("Invalid display mode");
+ }
nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(), dm.getBitDepth(), dm.getRefreshRate());
if (isFullScreenSupported() && getFullScreenWindow() != null) {
getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight());
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index 15502d1..6146ca2 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -65,7 +65,7 @@
private static native void nativeDispose(long nsWindowPtr);
private static native CPlatformWindow nativeGetTopmostPlatformWindowUnderMouse();
- private static native int nativeGetNSWindowDisplayID_AppKitThread(long nsWindowPtr);
+ private static native int nativeGetNSWindowDisplayID(long nsWindowPtr);
// Loger to report issues happened during execution but that do not affect functionality
private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow");
@@ -444,7 +444,7 @@
public GraphicsDevice getGraphicsDevice() {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
CGraphicsEnvironment cge = (CGraphicsEnvironment)ge;
- int displayID = nativeGetNSWindowDisplayID_AppKitThread(getNSWindowPtr());
+ int displayID = nativeGetNSWindowDisplayID(getNSWindowPtr());
GraphicsDevice gd = cge.getScreenDevice(displayID);
if (gd == null) {
// this could possibly happen during device removal
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
index fac844e..4a19e5a 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
@@ -26,6 +26,7 @@
package sun.lwawt.macosx;
import sun.awt.SunToolkit;
+import sun.lwawt.macosx.event.NSEvent;
import javax.swing.*;
import java.awt.*;
@@ -42,6 +43,16 @@
private JDialog messageDialog;
private DialogEventHandler handler;
+ // In order to construct MouseEvent object, we need to specify a
+ // Component target. Because TrayIcon isn't Component's subclass,
+ // we use this dummy frame instead
+ private final Frame dummyFrame;
+
+ // A bitmask that indicates what mouse buttons produce MOUSE_CLICKED events
+ // on MOUSE_RELEASE. Click events are only generated if there were no drag
+ // events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
+ private static int mouseClickButtons = 0;
+
CTrayIcon(TrayIcon target) {
super(0, true);
@@ -49,6 +60,7 @@
this.handler = null;
this.target = target;
this.popup = target.getPopupMenu();
+ this.dummyFrame = new Frame();
setPtr(createModel());
//if no one else is creating the peer.
@@ -119,6 +131,8 @@
disposeMessageDialog();
}
+ dummyFrame.dispose();
+
LWCToolkit.targetDisposedPeer(target, this);
target = null;
@@ -161,17 +175,78 @@
private native void setNativeImage(final long model, final long nsimage, final boolean autosize);
- //invocation from the AWTTrayIcon.m
- public void performAction() {
+ private void postEvent(final AWTEvent event) {
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
public void run() {
- final String cmd = target.getActionCommand();
- final ActionEvent event = new ActionEvent(target, ActionEvent.ACTION_PERFORMED, cmd);
SunToolkit.postEvent(SunToolkit.targetToAppContext(target), event);
}
});
}
+ //invocation from the AWTTrayIcon.m
+ private void handleMouseEvent(NSEvent nsEvent) {
+ int buttonNumber = nsEvent.getButtonNumber();
+ final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
+ if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
+ || buttonNumber > tk.getNumberOfButtons() - 1) {
+ return;
+ }
+
+ int jeventType = NSEvent.nsToJavaEventType(nsEvent.getType());
+
+ int jbuttonNumber = MouseEvent.NOBUTTON;
+ int jclickCount = 0;
+ if (jeventType != MouseEvent.MOUSE_MOVED) {
+ jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber);
+ jclickCount = nsEvent.getClickCount();
+ }
+
+ int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
+ nsEvent.getModifierFlags());
+ boolean isPopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
+
+ int eventButtonMask = (jbuttonNumber > 0)?
+ MouseEvent.getMaskForButton(jbuttonNumber) : 0;
+ long when = System.currentTimeMillis();
+
+ if (jeventType == MouseEvent.MOUSE_PRESSED) {
+ mouseClickButtons |= eventButtonMask;
+ } else if (jeventType == MouseEvent.MOUSE_DRAGGED) {
+ mouseClickButtons = 0;
+ }
+
+ // The MouseEvent's coordinates are relative to screen
+ int absX = nsEvent.getAbsX();
+ int absY = nsEvent.getAbsY();
+
+ MouseEvent mouseEvent = new MouseEvent(dummyFrame, jeventType, when,
+ jmodifiers, absX, absY, absX, absY, jclickCount, isPopupTrigger,
+ jbuttonNumber);
+ mouseEvent.setSource(target);
+ postEvent(mouseEvent);
+
+ // fire ACTION event
+ if (jeventType == MouseEvent.MOUSE_PRESSED && isPopupTrigger) {
+ final String cmd = target.getActionCommand();
+ final ActionEvent event = new ActionEvent(target,
+ ActionEvent.ACTION_PERFORMED, cmd);
+ postEvent(event);
+ }
+
+ // synthesize CLICKED event
+ if (jeventType == MouseEvent.MOUSE_RELEASED) {
+ if ((mouseClickButtons & eventButtonMask) != 0) {
+ MouseEvent clickEvent = new MouseEvent(dummyFrame,
+ MouseEvent.MOUSE_CLICKED, when, jmodifiers, absX, absY,
+ absX, absY, jclickCount, isPopupTrigger, jbuttonNumber);
+ clickEvent.setSource(target);
+ postEvent(clickEvent);
+ }
+
+ mouseClickButtons &= ~eventButtonMask;
+ }
+ }
+
private native Point2D nativeGetIconLocation(long trayIconModel);
public void displayMessageOnEDT(String caption, String text,
@@ -256,6 +331,9 @@
dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
dialog.setModal(false);
+ dialog.setModalExclusionType(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
+ dialog.setAlwaysOnTop(true);
+ dialog.setAutoRequestFocus(false);
dialog.setResizable(false);
dialog.setContentPane(op);
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 23df4fb..32a9808 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -53,7 +53,7 @@
/**
* Mac OS X Cocoa-based AWT Toolkit.
*/
-public class LWCToolkit extends LWToolkit {
+public final class LWCToolkit extends LWToolkit {
// While it is possible to enumerate all mouse devices
// and query them for the number of buttons, the code
// that does it is rather complex. Instead, we opt for
@@ -278,7 +278,6 @@
return new CMouseInfoPeer();
}
-
@Override
protected int getScreenHeight() {
return GraphicsEnvironment.getLocalGraphicsEnvironment()
@@ -333,8 +332,9 @@
@Override
public int getScreenResolution() throws HeadlessException {
- return ((CGraphicsDevice) GraphicsEnvironment
- .getLocalGraphicsEnvironment().getDefaultScreenDevice()).getScreenResolution();
+ return (int) ((CGraphicsDevice) GraphicsEnvironment
+ .getLocalGraphicsEnvironment().getDefaultScreenDevice())
+ .getXResolution();
}
@Override
diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/macosx/native/sun/awt/AWTWindow.m
index 2e2b854..f2958e3 100644
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m
@@ -324,6 +324,13 @@
}
}
++ (NSNumber *) getNSWindowDisplayID_AppKitThread:(NSWindow *)window {
+ AWT_ASSERT_APPKIT_THREAD;
+ NSScreen *screen = [window screen];
+ NSDictionary *deviceDescription = [screen deviceDescription];
+ return [deviceDescription objectForKey:@"NSScreenNumber"];
+}
+
- (void) dealloc {
AWT_ASSERT_APPKIT_THREAD;
@@ -1113,19 +1120,22 @@
* Signature: (J)I
*/
JNIEXPORT jint JNICALL
-Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindowDisplayID_1AppKitThread
+Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindowDisplayID
(JNIEnv *env, jclass clazz, jlong windowPtr)
{
- jint ret; // CGDirectDisplayID
+ __block jint ret; // CGDirectDisplayID
JNF_COCOA_ENTER(env);
-AWT_ASSERT_APPKIT_THREAD;
NSWindow *window = OBJC(windowPtr);
- NSScreen *screen = [window screen];
- NSDictionary *deviceDescription = [screen deviceDescription];
- NSNumber *displayID = [deviceDescription objectForKey:@"NSScreenNumber"];
- ret = (jint)[displayID intValue];
+
+ if ([NSThread isMainThread]) {
+ ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
+ } else {
+ [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
+ }];
+ }
JNF_COCOA_EXIT(env);
diff --git a/jdk/src/macosx/native/sun/awt/CTrayIcon.h b/jdk/src/macosx/native/sun/awt/CTrayIcon.h
index c5ceebf..9501e7d 100644
--- a/jdk/src/macosx/native/sun/awt/CTrayIcon.h
+++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.h
@@ -53,6 +53,7 @@
- (jobject) peer;
- (void) setImage:(NSImage *) imagePtr sizing:(BOOL)autosize;
- (NSPoint) getLocationOnScreen;
+- (void) deliverJavaMouseEvent:(NSEvent*) event;
@end //AWTTrayIcon
@@ -68,6 +69,7 @@
-(id)initWithTrayIcon:(AWTTrayIcon *)theTrayIcon;
-(void)setHighlighted:(BOOL)aFlag;
-(void)setImage:(NSImage*)anImage;
+-(void)setTrayIcon:(AWTTrayIcon*)theTrayIcon;
@end //AWTTrayIconView
diff --git a/jdk/src/macosx/native/sun/awt/CTrayIcon.m b/jdk/src/macosx/native/sun/awt/CTrayIcon.m
index b9c2942..a69995f 100644
--- a/jdk/src/macosx/native/sun/awt/CTrayIcon.m
+++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.m
@@ -29,6 +29,7 @@
#import "CTrayIcon.h"
#import "ThreadUtilities.h"
#include "GeomUtilities.h"
+#import "LWCToolkit.h"
#define kImageInset 4.0
@@ -76,8 +77,9 @@
// Its a bad idea to force the item to release our view by setting
// the item's view to nil: it can lead to a crash in some scenarios.
// The item will release the view later on, so just set the view's image
- // to nil since we are done with it.
+ // and tray icon to nil since we are done with it.
[view setImage: nil];
+ [view setTrayIcon: nil];
[view release];
[theItem release];
@@ -115,6 +117,45 @@
return [[view window] convertBaseToScreen: NSZeroPoint];
}
+-(void) deliverJavaMouseEvent: (NSEvent *) event {
+ [AWTToolkit eventCountPlusPlus];
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+
+ NSPoint eventLocation = [event locationInWindow];
+ NSPoint localPoint = [view convertPoint: eventLocation fromView: nil];
+ localPoint.y = [view bounds].size.height - localPoint.y;
+
+ NSPoint absP = [NSEvent mouseLocation];
+ NSEventType type = [event type];
+
+ NSRect screenRect = [[NSScreen mainScreen] frame];
+ absP.y = screenRect.size.height - absP.y;
+ jint clickCount;
+
+ clickCount = [event clickCount];
+
+ static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/event/NSEvent");
+ static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IIIIIIIIDD)V");
+ jobject jEvent = JNFNewObject(env, jctor_NSEvent,
+ [event type],
+ [event modifierFlags],
+ clickCount,
+ [event buttonNumber],
+ (jint)localPoint.x, (jint)localPoint.y,
+ (jint)absP.x, (jint)absP.y,
+ [event deltaY],
+ [event deltaX]);
+ if (jEvent == nil) {
+ // Unable to create event by some reason.
+ return;
+ }
+
+ static JNF_CLASS_CACHE(jc_TrayIcon, "sun/lwawt/macosx/CTrayIcon");
+ static JNF_MEMBER_CACHE(jm_handleMouseEvent, jc_TrayIcon, "handleMouseEvent", "(Lsun/lwawt/macosx/event/NSEvent;)V");
+ JNFCallVoidMethod(env, peer, jm_handleMouseEvent, jEvent);
+}
+
@end //AWTTrayIcon
//================================================
@@ -123,7 +164,7 @@
-(id)initWithTrayIcon:(AWTTrayIcon *)theTrayIcon {
self = [super initWithFrame:NSMakeRect(0, 0, 1, 1)];
- trayIcon = theTrayIcon;
+ [self setTrayIcon: theTrayIcon];
isHighlighted = NO;
image = nil;
@@ -153,6 +194,10 @@
}
}
+-(void)setTrayIcon:(AWTTrayIcon*)theTrayIcon {
+ trayIcon = theTrayIcon;
+}
+
- (void)menuWillOpen:(NSMenu *)menu
{
[self setHighlighted:YES];
@@ -191,30 +236,57 @@
];
}
-- (void) mouseDown:(NSEvent *)e {
- //find CTrayIcon.getPopupMenuModel method and call it to get popup menu ptr.
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
- static JNF_MEMBER_CACHE(jm_getPopupMenuModel, jc_CTrayIcon, "getPopupMenuModel", "()J");
- static JNF_MEMBER_CACHE(jm_performAction, jc_CTrayIcon, "performAction", "()V");
- jlong res = JNFCallLongMethod(env, trayIcon.peer, jm_getPopupMenuModel);
- if (res != 0) {
- CPopupMenu *cmenu = jlong_to_ptr(res);
- NSMenu* menu = [cmenu menu];
- [menu setDelegate:self];
- [trayIcon.theItem popUpStatusItemMenu:menu];
- [self setNeedsDisplay:YES];
- } else {
- JNFCallVoidMethod(env, trayIcon.peer, jm_performAction);
+- (void)mouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+
+ // don't show the menu on ctrl+click: it triggers ACTION event, like right click
+ if (([event modifierFlags] & NSControlKeyMask) == 0) {
+ //find CTrayIcon.getPopupMenuModel method and call it to get popup menu ptr.
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
+ static JNF_MEMBER_CACHE(jm_getPopupMenuModel, jc_CTrayIcon, "getPopupMenuModel", "()J");
+ jlong res = JNFCallLongMethod(env, trayIcon.peer, jm_getPopupMenuModel);
+
+ if (res != 0) {
+ CPopupMenu *cmenu = jlong_to_ptr(res);
+ NSMenu* menu = [cmenu menu];
+ [menu setDelegate:self];
+ [trayIcon.theItem popUpStatusItemMenu:menu];
+ [self setNeedsDisplay:YES];
+ }
}
}
-- (void) rightMouseDown:(NSEvent *)e {
- // Call CTrayIcon.performAction() method on right mouse press
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- static JNF_CLASS_CACHE(jc_CTrayIcon, "sun/lwawt/macosx/CTrayIcon");
- static JNF_MEMBER_CACHE(jm_performAction, jc_CTrayIcon, "performAction", "()V");
- JNFCallVoidMethod(env, trayIcon.peer, jm_performAction);
+- (void) mouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) mouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) rightMouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseDown:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseUp:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
+}
+
+- (void) otherMouseDragged:(NSEvent *)event {
+ [trayIcon deliverJavaMouseEvent: event];
}
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java b/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
index f454006..4bbb8f4 100644
--- a/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
+++ b/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -37,6 +37,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
@@ -46,6 +49,8 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import sun.misc.SharedSecrets;
+
/**
* The main class to parse JavaBeans XML archive.
*
@@ -56,11 +61,10 @@
* @see ElementHandler
*/
public final class DocumentHandler extends DefaultHandler {
- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<String, Class<? extends ElementHandler>>();
-
- private final Map<String, Object> environment = new HashMap<String, Object>();
-
- private final List<Object> objects = new ArrayList<Object>();
+ private final AccessControlContext acc = AccessController.getContext();
+ private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+ private final Map<String, Object> environment = new HashMap<>();
+ private final List<Object> objects = new ArrayList<>();
private Reference<ClassLoader> loader;
private ExceptionListener listener;
@@ -351,23 +355,32 @@
*
* @param input the input source to parse
*/
- public void parse(InputSource input) {
- try {
- SAXParserFactory.newInstance().newSAXParser().parse(input, this);
+ public void parse(final InputSource input) {
+ if ((this.acc == null) && (null != System.getSecurityManager())) {
+ throw new SecurityException("AccessControlContext is not set");
}
- catch (ParserConfigurationException exception) {
- handleException(exception);
- }
- catch (SAXException wrapper) {
- Exception exception = wrapper.getException();
- if (exception == null) {
- exception = wrapper;
+ AccessControlContext stack = AccessController.getContext();
+ SharedSecrets.getJavaSecurityAccess().doIntersectionPrivilege(new PrivilegedAction<Void>() {
+ public Void run() {
+ try {
+ SAXParserFactory.newInstance().newSAXParser().parse(input, DocumentHandler.this);
+ }
+ catch (ParserConfigurationException exception) {
+ handleException(exception);
+ }
+ catch (SAXException wrapper) {
+ Exception exception = wrapper.getException();
+ if (exception == null) {
+ exception = wrapper;
+ }
+ handleException(exception);
+ }
+ catch (IOException exception) {
+ handleException(exception);
+ }
+ return null;
}
- handleException(exception);
- }
- catch (IOException exception) {
- handleException(exception);
- }
+ }, stack, this.acc);
}
/**
diff --git a/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java b/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
index f208293..8f4c40c 100644
--- a/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
+++ b/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -35,6 +35,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import sun.reflect.misc.MethodUtil;
+
/**
* This class is intended to handle <property> element.
* This element simplifies access to the properties.
@@ -168,11 +170,11 @@
private static Object getPropertyValue(Object bean, String name, Integer index) throws IllegalAccessException, IntrospectionException, InvocationTargetException, NoSuchMethodException {
Class<?> type = bean.getClass();
if (index == null) {
- return findGetter(type, name).invoke(bean);
+ return MethodUtil.invoke(findGetter(type, name), bean, new Object[] {});
} else if (type.isArray() && (name == null)) {
return Array.get(bean, index);
} else {
- return findGetter(type, name, int.class).invoke(bean, index);
+ return MethodUtil.invoke(findGetter(type, name, int.class), bean, new Object[] {index});
}
}
@@ -197,11 +199,11 @@
: null;
if (index == null) {
- findSetter(type, name, param).invoke(bean, value);
+ MethodUtil.invoke(findSetter(type, name, param), bean, new Object[] {value});
} else if (type.isArray() && (name == null)) {
Array.set(bean, index, value);
} else {
- findSetter(type, name, int.class, param).invoke(bean, index, value);
+ MethodUtil.invoke(findSetter(type, name, int.class, param), bean, new Object[] {index, value});
}
}
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
index ba07141..58ccfb4 100644
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
@@ -68,9 +68,9 @@
this.notifBuffer = notifBuffer;
this.connectionId = connectionId;
connectionTimeout = EnvHelp.getServerConnectionTimeout(env);
- checkNotificationEmission = EnvHelp.computeBooleanFromString(
- env,
- "jmx.remote.x.check.notification.emission",false);
+
+ String stringBoolean = (String) env.get("jmx.remote.x.check.notification.emission");
+ checkNotificationEmission = EnvHelp.computeBooleanFromString( stringBoolean );
notificationAccessController =
EnvHelp.getNotificationAccessController(env);
}
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java b/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java
index e61d9d0..b8bf9d3 100644
--- a/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java
+++ b/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java
@@ -665,97 +665,57 @@
* Computes a boolean value from a string value retrieved from a
* property in the given map.
*
- * @param env the environment map.
- * @param prop the name of the property in the environment map whose
- * returned string value must be converted into a boolean value.
- * @param systemProperty if true, consult a system property of the
- * same name if there is no entry in the environment map.
+ * @param stringBoolean the string value that must be converted
+ * into a boolean value.
*
* @return
* <ul>
- * <li>{@code false} if {@code env.get(prop)} is {@code null}</li>
+ * <li>{@code false} if {@code stringBoolean} is {@code null}</li>
* <li>{@code false} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("false")}
+ * {@code stringBoolean.equalsIgnoreCase("false")}
* is {@code true}</li>
* <li>{@code true} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("true")}
+ * {@code stringBoolean.equalsIgnoreCase("true")}
* is {@code true}</li>
* </ul>
*
- * @throws IllegalArgumentException if {@code env} is {@code null} or
- * {@code env.get(prop)} is not {@code null} and
+ * @throws IllegalArgumentException if
* {@code ((String)env.get(prop)).equalsIgnoreCase("false")} and
* {@code ((String)env.get(prop)).equalsIgnoreCase("true")} are
* {@code false}.
- * @throws ClassCastException if {@code env.get(prop)} cannot be cast
- * to {@code String}.
*/
- public static boolean computeBooleanFromString(
- Map<String, ?> env, String prop, boolean systemProperty) {
-
- if (env == null)
- throw new IllegalArgumentException("env map cannot be null");
-
+ public static boolean computeBooleanFromString(String stringBoolean) {
// returns a default value of 'false' if no property is found...
- return computeBooleanFromString(env,prop,systemProperty,false);
+ return computeBooleanFromString(stringBoolean,false);
}
/**
* Computes a boolean value from a string value retrieved from a
* property in the given map.
*
- * @param env the environment map.
- * @param prop the name of the property in the environment map whose
- * returned string value must be converted into a boolean value.
- * @param systemProperty if true, consult a system property of the
- * same name if there is no entry in the environment map.
+ * @param stringBoolean the string value that must be converted
+ * into a boolean value.
* @param defaultValue a default value to return in case no property
* was defined.
*
* @return
* <ul>
- * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code false}</li>
- * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop)} is {@code null}</li>
- * <li>{@code false} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop).equalsIgnoreCase("false")}
- * is {@code true}</li>
- * <li>{@code true} if {@code env.get(prop)} is {@code null}
- * and {@code systemProperty} is {@code true} and
- * {@code System.getProperty(prop).equalsIgnoreCase("true")}
- * is {@code true}</li>
+ * <li>{@code defaultValue} if {@code stringBoolean}
+ * is {@code null}</li>
* <li>{@code false} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("false")}
+ * {@code stringBoolean.equalsIgnoreCase("false")}
* is {@code true}</li>
* <li>{@code true} if
- * {@code ((String)env.get(prop)).equalsIgnoreCase("true")}
+ * {@code stringBoolean.equalsIgnoreCase("true")}
* is {@code true}</li>
* </ul>
*
- * @throws IllegalArgumentException if {@code env} is {@code null} or
- * {@code env.get(prop)} is not {@code null} and
+ * @throws IllegalArgumentException if
* {@code ((String)env.get(prop)).equalsIgnoreCase("false")} and
* {@code ((String)env.get(prop)).equalsIgnoreCase("true")} are
* {@code false}.
- * @throws ClassCastException if {@code env.get(prop)} cannot be cast
- * to {@code String}.
*/
- public static boolean computeBooleanFromString(
- Map<String, ?> env, String prop,
- boolean systemProperty, boolean defaultValue) {
-
- if (env == null)
- throw new IllegalArgumentException("env map cannot be null");
-
- String stringBoolean = (String) env.get(prop);
- if (stringBoolean == null && systemProperty) {
- stringBoolean =
- AccessController.doPrivileged(new GetPropertyAction(prop));
- }
-
+ public static boolean computeBooleanFromString( String stringBoolean, boolean defaultValue) {
if (stringBoolean == null)
return defaultValue;
else if (stringBoolean.equalsIgnoreCase("true"))
@@ -763,8 +723,8 @@
else if (stringBoolean.equalsIgnoreCase("false"))
return false;
else
- throw new IllegalArgumentException(prop +
- " must be \"true\" or \"false\" instead of \"" +
+ throw new IllegalArgumentException(
+ "Property value must be \"true\" or \"false\" instead of \"" +
stringBoolean + "\"");
}
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
index 2b8b410..0d96af7 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
@@ -157,7 +157,8 @@
volatile IOException closureReason = null;
volatile boolean useable = true; // is Connection still useable
- private int readTimeout;
+ int readTimeout;
+ int connectTimeout;
// true means v3; false means v2
// Called in LdapClient.authenticate() (which is synchronized)
@@ -187,6 +188,7 @@
this.port = port;
this.parent = parent;
this.readTimeout = readTimeout;
+ this.connectTimeout = connectTimeout;
if (trace != null) {
traceFile = trace;
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java b/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
index 7881529..e0d0454 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
@@ -150,149 +150,155 @@
String authMechanism, Control[] ctls, Hashtable<?,?> env)
throws NamingException {
- authenticateCalled = true;
-
- try {
- ensureOpen();
- } catch (IOException e) {
- NamingException ne = new CommunicationException();
- ne.setRootCause(e);
- throw ne;
- }
-
- switch (version) {
- case LDAP_VERSION3_VERSION2:
- case LDAP_VERSION3:
- isLdapv3 = true;
- break;
- case LDAP_VERSION2:
- isLdapv3 = false;
- break;
- default:
- throw new CommunicationException("Protocol version " + version +
- " not supported");
- }
-
+ int readTimeout = conn.readTimeout;
+ conn.readTimeout = conn.connectTimeout;
LdapResult res = null;
- if (authMechanism.equalsIgnoreCase("none") ||
- authMechanism.equalsIgnoreCase("anonymous")) {
+ try {
+ authenticateCalled = true;
- // Perform LDAP bind if we are reauthenticating, using LDAPv2,
- // supporting failover to LDAPv2, or controls have been supplied.
- if (!initial ||
- (version == LDAP_VERSION2) ||
- (version == LDAP_VERSION3_VERSION2) ||
- ((ctls != null) && (ctls.length > 0))) {
+ try {
+ ensureOpen();
+ } catch (IOException e) {
+ NamingException ne = new CommunicationException();
+ ne.setRootCause(e);
+ throw ne;
+ }
+
+ switch (version) {
+ case LDAP_VERSION3_VERSION2:
+ case LDAP_VERSION3:
+ isLdapv3 = true;
+ break;
+ case LDAP_VERSION2:
+ isLdapv3 = false;
+ break;
+ default:
+ throw new CommunicationException("Protocol version " + version +
+ " not supported");
+ }
+
+ if (authMechanism.equalsIgnoreCase("none") ||
+ authMechanism.equalsIgnoreCase("anonymous")) {
+
+ // Perform LDAP bind if we are reauthenticating, using LDAPv2,
+ // supporting failover to LDAPv2, or controls have been supplied.
+ if (!initial ||
+ (version == LDAP_VERSION2) ||
+ (version == LDAP_VERSION3_VERSION2) ||
+ ((ctls != null) && (ctls.length > 0))) {
+ try {
+ // anonymous bind; update name/pw for LDAPv2 retry
+ res = ldapBind(name=null, (byte[])(pw=null), ctls, null,
+ false);
+ if (res.status == LdapClient.LDAP_SUCCESS) {
+ conn.setBound();
+ }
+ } catch (IOException e) {
+ NamingException ne =
+ new CommunicationException("anonymous bind failed: " +
+ conn.host + ":" + conn.port);
+ ne.setRootCause(e);
+ throw ne;
+ }
+ } else {
+ // Skip LDAP bind for LDAPv3 anonymous bind
+ res = new LdapResult();
+ res.status = LdapClient.LDAP_SUCCESS;
+ }
+ } else if (authMechanism.equalsIgnoreCase("simple")) {
+ // simple authentication
+ byte[] encodedPw = null;
try {
- // anonymous bind; update name/pw for LDAPv2 retry
- res = ldapBind(name=null, (byte[])(pw=null), ctls, null,
- false);
+ encodedPw = encodePassword(pw, isLdapv3);
+ res = ldapBind(name, encodedPw, ctls, null, false);
if (res.status == LdapClient.LDAP_SUCCESS) {
conn.setBound();
}
} catch (IOException e) {
NamingException ne =
- new CommunicationException("anonymous bind failed: " +
+ new CommunicationException("simple bind failed: " +
+ conn.host + ":" + conn.port);
+ ne.setRootCause(e);
+ throw ne;
+ } finally {
+ // If pw was copied to a new array, clear that array as
+ // a security precaution.
+ if (encodedPw != pw && encodedPw != null) {
+ for (int i = 0; i < encodedPw.length; i++) {
+ encodedPw[i] = 0;
+ }
+ }
+ }
+ } else if (isLdapv3) {
+ // SASL authentication
+ try {
+ res = LdapSasl.saslBind(this, conn, conn.host, name, pw,
+ authMechanism, env, ctls);
+ if (res.status == LdapClient.LDAP_SUCCESS) {
+ conn.setBound();
+ }
+ } catch (IOException e) {
+ NamingException ne =
+ new CommunicationException("SASL bind failed: " +
conn.host + ":" + conn.port);
ne.setRootCause(e);
throw ne;
}
} else {
- // Skip LDAP bind for LDAPv3 anonymous bind
- res = new LdapResult();
- res.status = LdapClient.LDAP_SUCCESS;
+ throw new AuthenticationNotSupportedException(authMechanism);
}
- } else if (authMechanism.equalsIgnoreCase("simple")) {
- // simple authentication
- byte[] encodedPw = null;
- try {
- encodedPw = encodePassword(pw, isLdapv3);
- res = ldapBind(name, encodedPw, ctls, null, false);
- if (res.status == LdapClient.LDAP_SUCCESS) {
- conn.setBound();
- }
- } catch (IOException e) {
- NamingException ne =
- new CommunicationException("simple bind failed: " +
- conn.host + ":" + conn.port);
- ne.setRootCause(e);
- throw ne;
- } finally {
- // If pw was copied to a new array, clear that array as
- // a security precaution.
- if (encodedPw != pw && encodedPw != null) {
- for (int i = 0; i < encodedPw.length; i++) {
- encodedPw[i] = 0;
+
+ //
+ // re-try login using v2 if failing over
+ //
+ if (initial &&
+ (res.status == LdapClient.LDAP_PROTOCOL_ERROR) &&
+ (version == LdapClient.LDAP_VERSION3_VERSION2) &&
+ (authMechanism.equalsIgnoreCase("none") ||
+ authMechanism.equalsIgnoreCase("anonymous") ||
+ authMechanism.equalsIgnoreCase("simple"))) {
+
+ byte[] encodedPw = null;
+ try {
+ isLdapv3 = false;
+ encodedPw = encodePassword(pw, false);
+ res = ldapBind(name, encodedPw, ctls, null, false);
+ if (res.status == LdapClient.LDAP_SUCCESS) {
+ conn.setBound();
+ }
+ } catch (IOException e) {
+ NamingException ne =
+ new CommunicationException(authMechanism + ":" +
+ conn.host + ":" + conn.port);
+ ne.setRootCause(e);
+ throw ne;
+ } finally {
+ // If pw was copied to a new array, clear that array as
+ // a security precaution.
+ if (encodedPw != pw && encodedPw != null) {
+ for (int i = 0; i < encodedPw.length; i++) {
+ encodedPw[i] = 0;
+ }
}
}
}
- } else if (isLdapv3) {
- // SASL authentication
- try {
- res = LdapSasl.saslBind(this, conn, conn.host, name, pw,
- authMechanism, env, ctls);
- if (res.status == LdapClient.LDAP_SUCCESS) {
- conn.setBound();
- }
- } catch (IOException e) {
- NamingException ne =
- new CommunicationException("SASL bind failed: " +
- conn.host + ":" + conn.port);
- ne.setRootCause(e);
- throw ne;
+
+ // principal name not found
+ // (map NameNotFoundException to AuthenticationException)
+ // %%% This is a workaround for Netscape servers returning
+ // %%% no such object when the principal name is not found
+ // %%% Note that when this workaround is applied, it does not allow
+ // %%% response controls to be recorded by the calling context
+ if (res.status == LdapClient.LDAP_NO_SUCH_OBJECT) {
+ throw new AuthenticationException(
+ getErrorMessage(res.status, res.errorMessage));
}
- } else {
- throw new AuthenticationNotSupportedException(authMechanism);
+ conn.setV3(isLdapv3);
+ return res;
+ } finally {
+ conn.readTimeout = readTimeout;
}
-
- //
- // re-try login using v2 if failing over
- //
- if (initial &&
- (res.status == LdapClient.LDAP_PROTOCOL_ERROR) &&
- (version == LdapClient.LDAP_VERSION3_VERSION2) &&
- (authMechanism.equalsIgnoreCase("none") ||
- authMechanism.equalsIgnoreCase("anonymous") ||
- authMechanism.equalsIgnoreCase("simple"))) {
-
- byte[] encodedPw = null;
- try {
- isLdapv3 = false;
- encodedPw = encodePassword(pw, false);
- res = ldapBind(name, encodedPw, ctls, null, false);
- if (res.status == LdapClient.LDAP_SUCCESS) {
- conn.setBound();
- }
- } catch (IOException e) {
- NamingException ne =
- new CommunicationException(authMechanism + ":" +
- conn.host + ":" + conn.port);
- ne.setRootCause(e);
- throw ne;
- } finally {
- // If pw was copied to a new array, clear that array as
- // a security precaution.
- if (encodedPw != pw && encodedPw != null) {
- for (int i = 0; i < encodedPw.length; i++) {
- encodedPw[i] = 0;
- }
- }
- }
- }
-
- // principal name not found
- // (map NameNotFoundException to AuthenticationException)
- // %%% This is a workaround for Netscape servers returning
- // %%% no such object when the principal name is not found
- // %%% Note that when this workaround is applied, it does not allow
- // %%% response controls to be recorded by the calling context
- if (res.status == LdapClient.LDAP_NO_SUCH_OBJECT) {
- throw new AuthenticationException(
- getErrorMessage(res.status, res.errorMessage));
- }
- conn.setV3(isLdapv3);
- return res;
}
/**
diff --git a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
index df6cbd0..af0c988 100644
--- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -1746,12 +1746,7 @@
// convert to a Double and compare to zero
try {
- Double d = new Double(value.toString());
- if (d.compareTo(new Double((double)0)) == 0) {
- return false;
- } else {
- return true;
- }
+ return Double.compare(Double.parseDouble(value.toString()), 0) != 0;
} catch (NumberFormatException ex) {
throw new SQLException(MessageFormat.format(resBundle.handleGetObject("cachedrowsetimpl.boolfail").toString(),
new Object[] {value.toString().trim(), columnIndex}));
@@ -2039,6 +2034,7 @@
* the cursor is not on a valid row, or this method fails
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
Object value;
BigDecimal bDecimal, retVal;
@@ -2374,6 +2370,7 @@
* @throws SQLException if an error occurs
* @deprecated
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
// always free an old stream
unicodeStream = null;
@@ -2643,6 +2640,7 @@
* @deprecated Use the <code>getBigDecimal(String columnName)</code>
* method instead
*/
+ @Deprecated
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
return getBigDecimal(getColIdxByName(columnName), scale);
}
@@ -2774,6 +2772,7 @@
* this rowset's rows or its insert row
* @deprecated use the method <code>getCharacterStream</code> instead
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
return getUnicodeStream(getColIdxByName(columnName));
}
@@ -4428,7 +4427,7 @@
// make sure the cursor is on a valid row
checkCursor();
- Object obj = convertNumeric(new Float(x),
+ Object obj = convertNumeric(Float.valueOf(x),
java.sql.Types.REAL,
RowSetMD.getColumnType(columnIndex));
@@ -4463,7 +4462,7 @@
checkIndex(columnIndex);
// make sure the cursor is on a valid row
checkCursor();
- Object obj = convertNumeric(new Double(x),
+ Object obj = convertNumeric(Double.valueOf(x),
java.sql.Types.DOUBLE,
RowSetMD.getColumnType(columnIndex));
diff --git a/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java
index 20c2743..eeda4b7 100644
--- a/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -839,7 +839,7 @@
if(onInsertRow) {
if(p != null) {
- bool = p.evaluate(new Float(x) , columnIndex);
+ bool = p.evaluate(Float.valueOf(x), columnIndex);
if(!bool) {
throw new SQLException(resBundle.handleGetObject("filteredrowsetimpl.notallowed").toString());
@@ -906,7 +906,7 @@
if(onInsertRow) {
if(p != null) {
- bool = p.evaluate(new Double(x) , columnIndex);
+ bool = p.evaluate(Double.valueOf(x) , columnIndex);
if(!bool) {
throw new SQLException(resBundle.handleGetObject("filteredrowsetimpl.notallowed").toString());
diff --git a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
index 36612ad..8302c29 100644
--- a/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
@@ -1016,6 +1016,7 @@
* prepared statement, and result set
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
checkState();
@@ -1154,6 +1155,7 @@
* @deprecated use <code>getCharacterStream</code> in place of
* <code>getUnicodeStream</code>
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
checkState();
@@ -1336,6 +1338,7 @@
* prepared statement, and result set
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
return getBigDecimal(findColumn(columnName), scale);
}
@@ -1461,6 +1464,7 @@
* prepared statement, and result set
* @deprecated
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
return getUnicodeStream(findColumn(columnName));
}
diff --git a/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
index 0f712f9..4593794 100644
--- a/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
@@ -1153,6 +1153,7 @@
* the cursor is not on a valid row, or this method fails
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
return crsInternal.getBigDecimal(columnIndex);
}
@@ -1264,6 +1265,7 @@
* @throws SQLException if an error occurs
* @deprecated
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
return crsInternal.getUnicodeStream(columnIndex);
}
@@ -1436,6 +1438,7 @@
* @deprecated use the method <code>getBigDecimal(String columnName)</code>
* instead
*/
+ @Deprecated
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
return crsInternal.getBigDecimal(columnName);
}
@@ -1552,6 +1555,7 @@
* this rowset's rows or its insert row
* @deprecated use the method <code>getCharacterStream</code> instead
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
return crsInternal.getUnicodeStream(columnName);
}
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
index 911b1d1..51654a8 100644
--- a/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
@@ -1288,6 +1288,7 @@
* the cursor is not on a valid row, or this method fails
* @deprecated
*/
+ @Deprecated
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
throw new UnsupportedOperationException();
}
@@ -1424,6 +1425,7 @@
* @throws SQLException if an error occurs
* @deprecated
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
@@ -1653,6 +1655,7 @@
* @deprecated Use the <code>getBigDecimal(String columnName)</code>
* method instead
*/
+ @Deprecated
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
throw new UnsupportedOperationException();
}
@@ -1784,6 +1787,7 @@
* this rowset's rows or its insert row
* @deprecated use the method <code>getCharacterStream</code> instead
*/
+ @Deprecated
public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
index 2f2a494..aaab5a9 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
@@ -802,7 +802,7 @@
if (doNotPrompt) {
throw new LoginException
- ("Unable to obtain Princpal Name for authentication ");
+ ("Unable to obtain Principal Name for authentication ");
} else {
if (callbackHandler == null)
throw new LoginException("No CallbackHandler "
diff --git a/jdk/src/share/classes/java/beans/XMLDecoder.java b/jdk/src/share/classes/java/beans/XMLDecoder.java
index accef11..2fb2fd0 100644
--- a/jdk/src/share/classes/java/beans/XMLDecoder.java
+++ b/jdk/src/share/classes/java/beans/XMLDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -29,6 +29,9 @@
import java.io.Closeable;
import java.io.InputStream;
import java.io.IOException;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -61,6 +64,7 @@
* @author Philip Milne
*/
public class XMLDecoder implements AutoCloseable {
+ private final AccessControlContext acc = AccessController.getContext();
private final DocumentHandler handler = new DocumentHandler();
private final InputSource input;
private Object owner;
@@ -189,7 +193,15 @@
return false;
}
if (this.array == null) {
- this.handler.parse(this.input);
+ if ((this.acc == null) && (null != System.getSecurityManager())) {
+ throw new SecurityException("AccessControlContext is not set");
+ }
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ XMLDecoder.this.handler.parse(XMLDecoder.this.input);
+ return null;
+ }
+ }, this.acc);
this.array = this.handler.getObjects();
}
return true;
diff --git a/jdk/src/share/classes/java/io/FilePermission.java b/jdk/src/share/classes/java/io/FilePermission.java
index 97ca195..e70d292 100644
--- a/jdk/src/share/classes/java/io/FilePermission.java
+++ b/jdk/src/share/classes/java/io/FilePermission.java
@@ -407,7 +407,7 @@
* @return a hash code value for this object.
*/
public int hashCode() {
- return this.cpath.hashCode();
+ return 0;
}
/**
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
index 636bfeb..3f58e61 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,13 +25,14 @@
package java.lang.invoke;
-import sun.invoke.util.VerifyType;
-
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import sun.invoke.empty.Empty;
import sun.invoke.util.ValueConversions;
+import sun.invoke.util.VerifyType;
import sun.invoke.util.Wrapper;
import static java.lang.invoke.LambdaForm.*;
import static java.lang.invoke.MethodHandleStatics.*;
@@ -781,4 +782,168 @@
return mh;
}
+ /**
+ * Create an alias for the method handle which, when called,
+ * appears to be called from the same class loader and protection domain
+ * as hostClass.
+ * This is an expensive no-op unless the method which is called
+ * is sensitive to its caller. A small number of system methods
+ * are in this category, including Class.forName and Method.invoke.
+ */
+ static
+ MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
+ return BindCaller.bindCaller(mh, hostClass);
+ }
+
+ // Put the whole mess into its own nested class.
+ // That way we can lazily load the code and set up the constants.
+ private static class BindCaller {
+ static
+ MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
+ // Do not use this function to inject calls into system classes.
+ if (hostClass == null) {
+ hostClass = C_Trampoline;
+ } else if (hostClass.isArray() ||
+ hostClass.isPrimitive() ||
+ hostClass.getName().startsWith("java.") ||
+ hostClass.getName().startsWith("sun.")) {
+ throw new InternalError(); // does not happen, and should not anyway
+ }
+ // For simplicity, convert mh to a varargs-like method.
+ MethodHandle vamh = prepareForInvoker(mh);
+ // Cache the result of makeInjectedInvoker once per argument class.
+ MethodHandle bccInvoker = CV_makeInjectedInvoker.get(hostClass);
+ return restoreToType(bccInvoker.bindTo(vamh), mh.type());
+ }
+
+ // This class ("Trampoline") is known to be inside a dead-end class loader.
+ // Inject all doubtful calls into this class.
+ private static Class<?> C_Trampoline;
+ static {
+ Class<?> tramp = null;
+ try {
+ final int FRAME_COUNT_ARG = 1; // [0] Reflection [1] Trampoline
+ java.lang.reflect.Method gcc = sun.reflect.Reflection.class.getMethod("getCallerClass", int.class);
+ tramp = (Class<?>) sun.reflect.misc.MethodUtil.invoke(gcc, null, new Object[]{ FRAME_COUNT_ARG });
+ if (tramp.getClassLoader() == BindCaller.class.getClassLoader())
+ throw new RuntimeException(tramp.getName()+" class loader");
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ C_Trampoline = tramp;
+ }
+
+ private static MethodHandle makeInjectedInvoker(Class<?> hostClass) {
+ Class<?> bcc = UNSAFE.defineAnonymousClass(hostClass, T_BYTES, null);
+ if (hostClass.getClassLoader() != bcc.getClassLoader())
+ throw new InternalError(hostClass.getName()+" (CL)");
+ try {
+ if (hostClass.getProtectionDomain() != bcc.getProtectionDomain())
+ throw new InternalError(hostClass.getName()+" (PD)");
+ } catch (SecurityException ex) {
+ // Self-check was blocked by security manager. This is OK.
+ // In fact the whole try body could be turned into an assertion.
+ }
+ try {
+ MethodHandle init = IMPL_LOOKUP.findStatic(bcc, "init", MethodType.methodType(void.class));
+ init.invokeExact(); // force initialization of the class
+ } catch (Throwable ex) {
+ throw uncaughtException(ex);
+ }
+ MethodHandle bccInvoker;
+ try {
+ MethodType invokerMT = MethodType.methodType(Object.class, MethodHandle.class, Object[].class);
+ bccInvoker = IMPL_LOOKUP.findStatic(bcc, "invoke_V", invokerMT);
+ } catch (ReflectiveOperationException ex) {
+ throw uncaughtException(ex);
+ }
+ // Test the invoker, to ensure that it really injects into the right place.
+ try {
+ MethodHandle vamh = prepareForInvoker(MH_checkCallerClass);
+ Object ok = bccInvoker.invokeExact(vamh, new Object[]{hostClass, bcc});
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ return bccInvoker;
+ }
+ private static ClassValue<MethodHandle> CV_makeInjectedInvoker = new ClassValue<MethodHandle>() {
+ @Override protected MethodHandle computeValue(Class<?> hostClass) {
+ return makeInjectedInvoker(hostClass);
+ }
+ };
+
+ // Adapt mh so that it can be called directly from an injected invoker:
+ private static MethodHandle prepareForInvoker(MethodHandle mh) {
+ mh = mh.asFixedArity();
+ MethodType mt = mh.type();
+ int arity = mt.parameterCount();
+ MethodHandle vamh = mh.asType(mt.generic());
+ vamh.internalForm().compileToBytecode(); // eliminate LFI stack frames
+ vamh = vamh.asSpreader(Object[].class, arity);
+ vamh.internalForm().compileToBytecode(); // eliminate LFI stack frames
+ return vamh;
+ }
+
+ // Undo the adapter effect of prepareForInvoker:
+ private static MethodHandle restoreToType(MethodHandle vamh, MethodType type) {
+ return vamh.asCollector(Object[].class, type.parameterCount()).asType(type);
+ }
+
+ private static final MethodHandle MH_checkCallerClass;
+ static {
+ final Class<?> THIS_CLASS = BindCaller.class;
+ assert(checkCallerClass(THIS_CLASS, THIS_CLASS));
+ try {
+ MH_checkCallerClass = IMPL_LOOKUP
+ .findStatic(THIS_CLASS, "checkCallerClass",
+ MethodType.methodType(boolean.class, Class.class, Class.class));
+ assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
+ } catch (Throwable ex) {
+ throw new InternalError(ex);
+ }
+ }
+
+ private static boolean checkCallerClass(Class<?> expected, Class<?> expected2) {
+ final int FRAME_COUNT_ARG = 2; // [0] Reflection [1] BindCaller [2] Expected
+ Class<?> actual = sun.reflect.Reflection.getCallerClass(FRAME_COUNT_ARG);
+ if (actual != expected && actual != expected2)
+ throw new InternalError("found "+actual.getName()+", expected "+expected.getName()
+ +(expected == expected2 ? "" : ", or else "+expected2.getName()));
+ return true;
+ }
+
+ private static final byte[] T_BYTES;
+ static {
+ final Object[] values = {null};
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ try {
+ Class<T> tClass = T.class;
+ String tName = tClass.getName();
+ String tResource = tName.substring(tName.lastIndexOf('.')+1)+".class";
+ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection();
+ int len = uconn.getContentLength();
+ byte[] bytes = new byte[len];
+ try (java.io.InputStream str = uconn.getInputStream()) {
+ int nr = str.read(bytes);
+ if (nr != len) throw new java.io.IOException(tResource);
+ }
+ values[0] = bytes;
+ } catch (java.io.IOException ex) {
+ throw new InternalError(ex);
+ }
+ return null;
+ }
+ });
+ T_BYTES = (byte[]) values[0];
+ }
+
+ // The following class is used as a template for Unsafe.defineAnonymousClass:
+ private static class T {
+ static void init() { } // side effect: initializes this class
+ static Object invoke_V(MethodHandle vamh, Object[] args) throws Throwable {
+ return vamh.invokeExact(args);
+ }
+ }
+ }
}
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
index d27256fb..06a9ba2 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -385,4 +385,101 @@
throw err;
}
}
+
+ /**
+ * Is this method a caller-sensitive method?
+ * I.e., does it call Reflection.getCallerClass or a similer method
+ * to ask about the identity of its caller?
+ */
+ // FIXME: Replace this pattern match by an annotation @sun.reflect.CallerSensitive.
+ static boolean isCallerSensitive(MemberName mem) {
+ assert(mem.isInvocable());
+ Class<?> defc = mem.getDeclaringClass();
+ switch (mem.getName()) {
+ case "doPrivileged":
+ return defc == java.security.AccessController.class;
+ case "getUnsafe":
+ return defc == sun.misc.Unsafe.class;
+ case "lookup":
+ return defc == java.lang.invoke.MethodHandles.class;
+ case "invoke":
+ return defc == java.lang.reflect.Method.class;
+ case "get":
+ case "getBoolean":
+ case "getByte":
+ case "getChar":
+ case "getShort":
+ case "getInt":
+ case "getLong":
+ case "getFloat":
+ case "getDouble":
+ case "set":
+ case "setBoolean":
+ case "setByte":
+ case "setChar":
+ case "setShort":
+ case "setInt":
+ case "setLong":
+ case "setFloat":
+ case "setDouble":
+ return defc == java.lang.reflect.Field.class;
+ case "newInstance":
+ if (defc == java.lang.reflect.Constructor.class) return true;
+ if (defc == java.lang.Class.class) return true;
+ break;
+ case "forName":
+ case "getClassLoader":
+ case "getClasses":
+ case "getFields":
+ case "getMethods":
+ case "getConstructors":
+ case "getDeclaredClasses":
+ case "getDeclaredFields":
+ case "getDeclaredMethods":
+ case "getDeclaredConstructors":
+ case "getField":
+ case "getMethod":
+ case "getConstructor":
+ case "getDeclaredField":
+ case "getDeclaredMethod":
+ case "getDeclaredConstructor":
+ return defc == java.lang.Class.class;
+ case "getConnection":
+ case "getDriver":
+ case "getDrivers":
+ case "deregisterDriver":
+ return defc == java.sql.DriverManager.class;
+ case "newUpdater":
+ if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true;
+ break;
+ case "getContextClassLoader":
+ return defc == java.lang.Thread.class;
+ case "getPackage":
+ case "getPackages":
+ return defc == java.lang.Package.class;
+ case "getParent":
+ case "getSystemClassLoader":
+ return defc == java.lang.ClassLoader.class;
+ case "load":
+ case "loadLibrary":
+ if (defc == java.lang.Runtime.class) return true;
+ if (defc == java.lang.System.class) return true;
+ break;
+ case "getCallerClass":
+ if (defc == sun.reflect.Reflection.class) return true;
+ if (defc == java.lang.System.class) return true;
+ break;
+ case "getCallerClassLoader":
+ return defc == java.lang.ClassLoader.class;
+ case "getProxyClass":
+ case "newProxyInstance":
+ return defc == java.lang.reflect.Proxy.class;
+ case "getBundle":
+ case "clearCache":
+ return defc == java.util.ResourceBundle.class;
+ }
+ return false;
+ }
}
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java
index 1c069aa..8a8eedf 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -114,7 +114,7 @@
/*non-public*/ static RuntimeException newIllegalArgumentException(String message, Object obj, Object obj2) {
return new IllegalArgumentException(message(message, obj, obj2));
}
- /*non-public*/ static Error uncaughtException(Exception ex) {
+ /*non-public*/ static Error uncaughtException(Throwable ex) {
throw newInternalError("uncaught exception", ex);
}
static Error NYI() {
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
index 5c55f20..e7007dd 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -329,6 +329,7 @@
* where {@code defcPkg} is the package of {@code defc}.
* </ul>
*/
+ // FIXME in MR1: clarify that the bytecode behavior of a caller-ID method (like Class.forName) is relative to the lookupClass used to create the method handle, not the dynamic caller of the method handle
public static final
class Lookup {
/** The class on behalf of whom the lookup is being performed. */
@@ -1209,6 +1210,7 @@
if (method.isMethodHandleInvoke())
return fakeMethodHandleInvoke(method);
MethodHandle mh = DirectMethodHandle.make(refc, method);
+ mh = maybeBindCaller(method, mh);
mh = mh.setVarargs(method);
if (doRestrict)
mh = restrictReceiver(method, mh, lookupClass());
@@ -1217,6 +1219,16 @@
private MethodHandle fakeMethodHandleInvoke(MemberName method) {
return throwException(method.getReturnType(), UnsupportedOperationException.class);
}
+ private MethodHandle maybeBindCaller(MemberName method, MethodHandle mh) throws IllegalAccessException {
+ if (allowedModes == TRUSTED || !MethodHandleNatives.isCallerSensitive(method))
+ return mh;
+ Class<?> hostClass = lookupClass;
+ if ((allowedModes & PRIVATE) == 0) // caller must use full-power lookup
+ hostClass = null;
+ MethodHandle cbmh = MethodHandleImpl.bindCaller(mh, hostClass);
+ // Note: caller will apply varargs after this step happens.
+ return cbmh;
+ }
private MethodHandle getDirectField(byte refKind, Class<?> refc, MemberName field) throws IllegalAccessException {
checkField(refKind, refc, field);
MethodHandle mh = DirectMethodHandle.make(refc, field);
@@ -1229,6 +1241,7 @@
private MethodHandle getDirectConstructor(Class<?> refc, MemberName ctor) throws IllegalAccessException {
assert(ctor.isConstructor());
checkAccess(REF_newInvokeSpecial, refc, ctor);
+ assert(!MethodHandleNatives.isCallerSensitive(ctor)); // maybeBindCaller not relevant here
return DirectMethodHandle.make(ctor).setVarargs(ctor);
}
diff --git a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
index 7495805..ce36479 100644
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
@@ -52,6 +52,7 @@
private boolean shut_wr = false;
private SocketInputStream socketInputStream = null;
+ private SocketOutputStream socketOutputStream = null;
/* number of threads using the FileDescriptor */
protected int fdUseCount = 0;
@@ -436,7 +437,10 @@
if (shut_wr) {
throw new IOException("Socket output is shutdown");
}
- return new SocketOutputStream(this);
+ if (socketOutputStream == null) {
+ socketOutputStream = new SocketOutputStream(this);
+ }
+ return socketOutputStream;
}
void setFileDescriptor(FileDescriptor fd) {
diff --git a/jdk/src/share/classes/java/net/ProxySelector.java b/jdk/src/share/classes/java/net/ProxySelector.java
index 88f24a2..97d19a1 100644
--- a/jdk/src/share/classes/java/net/ProxySelector.java
+++ b/jdk/src/share/classes/java/net/ProxySelector.java
@@ -127,7 +127,6 @@
* <UL>
* <LI>http URI for http connections</LI>
* <LI>https URI for https connections
- * <LI>ftp URI for ftp connections</LI>
* <LI><code>socket://host:port</code><br>
* for tcp client sockets connections</LI>
* </UL>
diff --git a/jdk/src/share/classes/java/net/URL.java b/jdk/src/share/classes/java/net/URL.java
index e7e9dda..5cb3f6d 100644
--- a/jdk/src/share/classes/java/net/URL.java
+++ b/jdk/src/share/classes/java/net/URL.java
@@ -274,7 +274,7 @@
* <p>Protocol handlers for the following protocols are guaranteed
* to exist on the search path :-
* <blockquote><pre>
- * http, https, ftp, file, and jar
+ * http, https, file, and jar
* </pre></blockquote>
* Protocol handlers for additional protocols may also be
* available.
diff --git a/jdk/src/share/classes/java/net/URLStreamHandler.java b/jdk/src/share/classes/java/net/URLStreamHandler.java
index c98588a..ba7fa26 100644
--- a/jdk/src/share/classes/java/net/URLStreamHandler.java
+++ b/jdk/src/share/classes/java/net/URLStreamHandler.java
@@ -37,8 +37,7 @@
* The abstract class <code>URLStreamHandler</code> is the common
* superclass for all stream protocol handlers. A stream protocol
* handler knows how to make a connection for a particular protocol
- * type, such as <code>http</code>, <code>ftp</code>, or
- * <code>gopher</code>.
+ * type, such as <code>http</code> or <code>https</code>.
* <p>
* In most cases, an instance of a <code>URLStreamHandler</code>
* subclass is not created directly by an application. Rather, the
diff --git a/jdk/src/share/classes/java/net/package.html b/jdk/src/share/classes/java/net/package.html
index b5bd261..2cd8a24 100644
--- a/jdk/src/share/classes/java/net/package.html
+++ b/jdk/src/share/classes/java/net/package.html
@@ -72,7 +72,7 @@
<ul>
<li>{@link java.net.URI} is the class representing a Universal Resource Identifier, as specified in RFC 2396. As the name indicates, this is just an Identifier and doesn't provide directly the means to access the resource.</li>
<li>{@link java.net.URL} is the class representing a Universal Resource Locator, which is both an older concept for URIs and a means to access the resources.</li>
- <li>{@link java.net.URLConnection} is created from a URL and is the communication link used to access the resource pointed by the URL. This abstract class will delegate most of the work to the underlying protocol handlers like http or ftp.</li>
+ <li>{@link java.net.URLConnection} is created from a URL and is the communication link used to access the resource pointed by the URL. This abstract class will delegate most of the work to the underlying protocol handlers like http or https.</li>
<li>{@link java.net.HttpURLConnection} is a subclass of URLConnection and provides some additional functionalities specific to the HTTP protocol.</li>
</ul>
<p>The recommended usage is to use {@link java.net.URI} to identify resources, then convert it into a {@link java.net.URL} when it is time to access the resource. From that URL, you can either get the {@link java.net.URLConnection} for fine control, or get directly the InputStream.<p>
diff --git a/jdk/src/share/classes/java/security/AccessController.java b/jdk/src/share/classes/java/security/AccessController.java
index 97383f5..4e790ff 100644
--- a/jdk/src/share/classes/java/security/AccessController.java
+++ b/jdk/src/share/classes/java/security/AccessController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -290,11 +290,11 @@
*/
public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) {
- DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext();
- if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
+ if (acc == null) {
return AccessController.doPrivileged(action);
}
+ DomainCombiner dc = acc.getAssignedCombiner();
return AccessController.doPrivileged(action, preserveCombiner(dc));
}
@@ -386,11 +386,11 @@
public static <T> T doPrivilegedWithCombiner
(PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
- DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext();
- if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
+ if (acc == null) {
return AccessController.doPrivileged(action);
}
+ DomainCombiner dc = acc.getAssignedCombiner();
return AccessController.doPrivileged(action, preserveCombiner(dc));
}
@@ -417,7 +417,12 @@
// perform 'combine' on the caller of doPrivileged,
// even if the caller is from the bootclasspath
ProtectionDomain[] pds = new ProtectionDomain[] {callerPd};
- return new AccessControlContext(combiner.combine(pds, null), combiner);
+ if (combiner == null) {
+ return new AccessControlContext(pds);
+ } else {
+ return new AccessControlContext(combiner.combine(pds, null),
+ combiner);
+ }
}
diff --git a/jdk/src/share/classes/java/sql/CallableStatement.java b/jdk/src/share/classes/java/sql/CallableStatement.java
index 460b028..2813b6c 100644
--- a/jdk/src/share/classes/java/sql/CallableStatement.java
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java
@@ -295,6 +295,7 @@
* or <code>getBigDecimal(String parameterName)</code>
* @see #setBigDecimal
*/
+ @Deprecated
BigDecimal getBigDecimal(int parameterIndex, int scale)
throws SQLException;
diff --git a/jdk/src/share/classes/java/sql/Date.java b/jdk/src/share/classes/java/sql/Date.java
index de39d14..5d6cd6b 100644
--- a/jdk/src/share/classes/java/sql/Date.java
+++ b/jdk/src/share/classes/java/sql/Date.java
@@ -51,6 +51,7 @@
* @param day 1 to 31
* @deprecated instead use the constructor <code>Date(long date)</code>
*/
+ @Deprecated
public Date(int year, int month, int day) {
super(year, month, day);
}
@@ -179,6 +180,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #setHours
*/
+ @Deprecated
public int getHours() {
throw new java.lang.IllegalArgumentException();
}
@@ -191,6 +193,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #setMinutes
*/
+ @Deprecated
public int getMinutes() {
throw new java.lang.IllegalArgumentException();
}
@@ -203,6 +206,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #setSeconds
*/
+ @Deprecated
public int getSeconds() {
throw new java.lang.IllegalArgumentException();
}
@@ -215,6 +219,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #getHours
*/
+ @Deprecated
public void setHours(int i) {
throw new java.lang.IllegalArgumentException();
}
@@ -227,6 +232,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #getMinutes
*/
+ @Deprecated
public void setMinutes(int i) {
throw new java.lang.IllegalArgumentException();
}
@@ -239,6 +245,7 @@
* @exception java.lang.IllegalArgumentException if this method is invoked
* @see #getSeconds
*/
+ @Deprecated
public void setSeconds(int i) {
throw new java.lang.IllegalArgumentException();
}
diff --git a/jdk/src/share/classes/java/sql/DriverManager.java b/jdk/src/share/classes/java/sql/DriverManager.java
index 819544a..4021fa2 100644
--- a/jdk/src/share/classes/java/sql/DriverManager.java
+++ b/jdk/src/share/classes/java/sql/DriverManager.java
@@ -412,13 +412,14 @@
* method throws a <code>java.lang.SecurityException</code>.
*
* @param out the new logging/tracing PrintStream; to disable, set to <code>null</code>
- * @deprecated
+ * @deprecated Use {@code setLogWriter}
* @throws SecurityException if a security manager exists and its
* <code>checkPermission</code> method denies setting the log stream
*
* @see SecurityManager#checkPermission
* @see #getLogStream
*/
+ @Deprecated
public static void setLogStream(java.io.PrintStream out) {
SecurityManager sec = System.getSecurityManager();
@@ -438,9 +439,10 @@
* and all drivers.
*
* @return the logging/tracing PrintStream; if disabled, is <code>null</code>
- * @deprecated
+ * @deprecated Use {@code getLogWriter}
* @see #setLogStream
*/
+ @Deprecated
public static java.io.PrintStream getLogStream() {
return logStream;
}
diff --git a/jdk/src/share/classes/java/sql/PreparedStatement.java b/jdk/src/share/classes/java/sql/PreparedStatement.java
index 8d6ca60..d67505f 100644
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java
+++ b/jdk/src/share/classes/java/sql/PreparedStatement.java
@@ -342,8 +342,9 @@
* this method is called on a closed <code>PreparedStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
- * @deprecated
+ * @deprecated Use {@code setCharacterStream}
*/
+ @Deprecated
void setUnicodeStream(int parameterIndex, java.io.InputStream x,
int length) throws SQLException;
diff --git a/jdk/src/share/classes/java/sql/ResultSet.java b/jdk/src/share/classes/java/sql/ResultSet.java
index fc4dbf6..3904a2e 100644
--- a/jdk/src/share/classes/java/sql/ResultSet.java
+++ b/jdk/src/share/classes/java/sql/ResultSet.java
@@ -356,8 +356,10 @@
* called on a closed result set
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
- * @deprecated
+ * @deprecated Use {@code getBigDecimal(int columnIndex)}
+ * or {@code getBigDecimal(String columnLabel)}
*/
+ @Deprecated
BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException;
/**
@@ -477,6 +479,7 @@
* @deprecated use <code>getCharacterStream</code> in place of
* <code>getUnicodeStream</code>
*/
+ @Deprecated
java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException;
/**
@@ -641,8 +644,10 @@
* called on a closed result set
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
- * @deprecated
+ * @deprecated Use {@code getBigDecimal(int columnIndex)}
+ * or {@code getBigDecimal(String columnLabel)}
*/
+ @Deprecated
BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException;
/**
@@ -760,6 +765,7 @@
* this method
* @deprecated use <code>getCharacterStream</code> instead
*/
+ @Deprecated
java.io.InputStream getUnicodeStream(String columnLabel) throws SQLException;
/**
diff --git a/jdk/src/share/classes/java/text/DateFormatSymbols.java b/jdk/src/share/classes/java/text/DateFormatSymbols.java
index 3e701b1..ee688ab 100644
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java
@@ -45,6 +45,7 @@
import java.text.spi.DateFormatSymbolsProvider;
import java.util.Arrays;
import java.util.Locale;
+import java.util.Objects;
import java.util.ResourceBundle;
import java.util.TimeZone;
import java.util.concurrent.ConcurrentHashMap;
@@ -366,6 +367,7 @@
*/
public void setEras(String[] newEras) {
eras = Arrays.copyOf(newEras, newEras.length);
+ cachedHashCode = 0;
}
/**
@@ -393,6 +395,7 @@
*/
public void setMonths(String[] newMonths) {
months = Arrays.copyOf(newMonths, newMonths.length);
+ cachedHashCode = 0;
}
/**
@@ -420,6 +423,7 @@
*/
public void setShortMonths(String[] newShortMonths) {
shortMonths = Arrays.copyOf(newShortMonths, newShortMonths.length);
+ cachedHashCode = 0;
}
/**
@@ -439,6 +443,7 @@
*/
public void setWeekdays(String[] newWeekdays) {
weekdays = Arrays.copyOf(newWeekdays, newWeekdays.length);
+ cachedHashCode = 0;
}
/**
@@ -458,6 +463,7 @@
*/
public void setShortWeekdays(String[] newShortWeekdays) {
shortWeekdays = Arrays.copyOf(newShortWeekdays, newShortWeekdays.length);
+ cachedHashCode = 0;
}
/**
@@ -474,6 +480,7 @@
*/
public void setAmPmStrings(String[] newAmpms) {
ampms = Arrays.copyOf(newAmpms, newAmpms.length);
+ cachedHashCode = 0;
}
/**
@@ -558,6 +565,7 @@
}
zoneStrings = aCopy;
isZoneStringsSet = true;
+ cachedHashCode = 0;
}
/**
@@ -576,6 +584,7 @@
public void setLocalPatternChars(String newLocalPatternChars) {
// Call toString() to throw an NPE in case the argument is null
localPatternChars = newLocalPatternChars.toString();
+ cachedHashCode = 0;
}
/**
@@ -597,12 +606,23 @@
* Override hashCode.
* Generates a hash code for the DateFormatSymbols object.
*/
+ @Override
public int hashCode() {
- int hashcode = 0;
- String[][] zoneStrings = getZoneStringsWrapper();
- for (int index = 0; index < zoneStrings[0].length; ++index)
- hashcode ^= zoneStrings[0][index].hashCode();
- return hashcode;
+ int hashCode = cachedHashCode;
+ if (hashCode == 0) {
+ hashCode = 5;
+ hashCode = 11 * hashCode + Arrays.hashCode(eras);
+ hashCode = 11 * hashCode + Arrays.hashCode(months);
+ hashCode = 11 * hashCode + Arrays.hashCode(shortMonths);
+ hashCode = 11 * hashCode + Arrays.hashCode(weekdays);
+ hashCode = 11 * hashCode + Arrays.hashCode(shortWeekdays);
+ hashCode = 11 * hashCode + Arrays.hashCode(ampms);
+ hashCode = 11 * hashCode + Arrays.deepHashCode(getZoneStringsWrapper());
+ hashCode = 11 * hashCode + Objects.hashCode(localPatternChars);
+ cachedHashCode = hashCode;
+ }
+
+ return hashCode;
}
/**
@@ -641,6 +661,11 @@
private transient int lastZoneIndex = 0;
+ /**
+ * Cached hash code
+ */
+ transient volatile int cachedHashCode = 0;
+
private void initializeData(Locale desiredLocale) {
locale = desiredLocale;
@@ -782,6 +807,7 @@
dst.zoneStrings = null;
}
dst.localPatternChars = src.localPatternChars;
+ dst.cachedHashCode = 0;
}
/**
diff --git a/jdk/src/share/classes/java/util/Hashtable.java b/jdk/src/share/classes/java/util/Hashtable.java
index f82c300..785b266 100644
--- a/jdk/src/share/classes/java/util/Hashtable.java
+++ b/jdk/src/share/classes/java/util/Hashtable.java
@@ -1059,7 +1059,7 @@
}
public int hashCode() {
- return hash ^ (value==null ? 0 : value.hashCode());
+ return (Objects.hashCode(key) ^ Objects.hashCode(value));
}
public String toString() {
diff --git a/jdk/src/share/classes/java/util/Properties.java b/jdk/src/share/classes/java/util/Properties.java
index c8bdab7..e084479 100644
--- a/jdk/src/share/classes/java/util/Properties.java
+++ b/jdk/src/share/classes/java/util/Properties.java
@@ -81,8 +81,9 @@
* <p> The {@link #loadFromXML(InputStream)} and {@link
* #storeToXML(OutputStream, String, String)} methods load and store properties
* in a simple XML format. By default the UTF-8 character encoding is used,
- * however a specific encoding may be specified if required. An XML properties
- * document has the following DOCTYPE declaration:
+ * however a specific encoding may be specified if required. Implementations
+ * are required to support UTF-8 and UTF-16 and may support other encodings.
+ * An XML properties document has the following DOCTYPE declaration:
*
* <pre>
* <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
@@ -853,23 +854,30 @@
* Furthermore, the document must satisfy the properties DTD described
* above.
*
+ * <p> An implementation is required to read XML documents that use the
+ * "{@code UTF-8}" or "{@code UTF-16}" encoding. An implementation may
+ * support additional encodings.
+ *
* <p>The specified stream is closed after this method returns.
*
* @param in the input stream from which to read the XML document.
* @throws IOException if reading from the specified input stream
* results in an <tt>IOException</tt>.
+ * @throws java.io.UnsupportedEncodingException if the document's encoding
+ * declaration can be read and it specifies an encoding that is not
+ * supported
* @throws InvalidPropertiesFormatException Data on input stream does not
* constitute a valid XML document with the mandated document type.
* @throws NullPointerException if {@code in} is null.
* @see #storeToXML(OutputStream, String, String)
+ * @see <a href="http://www.w3.org/TR/REC-xml/#charencoding">Character
+ * Encoding in Entities</a>
* @since 1.5
*/
public synchronized void loadFromXML(InputStream in)
throws IOException, InvalidPropertiesFormatException
{
- if (in == null)
- throw new NullPointerException();
- XmlSupport.load(this, in);
+ XmlSupport.load(this, Objects.requireNonNull(in));
in.close();
}
@@ -896,8 +904,6 @@
public void storeToXML(OutputStream os, String comment)
throws IOException
{
- if (os == null)
- throw new NullPointerException();
storeToXML(os, comment, "UTF-8");
}
@@ -910,9 +916,13 @@
* <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
* </pre>
*
- *<p>If the specified comment is {@code null} then no comment
+ * <p>If the specified comment is {@code null} then no comment
* will be stored in the document.
*
+ * <p> An implementation is required to support writing of XML documents
+ * that use the "{@code UTF-8}" or "{@code UTF-16}" encoding. An
+ * implementation may support additional encodings.
+ *
* <p>The specified stream remains open after this method returns.
*
* @param os the output stream on which to emit the XML document.
@@ -924,20 +934,23 @@
*
* @throws IOException if writing to the specified output stream
* results in an <tt>IOException</tt>.
+ * @throws java.io.UnsupportedEncodingException if the encoding is not
+ * supported by the implementation.
* @throws NullPointerException if {@code os} is {@code null},
* or if {@code encoding} is {@code null}.
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
* {@code Strings}.
* @see #loadFromXML(InputStream)
+ * @see <a href="http://www.w3.org/TR/REC-xml/#charencoding">Character
+ * Encoding in Entities</a>
* @since 1.5
*/
public void storeToXML(OutputStream os, String comment, String encoding)
throws IOException
{
- if (os == null)
- throw new NullPointerException();
- XmlSupport.save(this, os, comment, encoding);
+ XmlSupport.save(this, Objects.requireNonNull(os), comment,
+ Objects.requireNonNull(encoding));
}
/**
diff --git a/jdk/src/share/classes/java/util/ServiceLoader.java b/jdk/src/share/classes/java/util/ServiceLoader.java
index 067537a..01a5f44 100644
--- a/jdk/src/share/classes/java/util/ServiceLoader.java
+++ b/jdk/src/share/classes/java/util/ServiceLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -214,7 +214,7 @@
private ServiceLoader(Class<S> svc, ClassLoader cl) {
service = Objects.requireNonNull(svc, "Service interface cannot be null");
- loader = cl;
+ loader = (cl == null) ? ClassLoader.getSystemClassLoader() : cl;
reload();
}
@@ -358,14 +358,21 @@
}
String cn = nextName;
nextName = null;
+ Class<?> c = null;
try {
- S p = service.cast(Class.forName(cn, true, loader)
- .newInstance());
- providers.put(cn, p);
- return p;
+ c = Class.forName(cn, false, loader);
} catch (ClassNotFoundException x) {
fail(service,
"Provider " + cn + " not found");
+ }
+ if (!service.isAssignableFrom(c)) {
+ fail(service,
+ "Provider " + cn + " not a subtype");
+ }
+ try {
+ S p = service.cast(c.newInstance());
+ providers.put(cn, p);
+ return p;
} catch (Throwable x) {
fail(service,
"Provider " + cn + " could not be instantiated: " + x,
diff --git a/jdk/src/share/classes/java/util/TimeZone.java b/jdk/src/share/classes/java/util/TimeZone.java
index 648191a..13ede9c 100644
--- a/jdk/src/share/classes/java/util/TimeZone.java
+++ b/jdk/src/share/classes/java/util/TimeZone.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -719,15 +719,16 @@
* Returns the default TimeZone in an AppContext if any AppContext
* has ever used. null is returned if any AppContext hasn't been
* used or if the AppContext doesn't have the default TimeZone.
+ *
+ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+ * been loaded. If so, it implies that AWTSecurityManager is not our
+ * SecurityManager and we can use a local static variable.
+ * This works around a build time issue.
*/
- private synchronized static TimeZone getDefaultInAppContext() {
+ private static TimeZone getDefaultInAppContext() {
// JavaAWTAccess provides access implementation-private methods without using reflection.
JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
- // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
- // been loaded. If so, it implies that AWTSecurityManager is not our
- // SecurityManager and we can use a local static variable.
- // This works around a build time issue.
if (javaAWTAccess == null) {
return mainAppContextDefault;
} else {
@@ -749,15 +750,16 @@
* tz. null is handled special: do nothing if any AppContext
* hasn't been used, remove the default TimeZone in the
* AppContext otherwise.
+ *
+ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+ * been loaded. If so, it implies that AWTSecurityManager is not our
+ * SecurityManager and we can use a local static variable.
+ * This works around a build time issue.
*/
- private synchronized static void setDefaultInAppContext(TimeZone tz) {
+ private static void setDefaultInAppContext(TimeZone tz) {
// JavaAWTAccess provides access implementation-private methods without using reflection.
JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
- // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
- // been loaded. If so, it implies that AWTSecurityManager is not our
- // SecurityManager and we can use a local static variable.
- // This works around a build time issue.
if (javaAWTAccess == null) {
mainAppContextDefault = tz;
} else {
@@ -822,7 +824,7 @@
private static final int GMT_ID_LENGTH = 3;
// a static TimeZone we can reference if no AppContext is in place
- private static TimeZone mainAppContextDefault;
+ private static volatile TimeZone mainAppContextDefault;
/**
* Parses a custom time zone identifier and returns a corresponding zone.
diff --git a/jdk/src/share/classes/java/util/concurrent/Executors.java b/jdk/src/share/classes/java/util/concurrent/Executors.java
index 4ff7141..78708f8 100644
--- a/jdk/src/share/classes/java/util/concurrent/Executors.java
+++ b/jdk/src/share/classes/java/util/concurrent/Executors.java
@@ -530,18 +530,17 @@
return AccessController.doPrivileged(
new PrivilegedExceptionAction<T>() {
public T run() throws Exception {
- ClassLoader savedcl = null;
Thread t = Thread.currentThread();
- try {
- ClassLoader cl = t.getContextClassLoader();
- if (ccl != cl) {
- t.setContextClassLoader(ccl);
- savedcl = cl;
- }
+ ClassLoader cl = t.getContextClassLoader();
+ if (ccl == cl) {
return task.call();
- } finally {
- if (savedcl != null)
- t.setContextClassLoader(savedcl);
+ } else {
+ t.setContextClassLoader(ccl);
+ try {
+ return task.call();
+ } finally {
+ t.setContextClassLoader(cl);
+ }
}
}
}, acc);
diff --git a/jdk/src/share/classes/java/util/jar/Pack200.java b/jdk/src/share/classes/java/util/jar/Pack200.java
index 0f28a14..6f244f3 100644
--- a/jdk/src/share/classes/java/util/jar/Pack200.java
+++ b/jdk/src/share/classes/java/util/jar/Pack200.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003,2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -456,12 +456,12 @@
* The unpacker's progress as a percentage, as periodically
* updated by the unpacker.
* Values of 0 - 100 are normal, and -1 indicates a stall.
- * Observe this property with a {@link PropertyChangeListener}.
+ * Progress can be monitored by polling the value of this
+ * property.
* <p>
* At a minimum, the unpacker must set progress to 0
* at the beginning of a packing operation, and to 100
* at the end.
- * @see #addPropertyChangeListener
*/
String PROGRESS = "pack.progress";
@@ -577,7 +577,15 @@
* @see #properties
* @see #PROGRESS
* @param listener An object to be invoked when a property is changed.
+ * @deprecated The dependency on {@code PropertyChangeListener} creates
+ * a significant impediment to future modularization of the
+ * Java platform. This method will be removed in a future
+ * release.
+ * Applications that need to monitor progress of the packer
+ * can poll the value of the {@link #PROGRESS PROGRESS}
+ * property instead.
*/
+ @Deprecated
void addPropertyChangeListener(PropertyChangeListener listener) ;
/**
@@ -586,7 +594,12 @@
*
* @see #addPropertyChangeListener
* @param listener The PropertyChange listener to be removed.
+ * @deprecated The dependency on {@code PropertyChangeListener} creates
+ * a significant impediment to future modularization of the
+ * Java platform. This method will be removed in a future
+ * release.
*/
+ @Deprecated
void removePropertyChangeListener(PropertyChangeListener listener);
}
@@ -640,12 +653,12 @@
* The unpacker's progress as a percentage, as periodically
* updated by the unpacker.
* Values of 0 - 100 are normal, and -1 indicates a stall.
- * Observe this property with a {@link PropertyChangeListener}.
+ * Progress can be monitored by polling the value of this
+ * property.
* <p>
* At a minimum, the unpacker must set progress to 0
* at the beginning of a packing operation, and to 100
* at the end.
- * @see #addPropertyChangeListener
*/
String PROGRESS = "unpack.progress";
@@ -708,7 +721,15 @@
* @see #properties
* @see #PROGRESS
* @param listener An object to be invoked when a property is changed.
+ * @deprecated The dependency on {@code PropertyChangeListener} creates
+ * a significant impediment to future modularization of the
+ * Java platform. This method will be removed in a future
+ * release.
+ * Applications that need to monitor progress of the
+ * unpacker can poll the value of the {@link #PROGRESS
+ * PROGRESS} property instead.
*/
+ @Deprecated
void addPropertyChangeListener(PropertyChangeListener listener) ;
/**
@@ -717,7 +738,12 @@
*
* @see #addPropertyChangeListener
* @param listener The PropertyChange listener to be removed.
+ * @deprecated The dependency on {@code PropertyChangeListener} creates
+ * a significant impediment to future modularization of the
+ * Java platform. This method will be removed in a future
+ * release.
*/
+ @Deprecated
void removePropertyChangeListener(PropertyChangeListener listener);
}
diff --git a/jdk/src/share/classes/java/util/logging/FileHandler.java b/jdk/src/share/classes/java/util/logging/FileHandler.java
index fb3b67c..b9a5d73 100644
--- a/jdk/src/share/classes/java/util/logging/FileHandler.java
+++ b/jdk/src/share/classes/java/util/logging/FileHandler.java
@@ -220,7 +220,7 @@
* @exception NullPointerException if pattern property is an empty String.
*/
public FileHandler() throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
configure();
openFiles();
}
@@ -246,7 +246,7 @@
if (pattern.length() < 1 ) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = 0;
@@ -278,7 +278,7 @@
if (pattern.length() < 1 ) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = 0;
@@ -315,7 +315,7 @@
if (limit < 0 || count < 1 || pattern.length() < 1) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = limit;
@@ -354,7 +354,7 @@
if (limit < 0 || count < 1 || pattern.length() < 1) {
throw new IllegalArgumentException();
}
- checkAccess();
+ checkPermission();
configure();
this.pattern = pattern;
this.limit = limit;
@@ -367,7 +367,7 @@
// configured instance variables.
private void openFiles() throws IOException {
LogManager manager = LogManager.getLogManager();
- manager.checkAccess();
+ manager.checkPermission();
if (count < 1) {
throw new IllegalArgumentException("file count = " + count);
}
diff --git a/jdk/src/share/classes/java/util/logging/Handler.java b/jdk/src/share/classes/java/util/logging/Handler.java
index 1317b57..fd04c2c 100644
--- a/jdk/src/share/classes/java/util/logging/Handler.java
+++ b/jdk/src/share/classes/java/util/logging/Handler.java
@@ -111,7 +111,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setFormatter(Formatter newFormatter) throws SecurityException {
- checkAccess();
+ checkPermission();
// Check for a null pointer:
newFormatter.getClass();
formatter = newFormatter;
@@ -140,7 +140,7 @@
*/
public void setEncoding(String encoding)
throws SecurityException, java.io.UnsupportedEncodingException {
- checkAccess();
+ checkPermission();
if (encoding != null) {
try {
if(!java.nio.charset.Charset.isSupported(encoding)) {
@@ -175,7 +175,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setFilter(Filter newFilter) throws SecurityException {
- checkAccess();
+ checkPermission();
filter = newFilter;
}
@@ -199,7 +199,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public void setErrorManager(ErrorManager em) {
- checkAccess();
+ checkPermission();
if (em == null) {
throw new NullPointerException();
}
@@ -213,7 +213,7 @@
* the caller does not have <tt>LoggingPermission("control")</tt>.
*/
public ErrorManager getErrorManager() {
- checkAccess();
+ checkPermission();
return errorManager;
}
@@ -253,7 +253,7 @@
if (newLevel == null) {
throw new NullPointerException();
}
- checkAccess();
+ checkPermission();
logLevel = newLevel;
}
@@ -296,9 +296,9 @@
// If "sealed" is true, we check that the caller has
// appropriate security privileges to update Handler
// state and if not throw a SecurityException.
- void checkAccess() throws SecurityException {
+ void checkPermission() throws SecurityException {
if (sealed) {
- manager.checkAccess();
+ manager.checkPermission();
}
}
}
diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index 24f61b4..a100eb9 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -311,10 +311,17 @@
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
* @exception NullPointerException if the PropertyChangeListener is null.
+ * @deprecated The dependency on {@code PropertyChangeListener} creates a
+ * significant impediment to future modularization of the Java
+ * platform. This method will be removed in a future release.
+ * The global {@code LogManager} can detect changes to the
+ * logging configuration by overridding the {@link
+ * #readConfiguration readConfiguration} method.
*/
+ @Deprecated
public void addPropertyChangeListener(PropertyChangeListener l) throws SecurityException {
PropertyChangeListener listener = Objects.requireNonNull(l);
- checkAccess();
+ checkPermission();
synchronized (listenerMap) {
// increment the registration count if already registered
Integer value = listenerMap.get(listener);
@@ -336,9 +343,16 @@
* @param l event listener (can be null)
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
+ * @deprecated The dependency on {@code PropertyChangeListener} creates a
+ * significant impediment to future modularization of the Java
+ * platform. This method will be removed in a future release.
+ * The global {@code LogManager} can detect changes to the
+ * logging configuration by overridding the {@link
+ * #readConfiguration readConfiguration} method.
*/
+ @Deprecated
public void removePropertyChangeListener(PropertyChangeListener l) throws SecurityException {
- checkAccess();
+ checkPermission();
if (l != null) {
PropertyChangeListener listener = l;
synchronized (listenerMap) {
@@ -793,7 +807,7 @@
* @exception IOException if there are IO problems reading the configuration.
*/
public void readConfiguration() throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
// if a configuration class is specified, load it and use it.
String cname = System.getProperty("java.util.logging.config.class");
@@ -851,7 +865,7 @@
*/
public void reset() throws SecurityException {
- checkAccess();
+ checkPermission();
synchronized (this) {
props = new Properties();
// Since we are doing a reset we no longer want to initialize
@@ -936,7 +950,7 @@
* @exception IOException if there are problems reading from the stream.
*/
public void readConfiguration(InputStream ins) throws IOException, SecurityException {
- checkAccess();
+ checkPermission();
reset();
// Load the properties
@@ -1113,8 +1127,13 @@
loadLoggerHandlers(rootLogger, null, "handlers");
}
+ private final Permission controlPermission = new LoggingPermission("control", null);
- private Permission ourPermission = new LoggingPermission("control", null);
+ void checkPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(controlPermission);
+ }
/**
* Check that the current context is trusted to modify the logging
@@ -1127,11 +1146,7 @@
* the caller does not have LoggingPermission("control").
*/
public void checkAccess() throws SecurityException {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null) {
- return;
- }
- sm.checkPermission(ourPermission);
+ checkPermission();
}
// Nested class to represent a node in our tree of named loggers.
diff --git a/jdk/src/share/classes/java/util/logging/Logger.java b/jdk/src/share/classes/java/util/logging/Logger.java
index aebf63e..f1d6f72 100644
--- a/jdk/src/share/classes/java/util/logging/Logger.java
+++ b/jdk/src/share/classes/java/util/logging/Logger.java
@@ -276,13 +276,13 @@
this.manager = manager;
}
- private void checkAccess() throws SecurityException {
+ private void checkPermission() throws SecurityException {
if (!anonymous) {
if (manager == null) {
// Complete initialization of the global Logger.
manager = LogManager.getLogManager();
}
- manager.checkAccess();
+ manager.checkPermission();
}
}
@@ -482,7 +482,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setFilter(Filter newFilter) throws SecurityException {
- checkAccess();
+ checkPermission();
filter = newFilter;
}
@@ -1168,7 +1168,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setLevel(Level newLevel) throws SecurityException {
- checkAccess();
+ checkPermission();
synchronized (treeLock) {
levelObject = newLevel;
updateEffectiveLevel();
@@ -1223,7 +1223,7 @@
public void addHandler(Handler handler) throws SecurityException {
// Check for null handler
handler.getClass();
- checkAccess();
+ checkPermission();
handlers.add(handler);
}
@@ -1237,7 +1237,7 @@
* the caller does not have LoggingPermission("control").
*/
public void removeHandler(Handler handler) throws SecurityException {
- checkAccess();
+ checkPermission();
if (handler == null) {
return;
}
@@ -1265,7 +1265,7 @@
* the caller does not have LoggingPermission("control").
*/
public void setUseParentHandlers(boolean useParentHandlers) {
- checkAccess();
+ checkPermission();
this.useParentHandlers = useParentHandlers;
}
@@ -1420,7 +1420,7 @@
if (parent == null) {
throw new NullPointerException();
}
- manager.checkAccess();
+ manager.checkPermission();
doSetParent(parent);
}
diff --git a/jdk/src/share/classes/java/util/logging/MemoryHandler.java b/jdk/src/share/classes/java/util/logging/MemoryHandler.java
index 2c29730..06c0930 100644
--- a/jdk/src/share/classes/java/util/logging/MemoryHandler.java
+++ b/jdk/src/share/classes/java/util/logging/MemoryHandler.java
@@ -238,7 +238,7 @@
throw new NullPointerException();
}
LogManager manager = LogManager.getLogManager();
- checkAccess();
+ checkPermission();
pushLevel = newLevel;
}
diff --git a/jdk/src/share/classes/java/util/logging/StreamHandler.java b/jdk/src/share/classes/java/util/logging/StreamHandler.java
index 9ed9e57..f6407ec 100644
--- a/jdk/src/share/classes/java/util/logging/StreamHandler.java
+++ b/jdk/src/share/classes/java/util/logging/StreamHandler.java
@@ -249,7 +249,7 @@
}
private synchronized void flushAndClose() throws SecurityException {
- checkAccess();
+ checkPermission();
if (writer != null) {
try {
if (!doneHeader) {
diff --git a/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java b/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java
index 57b4b46..0680479 100644
--- a/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java
+++ b/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java
@@ -1245,13 +1245,12 @@
return s.substring(1, s.length() - 1);
}
final String className = s.substring(1, slash);
+
final Constructor<?> constr;
try {
+ ReflectUtil.checkPackageAccess(className);
final ClassLoader contextClassLoader =
Thread.currentThread().getContextClassLoader();
- if (contextClassLoader == null) {
- ReflectUtil.checkPackageAccess(className);
- }
final Class<?> c =
Class.forName(className, false, contextClassLoader);
constr = c.getConstructor(new Class<?>[] {String.class});
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
index f322af0..3f880d0 100644
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -25,6 +25,30 @@
package javax.management.remote.rmi;
+import java.io.IOException;
+import java.rmi.MarshalledObject;
+import java.rmi.UnmarshalException;
+import java.rmi.server.Unreferenced;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.*;
+import javax.management.remote.JMXServerErrorException;
+import javax.management.remote.NotificationResult;
+import javax.management.remote.TargetedNotification;
+import javax.security.auth.Subject;
+
import static com.sun.jmx.mbeanserver.Util.cast;
import com.sun.jmx.remote.internal.ServerCommunicatorAdmin;
import com.sun.jmx.remote.internal.ServerNotifForwarder;
@@ -35,44 +59,6 @@
import com.sun.jmx.remote.util.EnvHelp;
import com.sun.jmx.remote.util.OrderClassLoaders;
-import java.io.IOException;
-import java.rmi.MarshalledObject;
-import java.rmi.UnmarshalException;
-import java.rmi.server.Unreferenced;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.NotCompliantMBeanException;
-import javax.management.NotificationFilter;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.QueryExp;
-import javax.management.ReflectionException;
-import javax.management.RuntimeOperationsException;
-import javax.management.remote.JMXServerErrorException;
-import javax.management.remote.NotificationResult;
-import javax.management.remote.TargetedNotification;
-import javax.security.auth.Subject;
-
/**
* <p>Implementation of the {@link RMIConnection} interface. User
* code will not usually reference this class.</p>
@@ -143,6 +129,7 @@
this.mbeanServer = rmiServer.getMBeanServer();
final ClassLoader dcl = defaultClassLoader;
+
this.classLoaderWithRepository =
AccessController.doPrivileged(
new PrivilegedAction<ClassLoaderWithRepository>() {
@@ -151,13 +138,40 @@
mbeanServer.getClassLoaderRepository(),
dcl);
}
+ },
+
+ withPermissions( new MBeanPermission("*", "getClassLoaderRepository"),
+ new RuntimePermission("createClassLoader"))
+ );
+
+
+ this.defaultContextClassLoader =
+ AccessController.doPrivileged(
+ new PrivilegedAction<ClassLoader>() {
+ @Override
+ public ClassLoader run() {
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ dcl);
+ }
});
+
serverCommunicatorAdmin = new
RMIServerCommunicatorAdmin(EnvHelp.getServerConnectionTimeout(env));
this.env = env;
}
+ private static AccessControlContext withPermissions(Permission ... perms){
+ Permissions col = new Permissions();
+
+ for (Permission thePerm : perms ) {
+ col.add(thePerm);
+ }
+
+ final ProtectionDomain pd = new ProtectionDomain(null, col);
+ return new AccessControlContext( new ProtectionDomain[] { pd });
+ }
+
private synchronized ServerNotifForwarder getServerNotifFwd() {
// Lazily created when first use. Mainly when
// addNotificationListener is first called.
@@ -507,7 +521,7 @@
"connectionId=" + connectionId
+" unwrapping query with defaultClassLoader.");
- queryValue = unwrap(query, defaultClassLoader, QueryExp.class);
+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class);
try {
final Object params[] = new Object[] { name, queryValue };
@@ -542,7 +556,7 @@
"connectionId=" + connectionId
+" unwrapping query with defaultClassLoader.");
- queryValue = unwrap(query, defaultClassLoader, QueryExp.class);
+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class);
try {
final Object params[] = new Object[] { name, queryValue };
@@ -1330,7 +1344,9 @@
public ClassLoader run() throws InstanceNotFoundException {
return mbeanServer.getClassLoader(name);
}
- });
+ },
+ withPermissions(new MBeanPermission("*", "getClassLoader"))
+ );
} catch (PrivilegedActionException pe) {
throw (InstanceNotFoundException) extractException(pe);
}
@@ -1345,7 +1361,9 @@
public Object run() throws InstanceNotFoundException {
return mbeanServer.getClassLoaderFor(name);
}
- });
+ },
+ withPermissions(new MBeanPermission("*", "getClassLoaderFor"))
+ );
} catch (PrivilegedActionException pe) {
throw (InstanceNotFoundException) extractException(pe);
}
@@ -1572,7 +1590,8 @@
ClassLoader orderCL = AccessController.doPrivileged(
new PrivilegedExceptionAction<ClassLoader>() {
public ClassLoader run() throws Exception {
- return new OrderClassLoaders(cl1, cl2);
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ new OrderClassLoaders(cl1, cl2));
}
}
);
@@ -1664,6 +1683,8 @@
private final ClassLoader defaultClassLoader;
+ private final ClassLoader defaultContextClassLoader;
+
private final ClassLoaderWithRepository classLoaderWithRepository;
private boolean terminated = false;
@@ -1746,4 +1767,43 @@
private static final ClassLogger logger =
new ClassLogger("javax.management.remote.rmi", "RMIConnectionImpl");
+
+ private static final class CombinedClassLoader extends ClassLoader {
+
+ private final static class ClassLoaderWrapper extends ClassLoader {
+ ClassLoaderWrapper(ClassLoader cl) {
+ super(cl);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ return super.loadClass(name, resolve);
+ }
+ };
+
+ final ClassLoaderWrapper defaultCL;
+
+ private CombinedClassLoader(ClassLoader parent, ClassLoader defaultCL) {
+ super(parent);
+ this.defaultCL = new ClassLoaderWrapper(defaultCL);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ try {
+ super.loadClass(name, resolve);
+ } catch(Exception e) {
+ for(Throwable t = e; t != null; t = t.getCause()) {
+ if(t instanceof SecurityException) {
+ throw t==e?(SecurityException)t:new SecurityException(t.getMessage(), e);
+ }
+ }
+ }
+ final Class<?> cl = defaultCL.loadClass(name, resolve);
+ return cl;
+ }
+
+ }
}
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
index f5359f9..f6d17d6 100644
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
@@ -277,9 +277,9 @@
// Check for secure RMIServer stub if the corresponding
// client-side environment property is set to "true".
//
- boolean checkStub = EnvHelp.computeBooleanFromString(
- usemap,
- "jmx.remote.x.check.stub",false);
+ String stringBoolean = (String) usemap.get("jmx.remote.x.check.stub");
+ boolean checkStub = EnvHelp.computeBooleanFromString(stringBoolean);
+
if (checkStub) checkStub(stub, rmiServerImplStubClass);
// Connect IIOP Stub if needed.
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
index 909b9cb..da92f49 100644
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
@@ -412,9 +412,8 @@
if (tracing)
logger.trace("start", "Using external directory: " + jndiUrl);
- final boolean rebind = EnvHelp.computeBooleanFromString(
- attributes,
- JNDI_REBIND_ATTRIBUTE,false);
+ String stringBoolean = (String) attributes.get(JNDI_REBIND_ATTRIBUTE);
+ final boolean rebind = EnvHelp.computeBooleanFromString( stringBoolean );
if (tracing)
logger.trace("start", JNDI_REBIND_ATTRIBUTE + "=" + rebind);
diff --git a/jdk/src/share/classes/javax/management/timer/Timer.java b/jdk/src/share/classes/javax/management/timer/Timer.java
index 2516de5..aafd0ab 100644
--- a/jdk/src/share/classes/javax/management/timer/Timer.java
+++ b/jdk/src/share/classes/javax/management/timer/Timer.java
@@ -28,8 +28,7 @@
import static com.sun.jmx.defaults.JmxProperties.TIMER_LOGGER;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -128,8 +127,8 @@
* Table containing all the timer notifications of this timer,
* with the associated date, period and number of occurrences.
*/
- private Map<Integer,Object[]> timerTable =
- new Hashtable<Integer,Object[]>();
+ final private Map<Integer,Object[]> timerTable =
+ new HashMap<>();
/**
* Past notifications sending on/off flag value.
@@ -163,7 +162,7 @@
* The notification counter ID.
* Used to keep the max key value inserted into the timer table.
*/
- private int counterID = 0;
+ volatile private int counterID = 0;
private java.util.Timer timer;
@@ -776,7 +775,7 @@
*
* @return The number of timer notifications.
*/
- public int getNbNotifications() {
+ public synchronized int getNbNotifications() {
return timerTable.size();
}
@@ -824,7 +823,7 @@
* @return The timer notification type or null if the identifier is not mapped to any
* timer notification registered for this timer MBean.
*/
- public String getNotificationType(Integer id) {
+ public synchronized String getNotificationType(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -841,7 +840,7 @@
* @return The timer notification detailed message or null if the identifier is not mapped to any
* timer notification registered for this timer MBean.
*/
- public String getNotificationMessage(Integer id) {
+ public synchronized String getNotificationMessage(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -862,7 +861,7 @@
//public Serializable getNotificationUserData(Integer id) {
// end of NPCTE fix for bugId 4464388
- public Object getNotificationUserData(Integer id) {
+ public synchronized Object getNotificationUserData(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
return ( ((TimerNotification)obj[TIMER_NOTIF_INDEX]).getUserData() );
@@ -878,7 +877,7 @@
* @return A copy of the date or null if the identifier is not mapped to any
* timer notification registered for this timer MBean.
*/
- public Date getDate(Integer id) {
+ public synchronized Date getDate(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -896,7 +895,7 @@
* @return A copy of the period or null if the identifier is not mapped to any
* timer notification registered for this timer MBean.
*/
- public Long getPeriod(Integer id) {
+ public synchronized Long getPeriod(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -913,7 +912,7 @@
* @return A copy of the remaining number of occurrences or null if the identifier is not mapped to any
* timer notification registered for this timer MBean.
*/
- public Long getNbOccurences(Integer id) {
+ public synchronized Long getNbOccurences(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -931,7 +930,7 @@
* @return A copy of the flag indicating whether a periodic notification is
* executed at <i>fixed-delay</i> or at <i>fixed-rate</i>.
*/
- public Boolean getFixedRate(Integer id) {
+ public synchronized Boolean getFixedRate(Integer id) {
Object[] obj = timerTable.get(id);
if (obj != null) {
@@ -982,7 +981,7 @@
*
* @return <CODE>true</CODE> if the list of timer notifications is empty, <CODE>false</CODE> otherwise.
*/
- public boolean isEmpty() {
+ public synchronized boolean isEmpty() {
return (timerTable.isEmpty());
}
@@ -1184,11 +1183,13 @@
//
TimerAlarmClock alarmClock = (TimerAlarmClock)notification.getSource();
- for (Object[] obj : timerTable.values()) {
- if (obj[ALARM_CLOCK_INDEX] == alarmClock) {
- timerNotification = (TimerNotification)obj[TIMER_NOTIF_INDEX];
- timerDate = (Date)obj[TIMER_DATE_INDEX];
- break;
+ synchronized(Timer.this) {
+ for (Object[] obj : timerTable.values()) {
+ if (obj[ALARM_CLOCK_INDEX] == alarmClock) {
+ timerNotification = (TimerNotification)obj[TIMER_NOTIF_INDEX];
+ timerDate = (Date)obj[TIMER_DATE_INDEX];
+ break;
+ }
}
}
diff --git a/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java b/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
index 8afd963..70f98ce 100644
--- a/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
+++ b/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
@@ -25,6 +25,8 @@
package javax.net.ssl;
+import java.util.List;
+
/**
* Extends the <code>SSLSession</code> interface to support additional
* session attributes.
@@ -83,4 +85,34 @@
* @see X509ExtendedKeyManager
*/
public abstract String[] getPeerSupportedSignatureAlgorithms();
+
+ /**
+ * Obtains a {@link List} containing all {@link SNIServerName}s
+ * of the requested Server Name Indication (SNI) extension.
+ * <P>
+ * In server mode, unless the return {@link List} is empty,
+ * the server should use the requested server names to guide its
+ * selection of an appropriate authentication certificate, and/or
+ * other aspects of security policy.
+ * <P>
+ * In client mode, unless the return {@link List} is empty,
+ * the client should use the requested server names to guide its
+ * endpoint identification of the peer's identity, and/or
+ * other aspects of security policy.
+ *
+ * @return a non-null immutable list of {@link SNIServerName}s of the
+ * requested server name indications. The returned list may be
+ * empty if no server name indications were requested.
+ * @throws UnsupportedOperationException if the underlying provider
+ * does not implement the operation
+ *
+ * @see SNIServerName
+ * @see X509ExtendedTrustManager
+ * @see X509ExtendedKeyManager
+ *
+ * @since 1.8
+ */
+ public List<SNIServerName> getRequestedServerNames() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
index b9fe920..39e802c 100644
--- a/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -186,8 +186,7 @@
// if the provider does not support it, fallback to peer certs.
// return the X500Principal of the end-entity cert.
Certificate[] certs = getPeerCertificates();
- principal = (X500Principal)
- ((X509Certificate)certs[0]).getSubjectX500Principal();
+ principal = ((X509Certificate)certs[0]).getSubjectX500Principal();
}
return principal;
}
@@ -216,7 +215,7 @@
// return the X500Principal of the end-entity cert.
Certificate[] certs = getLocalCertificates();
if (certs != null) {
- principal = (X500Principal)
+ principal =
((X509Certificate)certs[0]).getSubjectX500Principal();
}
}
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIHostName.java b/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
new file mode 100644
index 0000000..6f2092c
--- /dev/null
+++ b/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package javax.net.ssl;
+
+import java.net.IDN;
+import java.nio.ByteBuffer;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharacterCodingException;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+/**
+ * Instances of this class represent a server name of type
+ * {@link StandardConstants#SNI_HOST_NAME host_name} in a Server Name
+ * Indication (SNI) extension.
+ * <P>
+ * As described in section 3, "Server Name Indication", of
+ * <A HREF="http://www.ietf.org/rfc/rfc6066.txt">TLS Extensions (RFC 6066)</A>,
+ * "HostName" contains the fully qualified DNS hostname of the server, as
+ * understood by the client. The encoded server name value of a hostname is
+ * represented as a byte string using ASCII encoding without a trailing dot.
+ * This allows the support of Internationalized Domain Names (IDN) through
+ * the use of A-labels (the ASCII-Compatible Encoding (ACE) form of a valid
+ * string of Internationalized Domain Names for Applications (IDNA)) defined
+ * in <A HREF="http://www.ietf.org/rfc/rfc5890.txt">RFC 5890</A>.
+ * <P>
+ * Note that {@code SNIHostName} objects are immutable.
+ *
+ * @see SNIServerName
+ * @see StandardConstants#SNI_HOST_NAME
+ *
+ * @since 1.8
+ */
+public final class SNIHostName extends SNIServerName {
+
+ // the decoded string value of the server name
+ private final String hostname;
+
+ /**
+ * Creates an {@code SNIHostName} using the specified hostname.
+ * <P>
+ * Note that per <A HREF="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</A>,
+ * the encoded server name value of a hostname is
+ * {@link StandardCharsets#US_ASCII}-compliant. In this method,
+ * {@code hostname} can be a user-friendly Internationalized Domain Name
+ * (IDN). {@link IDN#toASCII(String, int)} is used to enforce the
+ * restrictions on ASCII characters in hostnames (see
+ * <A HREF="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</A>,
+ * <A HREF="http://www.ietf.org/rfc/rfc1122.txt">RFC 1122</A>,
+ * <A HREF="http://www.ietf.org/rfc/rfc1123.txt">RFC 1123</A>) and
+ * translate the {@code hostname} into ASCII Compatible Encoding (ACE), as:
+ * <pre>
+ * IDN.toASCII(hostname, IDN.USE_STD3_ASCII_RULES);
+ * </pre>
+ * <P>
+ * The {@code hostname} argument is illegal if it:
+ * <ul>
+ * <li> {@code hostname} is empty,</li>
+ * <li> {@code hostname} ends with a trailing dot,</li>
+ * <li> {@code hostname} is not a valid Internationalized
+ * Domain Name (IDN) compliant with the RFC 3490 specification.</li>
+ * </ul>
+ * @param hostname
+ * the hostname of this server name
+ *
+ * @throws NullPointerException if {@code hostname} is {@code null}
+ * @throws IllegalArgumentException if {@code hostname} is illegal
+ */
+ public SNIHostName(String hostname) {
+ // IllegalArgumentException will be thrown if {@code hostname} is
+ // not a valid IDN.
+ super(StandardConstants.SNI_HOST_NAME,
+ (hostname = IDN.toASCII(
+ Objects.requireNonNull(hostname,
+ "Server name value of host_name cannot be null"),
+ IDN.USE_STD3_ASCII_RULES))
+ .getBytes(StandardCharsets.US_ASCII));
+
+ this.hostname = hostname;
+
+ // check the validity of the string hostname
+ checkHostName();
+ }
+
+ /**
+ * Creates an {@code SNIHostName} using the specified encoded value.
+ * <P>
+ * This method is normally used to parse the encoded name value in a
+ * requested SNI extension.
+ * <P>
+ * Per <A HREF="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</A>,
+ * the encoded name value of a hostname is
+ * {@link StandardCharsets#US_ASCII}-compliant. However, in the previous
+ * version of the SNI extension (
+ * <A HREF="http://www.ietf.org/rfc/rfc4366.txt">RFC 4366</A>),
+ * the encoded hostname is represented as a byte string using UTF-8
+ * encoding. For the purpose of version tolerance, this method allows
+ * that the charset of {@code encoded} argument can be
+ * {@link StandardCharsets#UTF_8}, as well as
+ * {@link StandardCharsets#US_ASCII}. {@link IDN#toASCII(String)} is used
+ * to translate the {@code encoded} argument into ASCII Compatible
+ * Encoding (ACE) hostname.
+ * <P>
+ * It is strongly recommended that this constructor is only used to parse
+ * the encoded name value in a requested SNI extension. Otherwise, to
+ * comply with <A HREF="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</A>,
+ * please always use {@link StandardCharsets#US_ASCII}-compliant charset
+ * and enforce the restrictions on ASCII characters in hostnames (see
+ * <A HREF="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</A>,
+ * <A HREF="http://www.ietf.org/rfc/rfc1122.txt">RFC 1122</A>,
+ * <A HREF="http://www.ietf.org/rfc/rfc1123.txt">RFC 1123</A>)
+ * for {@code encoded} argument, or use {@link SNIHostName(String)} instead.
+ * <P>
+ * The {@code encoded} argument is illegal if it:
+ * <ul>
+ * <li> {@code encoded} is empty,</li>
+ * <li> {@code encoded} ends with a trailing dot,</li>
+ * <li> {@code encoded} is not encoded in
+ * {@link StandardCharsets#US_ASCII} or
+ * {@link StandardCharsets#UTF_8}-compliant charset,</li>
+ * <li> {@code encoded} is not a valid Internationalized
+ * Domain Name (IDN) compliant with the RFC 3490 specification.</li>
+ * </ul>
+ *
+ * <P>
+ * Note that the {@code encoded} byte array is cloned
+ * to protect against subsequent modification.
+ *
+ * @param encoded
+ * the encoded hostname of this server name
+ *
+ * @throws NullPointerException if {@code encoded} is {@code null}
+ * @throws IllegalArgumentException if {@code encoded} is illegal
+ */
+ public SNIHostName(byte[] encoded) {
+ // NullPointerException will be thrown if {@code encoded} is null
+ super(StandardConstants.SNI_HOST_NAME, encoded);
+
+ // Compliance: RFC 4366 requires that the hostname is represented
+ // as a byte string using UTF_8 encoding [UTF8]
+ try {
+ // Please don't use {@link String} constructors because they
+ // do not report coding errors.
+ CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder()
+ .onMalformedInput(CodingErrorAction.REPORT)
+ .onUnmappableCharacter(CodingErrorAction.REPORT);
+
+ this.hostname = IDN.toASCII(
+ decoder.decode(ByteBuffer.wrap(encoded)).toString());
+ } catch (RuntimeException | CharacterCodingException e) {
+ throw new IllegalArgumentException(
+ "The encoded server name value is invalid", e);
+ }
+
+ // check the validity of the string hostname
+ checkHostName();
+ }
+
+ /**
+ * Returns the {@link StandardCharsets#US_ASCII}-compliant hostname of
+ * this {@code SNIHostName} object.
+ * <P>
+ * Note that, per
+ * <A HREF="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</A>, the
+ * returned hostname may be an internationalized domain name that
+ * contains A-labels. See
+ * <A HREF="http://www.ietf.org/rfc/rfc5890.txt">RFC 5890</A>
+ * for more information about the detailed A-label specification.
+ *
+ * @return the {@link StandardCharsets#US_ASCII}-compliant hostname
+ * of this {@code SNIHostName} object
+ */
+ public String getAsciiName() {
+ return hostname;
+ }
+
+ /**
+ * Compares this server name to the specified object.
+ * <P>
+ * Per <A HREF="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</A>, DNS
+ * hostnames are case-insensitive. Two server hostnames are equal if,
+ * and only if, they have the same name type, and the hostnames are
+ * equal in a case-independent comparison.
+ *
+ * @param other
+ * the other server name object to compare with.
+ * @return true if, and only if, the {@code other} is considered
+ * equal to this instance
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (other instanceof SNIHostName) {
+ return hostname.equalsIgnoreCase(((SNIHostName)other).hostname);
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns a hash code value for this {@code SNIHostName}.
+ * <P>
+ * The hash code value is generated using the case-insensitive hostname
+ * of this {@code SNIHostName}.
+ *
+ * @return a hash code value for this {@code SNIHostName}.
+ */
+ @Override
+ public int hashCode() {
+ int result = 17; // 17/31: prime number to decrease collisions
+ result = 31 * result + hostname.toUpperCase(Locale.ENGLISH).hashCode();
+
+ return result;
+ }
+
+ /**
+ * Returns a string representation of the object, including the DNS
+ * hostname in this {@code SNIHostName} object.
+ * <P>
+ * The exact details of the representation are unspecified and subject
+ * to change, but the following may be regarded as typical:
+ * <pre>
+ * "type=host_name (0), value={@literal <hostname>}"
+ * </pre>
+ * The "{@literal <hostname>}" is an ASCII representation of the hostname,
+ * which may contains A-labels. For example, a returned value of an pseudo
+ * hostname may look like:
+ * <pre>
+ * "type=host_name (0), value=www.example.com"
+ * </pre>
+ * or
+ * <pre>
+ * "type=host_name (0), value=xn--fsqu00a.xn--0zwm56d"
+ * </pre>
+ * <P>
+ * Please NOTE that the exact details of the representation are unspecified
+ * and subject to change.
+ *
+ * @return a string representation of the object.
+ */
+ @Override
+ public String toString() {
+ return "type=host_name (0), value=" + hostname;
+ }
+
+ /**
+ * Creates an {@link SNIMatcher} object for {@code SNIHostName}s.
+ * <P>
+ * This method can be used by a server to verify the acceptable
+ * {@code SNIHostName}s. For example,
+ * <pre>
+ * SNIMatcher matcher =
+ * SNIHostName.createSNIMatcher("www\\.example\\.com");
+ * </pre>
+ * will accept the hostname "www.example.com".
+ * <pre>
+ * SNIMatcher matcher =
+ * SNIHostName.createSNIMatcher("www\\.example\\.(com|org)");
+ * </pre>
+ * will accept hostnames "www.example.com" and "www.example.org".
+ *
+ * @param regex
+ * the <a href="{@docRoot}/java/util/regex/Pattern.html#sum">
+ * regular expression pattern</a>
+ * representing the hostname(s) to match
+ * @throws NullPointerException if {@code regex} is
+ * {@code null}
+ * @throws PatternSyntaxException if the regular expression's syntax
+ * is invalid
+ */
+ public static SNIMatcher createSNIMatcher(String regex) {
+ if (regex == null) {
+ throw new NullPointerException(
+ "The regular expression cannot be null");
+ }
+
+ return new SNIHostNameMatcher(regex);
+ }
+
+ // check the validity of the string hostname
+ private void checkHostName() {
+ if (hostname.isEmpty()) {
+ throw new IllegalArgumentException(
+ "Server name value of host_name cannot be empty");
+ }
+
+ if (hostname.endsWith(".")) {
+ throw new IllegalArgumentException(
+ "Server name value of host_name cannot have the trailing dot");
+ }
+ }
+
+ private final static class SNIHostNameMatcher extends SNIMatcher {
+
+ // the compiled representation of a regular expression.
+ private final Pattern pattern;
+
+ /**
+ * Creates an SNIHostNameMatcher object.
+ *
+ * @param regex
+ * the <a href="{@docRoot}/java/util/regex/Pattern.html#sum">
+ * regular expression pattern</a>
+ * representing the hostname(s) to match
+ * @throws NullPointerException if {@code regex} is
+ * {@code null}
+ * @throws PatternSyntaxException if the regular expression's syntax
+ * is invalid
+ */
+ SNIHostNameMatcher(String regex) {
+ super(StandardConstants.SNI_HOST_NAME);
+ pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+ }
+
+ /**
+ * Attempts to match the given {@link SNIServerName}.
+ *
+ * @param serverName
+ * the {@link SNIServerName} instance on which this matcher
+ * performs match operations
+ *
+ * @return {@code true} if, and only if, the matcher matches the
+ * given {@code serverName}
+ *
+ * @throws NullPointerException if {@code serverName} is {@code null}
+ * @throws IllegalArgumentException if {@code serverName} is
+ * not of {@code StandardConstants#SNI_HOST_NAME} type
+ *
+ * @see SNIServerName
+ */
+ @Override
+ public boolean matches(SNIServerName serverName) {
+ if (serverName == null) {
+ throw new NullPointerException(
+ "The SNIServerName argument cannot be null");
+ }
+
+ SNIHostName hostname;
+ if (!(serverName instanceof SNIHostName)) {
+ if (serverName.getType() != StandardConstants.SNI_HOST_NAME) {
+ throw new IllegalArgumentException(
+ "The server name type is not host_name");
+ }
+
+ try {
+ hostname = new SNIHostName(serverName.getEncoded());
+ } catch (NullPointerException | IllegalArgumentException e) {
+ return false;
+ }
+ } else {
+ hostname = (SNIHostName)serverName;
+ }
+
+ // Let's first try the ascii name matching
+ String asciiName = hostname.getAsciiName();
+ if (pattern.matcher(asciiName).matches()) {
+ return true;
+ }
+
+ // May be an internationalized domain name, check the Unicode
+ // representations.
+ return pattern.matcher(IDN.toUnicode(asciiName)).matches();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIMatcher.java b/jdk/src/share/classes/javax/net/ssl/SNIMatcher.java
new file mode 100644
index 0000000..5025b99
--- /dev/null
+++ b/jdk/src/share/classes/javax/net/ssl/SNIMatcher.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package javax.net.ssl;
+
+/**
+ * Instances of this class represent a matcher that performs match
+ * operations on an {@link SNIServerName} instance.
+ * <P>
+ * Servers can use Server Name Indication (SNI) information to decide if
+ * specific {@link SSLSocket} or {@link SSLEngine} instances should accept
+ * a connection. For example, when multiple "virtual" or "name-based"
+ * servers are hosted on a single underlying network address, the server
+ * application can use SNI information to determine whether this server is
+ * the exact server that the client wants to access. Instances of this
+ * class can be used by a server to verify the acceptable server names of
+ * a particular type, such as host names.
+ * <P>
+ * {@code SNIMatcher} objects are immutable. Subclasses should not provide
+ * methods that can change the state of an instance once it has been created.
+ *
+ * @see SNIServerName
+ * @see SNIHostName
+ * @see SSLParameters#getSNIMatchers()
+ * @see SSLParameters#setSNIMatchers(Collection<SNIMatcher>)
+ *
+ * @since 1.8
+ */
+public abstract class SNIMatcher {
+
+ // the type of the server name that this matcher performs on
+ private final int type;
+
+ /**
+ * Creates an {@code SNIMatcher} using the specified server name type.
+ *
+ * @param type
+ * the type of the server name that this matcher performs on
+ *
+ * @throws IllegalArgumentException if {@code type} is not in the range
+ * of 0 to 255, inclusive.
+ */
+ protected SNIMatcher(int type) {
+ if (type < 0) {
+ throw new IllegalArgumentException(
+ "Server name type cannot be less than zero");
+ } else if (type > 255) {
+ throw new IllegalArgumentException(
+ "Server name type cannot be greater than 255");
+ }
+
+ this.type = type;
+ }
+
+ /**
+ * Returns the server name type of this {@code SNIMatcher} object.
+ *
+ * @return the server name type of this {@code SNIMatcher} object.
+ *
+ * @see SNIServerName
+ */
+ public final int getType() {
+ return type;
+ }
+
+ /**
+ * Attempts to match the given {@link SNIServerName}.
+ *
+ * @param serverName
+ * the {@link SNIServerName} instance on which this matcher
+ * performs match operations
+ *
+ * @return {@code true} if, and only if, the matcher matches the
+ * given {@code serverName}
+ *
+ * @throws NullPointerException if {@code serverName} is {@code null}
+ * @throws IllegalArgumentException if {@code serverName} is
+ * not of the given server name type of this matcher
+ *
+ * @see SNIServerName
+ */
+ public abstract boolean matches(SNIServerName serverName);
+}
diff --git a/jdk/src/share/classes/javax/net/ssl/SNIServerName.java b/jdk/src/share/classes/javax/net/ssl/SNIServerName.java
new file mode 100644
index 0000000..afc2286
--- /dev/null
+++ b/jdk/src/share/classes/javax/net/ssl/SNIServerName.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package javax.net.ssl;
+
+import java.util.Arrays;
+
+/**
+ * Instances of this class represent a server name in a Server Name
+ * Indication (SNI) extension.
+ * <P>
+ * The SNI extension is a feature that extends the SSL/TLS protocols to
+ * indicate what server name the client is attempting to connect to during
+ * handshaking. See section 3, "Server Name Indication", of <A
+ * HREF="http://www.ietf.org/rfc/rfc6066.txt">TLS Extensions (RFC 6066)</A>.
+ * <P>
+ * {@code SNIServerName} objects are immutable. Subclasses should not provide
+ * methods that can change the state of an instance once it has been created.
+ *
+ * @see SSLParameters#getServerNames()
+ * @see SSLParameters#setServerNames(List<SNIServerName>)
+ *
+ * @since 1.8
+ */
+public abstract class SNIServerName {
+
+ // the type of the server name
+ private final int type;
+
+ // the encoded value of the server name
+ private final byte[] encoded;
+
+ // the hex digitals
+ private static final char[] HEXES = "0123456789ABCDEF".toCharArray();
+
+ /**
+ * Creates an {@code SNIServerName} using the specified name type and
+ * encoded value.
+ * <P>
+ * Note that the {@code encoded} byte array is cloned to protect against
+ * subsequent modification.
+ *
+ * @param type
+ * the type of the server name
+ * @param encoded
+ * the encoded value of the server name
+ *
+ * @throws IllegalArgumentException if {@code type} is not in the range
+ * of 0 to 255, inclusive.
+ * @throws NullPointerException if {@code encoded} is null
+ */
+ protected SNIServerName(int type, byte[] encoded) {
+ if (type < 0) {
+ throw new IllegalArgumentException(
+ "Server name type cannot be less than zero");
+ } else if (type > 255) {
+ throw new IllegalArgumentException(
+ "Server name type cannot be greater than 255");
+ }
+ this.type = type;
+
+ if (encoded == null) {
+ throw new NullPointerException(
+ "Server name encoded value cannot be null");
+ }
+ this.encoded = encoded.clone();
+ }
+
+
+ /**
+ * Returns the name type of this server name.
+ *
+ * @return the name type of this server name
+ */
+ public final int getType() {
+ return type;
+ }
+
+ /**
+ * Returns a copy of the encoded server name value of this server name.
+ *
+ * @return a copy of the encoded server name value of this server name
+ */
+ public final byte[] getEncoded() {
+ return encoded.clone();
+ }
+
+ /**
+ * Indicates whether some other object is "equal to" this server name.
+ *
+ * @return true if, and only if, {@code other} is of the same class
+ * of this object, and has the same name type and
+ * encoded value as this server name.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (this.getClass() != other.getClass()) {
+ return false;
+ }
+
+ SNIServerName that = (SNIServerName)other;
+ return (this.type == that.type) &&
+ Arrays.equals(this.encoded, that.encoded);
+ }
+
+ /**
+ * Returns a hash code value for this server name.
+ * <P>
+ * The hash code value is generated using the name type and encoded
+ * value of this server name.
+ *
+ * @return a hash code value for this server name.
+ */
+ @Override
+ public int hashCode() {
+ int result = 17; // 17/31: prime number to decrease collisions
+ result = 31 * result + type;
+ result = 31 * result + Arrays.hashCode(encoded);
+
+ return result;
+ }
+
+ /**
+ * Returns a string representation of this server name, including the server
+ * name type and the encoded server name value in this
+ * {@code SNIServerName} object.
+ * <P>
+ * The exact details of the representation are unspecified and subject
+ * to change, but the following may be regarded as typical:
+ * <pre>
+ * "type={@literal <name type>}, value={@literal <name value>}"
+ * </pre>
+ * <P>
+ * In this class, the format of "{@literal <name type>}" is
+ * "[LITERAL] (INTEGER)", where the optional "LITERAL" is the literal
+ * name, and INTEGER is the integer value of the name type. The format
+ * of "{@literal <name value>}" is "XX:...:XX", where "XX" is the
+ * hexadecimal digit representation of a byte value. For example, a
+ * returned value of an pseudo server name may look like:
+ * <pre>
+ * "type=(31), value=77:77:77:2E:65:78:61:6D:70:6C:65:2E:63:6E"
+ * </pre>
+ * or
+ * <pre>
+ * "type=host_name (0), value=77:77:77:2E:65:78:61:6D:70:6C:65:2E:63:6E"
+ * </pre>
+ *
+ * <P>
+ * Please NOTE that the exact details of the representation are unspecified
+ * and subject to change, and subclasses may override the method with
+ * their own formats.
+ *
+ * @return a string representation of this server name
+ */
+ @Override
+ public String toString() {
+ if (type == StandardConstants.SNI_HOST_NAME) {
+ return "type=host_name (0), value=" + toHexString(encoded);
+ } else {
+ return "type=(" + type + "), value=" + toHexString(encoded);
+ }
+ }
+
+ // convert byte array to hex string
+ private static String toHexString(byte[] bytes) {
+ if (bytes.length == 0) {
+ return "(empty)";
+ }
+
+ StringBuilder sb = new StringBuilder(bytes.length * 3 - 1);
+ boolean isInitial = true;
+ for (byte b : bytes) {
+ if (isInitial) {
+ isInitial = false;
+ } else {
+ sb.append(':');
+ }
+
+ int k = b & 0xFF;
+ sb.append(HEXES[k >>> 4]);
+ sb.append(HEXES[k & 0xF]);
+ }
+
+ return sb.toString();
+ }
+}
+
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
index 411626c..433361c 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -1214,15 +1214,19 @@
*
* <p>This means:
* <ul>
- * <li>if <code>params.getCipherSuites()</code> is non-null,
- * <code>setEnabledCipherSuites()</code> is called with that value
- * <li>if <code>params.getProtocols()</code> is non-null,
- * <code>setEnabledProtocols()</code> is called with that value
- * <li>if <code>params.getNeedClientAuth()</code> or
- * <code>params.getWantClientAuth()</code> return <code>true</code>,
- * <code>setNeedClientAuth(true)</code> and
- * <code>setWantClientAuth(true)</code> are called, respectively;
- * otherwise <code>setWantClientAuth(false)</code> is called.
+ * <li>If {@code params.getCipherSuites()} is non-null,
+ * {@code setEnabledCipherSuites()} is called with that value.</li>
+ * <li>If {@code params.getProtocols()} is non-null,
+ * {@code setEnabledProtocols()} is called with that value.</li>
+ * <li>If {@code params.getNeedClientAuth()} or
+ * {@code params.getWantClientAuth()} return {@code true},
+ * {@code setNeedClientAuth(true)} and
+ * {@code setWantClientAuth(true)} are called, respectively;
+ * otherwise {@code setWantClientAuth(false)} is called.</li>
+ * <li>If {@code params.getServerNames()} is non-null, the engine will
+ * configure its server names with that value.</li>
+ * <li>If {@code params.getSNIMatchers()} is non-null, the engine will
+ * configure its SNI matchers with that value.</li>
* </ul>
*
* @param params the parameters
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLParameters.java b/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
index 0cb5b7d..d207f6f 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
@@ -26,13 +26,23 @@
package javax.net.ssl;
import java.security.AlgorithmConstraints;
+import java.util.Map;
+import java.util.List;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.regex.Pattern;
/**
* Encapsulates parameters for an SSL/TLS connection. The parameters
* are the list of ciphersuites to be accepted in an SSL/TLS handshake,
* the list of protocols to be allowed, the endpoint identification
- * algorithm during SSL/TLS handshaking, the algorithm constraints and
- * whether SSL/TLS servers should request or require client authentication.
+ * algorithm during SSL/TLS handshaking, the Server Name Indication (SNI),
+ * the algorithm constraints and whether SSL/TLS servers should request
+ * or require client authentication.
* <p>
* SSLParameters can be created via the constructors in this class.
* Objects can also be obtained using the <code>getSSLParameters()</code>
@@ -47,7 +57,7 @@
* SSLParameters can be applied to a connection via the methods
* {@link SSLSocket#setSSLParameters SSLSocket.setSSLParameters()} and
* {@link SSLServerSocket#setSSLParameters SSLServerSocket.setSSLParameters()}
- * and {@link SSLEngine#setSSLParameters SSLEngine.getSSLParameters()}.
+ * and {@link SSLEngine#setSSLParameters SSLEngine.setSSLParameters()}.
*
* @see SSLSocket
* @see SSLEngine
@@ -63,11 +73,15 @@
private boolean needClientAuth;
private String identificationAlgorithm;
private AlgorithmConstraints algorithmConstraints;
+ private Map<Integer, SNIServerName> sniNames = null;
+ private Map<Integer, SNIMatcher> sniMatchers = null;
/**
* Constructs SSLParameters.
* <p>
- * The cipherSuites and protocols values are set to <code>null</code>,
+ * The values of cipherSuites, protocols, cryptographic algorithm
+ * constraints, endpoint identification algorithm, server names and
+ * server name matchers are set to <code>null</code>,
* wantClientAuth and needClientAuth are set to <code>false</code>.
*/
public SSLParameters() {
@@ -254,4 +268,173 @@
this.identificationAlgorithm = algorithm;
}
+ /**
+ * Sets the desired {@link SNIServerName}s of the Server Name
+ * Indication (SNI) parameter.
+ * <P>
+ * This method is only useful to {@link SSLSocket}s or {@link SSLEngine}s
+ * operating in client mode.
+ * <P>
+ * Note that the {@code serverNames} list is cloned
+ * to protect against subsequent modification.
+ *
+ * @param serverNames
+ * the list of desired {@link SNIServerName}s (or null)
+ *
+ * @throws NullPointerException if the {@code serverNames}
+ * contains {@code null} element
+ * @throws IllegalArgumentException if the {@code serverNames}
+ * contains more than one name of the same name type
+ *
+ * @see SNIServerName
+ * @see #getServerNames()
+ *
+ * @since 1.8
+ */
+ public final void setServerNames(List<SNIServerName> serverNames) {
+ if (serverNames != null) {
+ if (!serverNames.isEmpty()) {
+ sniNames = new LinkedHashMap<>(serverNames.size());
+ for (SNIServerName serverName : serverNames) {
+ if (sniNames.put(serverName.getType(),
+ serverName) != null) {
+ throw new IllegalArgumentException(
+ "Duplicated server name of type " +
+ serverName.getType());
+ }
+ }
+ } else {
+ sniNames = Collections.<Integer, SNIServerName>emptyMap();
+ }
+ } else {
+ sniNames = null;
+ }
+ }
+
+ /**
+ * Returns a {@link List} containing all {@link SNIServerName}s of the
+ * Server Name Indication (SNI) parameter, or null if none has been set.
+ * <P>
+ * This method is only useful to {@link SSLSocket}s or {@link SSLEngine}s
+ * operating in client mode.
+ * <P>
+ * For SSL/TLS connections, the underlying SSL/TLS provider
+ * may specify a default value for a certain server name type. In
+ * client mode, it is recommended that, by default, providers should
+ * include the server name indication whenever the server can be located
+ * by a supported server name type.
+ * <P>
+ * It is recommended that providers initialize default Server Name
+ * Indications when creating {@code SSLSocket}/{@code SSLEngine}s.
+ * In the following examples, the server name could be represented by an
+ * instance of {@link SNIHostName} which has been initialized with the
+ * hostname "www.example.com" and type
+ * {@link StandardConstants#SNI_HOST_NAME}.
+ *
+ * <pre>
+ * Socket socket =
+ * sslSocketFactory.createSocket("www.example.com", 443);
+ * </pre>
+ * or
+ * <pre>
+ * SSLEngine engine =
+ * sslContext.createSSLEngine("www.example.com", 443);
+ * </pre>
+ * <P>
+ *
+ * @return null or an immutable list of non-null {@link SNIServerName}s
+ *
+ * @see List
+ * @see #setServerNames(List<SNIServerName>)
+ *
+ * @since 1.8
+ */
+ public final List<SNIServerName> getServerNames() {
+ if (sniNames != null) {
+ if (!sniNames.isEmpty()) {
+ return Collections.<SNIServerName>unmodifiableList(
+ new ArrayList<>(sniNames.values()));
+ } else {
+ return Collections.<SNIServerName>emptyList();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Sets the {@link SNIMatcher}s of the Server Name Indication (SNI)
+ * parameter.
+ * <P>
+ * This method is only useful to {@link SSLSocket}s or {@link SSLEngine}s
+ * operating in server mode.
+ * <P>
+ * Note that the {@code matchers} collection is cloned to protect
+ * against subsequent modification.
+ *
+ * @param matchers
+ * the collection of {@link SNIMatcher}s (or null)
+ *
+ * @throws NullPointerException if the {@code matchers}
+ * contains {@code null} element
+ * @throws IllegalArgumentException if the {@code matchers}
+ * contains more than one name of the same name type
+ *
+ * @see Collection
+ * @see SNIMatcher
+ * @see #getSNIMatchers()
+ *
+ * @since 1.8
+ */
+ public final void setSNIMatchers(Collection<SNIMatcher> matchers) {
+ if (matchers != null) {
+ if (!matchers.isEmpty()) {
+ sniMatchers = new HashMap<>(matchers.size());
+ for (SNIMatcher matcher : matchers) {
+ if (sniMatchers.put(matcher.getType(),
+ matcher) != null) {
+ throw new IllegalArgumentException(
+ "Duplicated server name of type " +
+ matcher.getType());
+ }
+ }
+ } else {
+ sniMatchers = Collections.<Integer, SNIMatcher>emptyMap();
+ }
+ } else {
+ sniMatchers = null;
+ }
+ }
+
+ /**
+ * Returns a {@link Collection} containing all {@link SNIMatcher}s of the
+ * Server Name Indication (SNI) parameter, or null if none has been set.
+ * <P>
+ * This method is only useful to {@link SSLSocket}s or {@link SSLEngine}s
+ * operating in server mode.
+ * <P>
+ * For better interoperability, providers generally will not define
+ * default matchers so that by default servers will ignore the SNI
+ * extension and continue the handshake.
+ *
+ * @return null or an immutable collection of non-null {@link SNIMatcher}s
+ *
+ * @see SNIMatcher
+ * @see #setSNIMatchers(Collection<SNIMatcher>)
+ *
+ * @since 1.8
+ */
+ public final Collection<SNIMatcher> getSNIMatchers() {
+ if (sniMatchers != null) {
+ if (!sniMatchers.isEmpty()) {
+ return Collections.<SNIMatcher>unmodifiableList(
+ new ArrayList<>(sniMatchers.values()));
+ } else {
+ return Collections.<SNIMatcher>emptyList();
+ }
+ }
+
+ return null;
+ }
}
+
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java b/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
index d5bbaaf..48dc7fa 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -484,15 +484,19 @@
*
* <p>This means:
* <ul>
- * <li>if <code>params.getCipherSuites()</code> is non-null,
- * <code>setEnabledCipherSuites()</code> is called with that value
- * <li>if <code>params.getProtocols()</code> is non-null,
- * <code>setEnabledProtocols()</code> is called with that value
- * <li>if <code>params.getNeedClientAuth()</code> or
- * <code>params.getWantClientAuth()</code> return <code>true</code>,
- * <code>setNeedClientAuth(true)</code> and
- * <code>setWantClientAuth(true)</code> are called, respectively;
- * otherwise <code>setWantClientAuth(false)</code> is called.
+ * <li>If {@code params.getCipherSuites()} is non-null,
+ * {@code setEnabledCipherSuites()} is called with that value.</li>
+ * <li>If {@code params.getProtocols()} is non-null,
+ * {@code setEnabledProtocols()} is called with that value.</li>
+ * <li>If {@code params.getNeedClientAuth()} or
+ * {@code params.getWantClientAuth()} return {@code true},
+ * {@code setNeedClientAuth(true)} and
+ * {@code setWantClientAuth(true)} are called, respectively;
+ * otherwise {@code setWantClientAuth(false)} is called.</li>
+ * <li>If {@code params.getServerNames()} is non-null, the socket will
+ * configure its server names with that value.</li>
+ * <li>If {@code params.getSNIMatchers()} is non-null, the socket will
+ * configure its SNI matchers with that value.</li>
* </ul>
*
* @param params the parameters
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSocket.java b/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
index b61f94a..ab09013 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -626,15 +626,19 @@
*
* <p>This means:
* <ul>
- * <li>if <code>params.getCipherSuites()</code> is non-null,
- * <code>setEnabledCipherSuites()</code> is called with that value
- * <li>if <code>params.getProtocols()</code> is non-null,
- * <code>setEnabledProtocols()</code> is called with that value
- * <li>if <code>params.getNeedClientAuth()</code> or
- * <code>params.getWantClientAuth()</code> return <code>true</code>,
- * <code>setNeedClientAuth(true)</code> and
- * <code>setWantClientAuth(true)</code> are called, respectively;
- * otherwise <code>setWantClientAuth(false)</code> is called.
+ * <li>If {@code params.getCipherSuites()} is non-null,
+ * {@code setEnabledCipherSuites()} is called with that value.</li>
+ * <li>If {@code params.getProtocols()} is non-null,
+ * {@code setEnabledProtocols()} is called with that value.</li>
+ * <li>If {@code params.getNeedClientAuth()} or
+ * {@code params.getWantClientAuth()} return {@code true},
+ * {@code setNeedClientAuth(true)} and
+ * {@code setWantClientAuth(true)} are called, respectively;
+ * otherwise {@code setWantClientAuth(false)} is called.</li>
+ * <li>If {@code params.getServerNames()} is non-null, the socket will
+ * configure its server names with that value.</li>
+ * <li>If {@code params.getSNIMatchers()} is non-null, the socket will
+ * configure its SNI matchers with that value.</li>
* </ul>
*
* @param params the parameters
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java b/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
index c3d33c3..73f48d1 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,6 +29,7 @@
import java.net.*;
import javax.net.SocketFactory;
import java.io.IOException;
+import java.io.InputStream;
import java.security.*;
import java.util.Locale;
@@ -180,8 +181,55 @@
* @throws NullPointerException if the parameter s is null
*/
public abstract Socket createSocket(Socket s, String host,
- int port, boolean autoClose)
- throws IOException;
+ int port, boolean autoClose) throws IOException;
+
+ /**
+ * Creates a server mode {@link Socket} layered over an
+ * existing connected socket, and is able to read data which has
+ * already been consumed/removed from the {@link Socket}'s
+ * underlying {@link InputStream}.
+ * <p>
+ * This method can be used by a server application that needs to
+ * observe the inbound data but still create valid SSL/TLS
+ * connections: for example, inspection of Server Name Indication
+ * (SNI) extensions (See section 3 of <A
+ * HREF="http://www.ietf.org/rfc/rfc6066.txt">TLS Extensions
+ * (RFC6066)</A>). Data that has been already removed from the
+ * underlying {@link InputStream} should be loaded into the
+ * {@code consumed} stream before this method is called, perhaps
+ * using a {@link ByteArrayInputStream}. When this {@link Socket}
+ * begins handshaking, it will read all of the data in
+ * {@code consumed} until it reaches {@code EOF}, then all further
+ * data is read from the underlying {@link InputStream} as
+ * usual.
+ * <p>
+ * The returned socket is configured using the socket options
+ * established for this factory, and is set to use server mode when
+ * handshaking (see {@link SSLSocket#setUseClientMode(boolean)}).
+ *
+ * @param s
+ * the existing socket
+ * @param consumed
+ * the consumed inbound network data that has already been
+ * removed from the existing {@link Socket}
+ * {@link InputStream}. This parameter may be
+ * {@code null} if no data has been removed.
+ * @param autoClose close the underlying socket when this socket is closed.
+ *
+ * @return the {@link Socket} compliant with the socket options
+ * established for this factory
+ *
+ * @throws IOException if an I/O error occurs when creating the socket
+ * @throws UnsupportedOperationException if the underlying provider
+ * does not implement the operation
+ * @throws NullPointerException if {@code s} is {@code null}
+ *
+ * @since 1.8
+ */
+ public Socket createSocket(Socket s, InputStream consumed,
+ boolean autoClose) throws IOException {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/jdk/src/share/classes/javax/net/ssl/StandardConstants.java b/jdk/src/share/classes/javax/net/ssl/StandardConstants.java
new file mode 100644
index 0000000..8e1df97
--- /dev/null
+++ b/jdk/src/share/classes/javax/net/ssl/StandardConstants.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package javax.net.ssl;
+
+/**
+ * Standard constants definitions
+ *
+ * @since 1.8
+ */
+public final class StandardConstants {
+
+ // Suppress default constructor for noninstantiability
+ private StandardConstants() {
+ throw new AssertionError(
+ "No javax.net.ssl.StandardConstants instances for you!");
+ }
+
+ /**
+ * The "host_name" type representing of a DNS hostname
+ * (see {@link SNIHostName}) in a Server Name Indication (SNI) extension.
+ * <P>
+ * The SNI extension is a feature that extends the SSL/TLS protocols to
+ * indicate what server name the client is attempting to connect to during
+ * handshaking. See section 3, "Server Name Indication", of <A
+ * HREF="http://www.ietf.org/rfc/rfc6066.txt">TLS Extensions (RFC 6066)</A>.
+ * <P>
+ * The value of this constant is {@value}.
+ *
+ * @see SNIServerName
+ * @see SNIHostName
+ */
+ public static final int SNI_HOST_NAME = 0x00;
+}
diff --git a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
index bbb1852..adf2e51 100644
--- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -1850,7 +1850,7 @@
if(params == null){
throw new SQLException("Set initParams() before setFloat");
}
- params.put(Integer.valueOf(parameterIndex - 1), new Float(x));
+ params.put(Integer.valueOf(parameterIndex - 1), Float.valueOf(x));
}
/**
@@ -1882,7 +1882,7 @@
if(params == null){
throw new SQLException("Set initParams() before setDouble");
}
- params.put(Integer.valueOf(parameterIndex - 1), new Double(x));
+ params.put(Integer.valueOf(parameterIndex - 1), Double.valueOf(x));
}
/**
@@ -2389,7 +2389,7 @@
* @deprecated getCharacterStream should be used in its place
* @see #getParams
*/
-
+ @Deprecated
public void setUnicodeStream(int parameterIndex, java.io.InputStream x, int length) throws SQLException {
Object unicodeStream[];
checkParamIndex(parameterIndex);
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
index b46a880..fbe4a74 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
@@ -215,7 +215,7 @@
*/
@SuppressWarnings("unchecked")
public void writeFloat(float x) throws SQLException {
- attribs.add(new Float(x));
+ attribs.add(Float.valueOf(x));
}
/**
@@ -230,7 +230,7 @@
*/
@SuppressWarnings("unchecked")
public void writeDouble(double x) throws SQLException{
- attribs.add(new Double(x));
+ attribs.add(Double.valueOf(x));
}
/**
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 11a59c4..10e6158 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -229,11 +229,7 @@
* The standard resource file name.
*/
private static String ROWSET_PROPERTIES = "rowset.properties";
- /**
- * The RI Optimistic Provider.
- */
- private static String default_provider =
- "com.sun.rowset.providers.RIOptimisticProvider";
+
/**
* Permission required to invoke setJNDIContext and setLogger
*/
@@ -248,24 +244,13 @@
* The <code>Logger</code> object to be used by the <code>SyncFactory</code>.
*/
private static volatile Logger rsLogger;
- /**
- *
- */
- private static Level rsLevel;
+
/**
* The registry of available <code>SyncProvider</code> implementations.
* See section 2.0 of the class comment for <code>SyncFactory</code> for an
* explanation of how a provider can be added to this registry.
*/
private static Hashtable<String, SyncProvider> implementations;
- /**
- * Internal sync object used to maintain the SPI as a singleton
- */
- private static Object logSync = new Object();
- /**
- * Internal PrintWriter field for logging facility
- */
- private static java.io.PrintWriter logWriter = null;
/**
* Adds the the given synchronization provider to the factory register. Guidelines
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
index 5e003b5..b67966a 100644
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
@@ -24,6 +24,8 @@
*/
package javax.swing.text;
+import sun.reflect.misc.ConstructorUtil;
+
import java.io.Serializable;
import java.lang.reflect.*;
import java.text.ParseException;
@@ -245,7 +247,7 @@
Constructor cons;
try {
- cons = vc.getConstructor(new Class[] { String.class });
+ cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class});
} catch (NoSuchMethodException nsme) {
cons = null;
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
new file mode 100644
index 0000000..9690afe
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
@@ -0,0 +1,186 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java annotation. The methods of this class must be
+ * called in the following order: ( <tt>visit</tt> | <tt>visitEnum</tt> |
+ * <tt>visitAnnotation</tt> | <tt>visitArray</tt> )* <tt>visitEnd</tt>.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public abstract class AnnotationVisitor {
+
+ /**
+ * The ASM API version implemented by this visitor. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * The annotation visitor to which this visitor must delegate method calls.
+ * May be null.
+ */
+ protected AnnotationVisitor av;
+
+ /**
+ * Constructs a new {@link AnnotationVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public AnnotationVisitor(final int api) {
+ this(api, null);
+ }
+
+ /**
+ * Constructs a new {@link AnnotationVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param av the annotation visitor to which this visitor must delegate
+ * method calls. May be null.
+ */
+ public AnnotationVisitor(final int api, final AnnotationVisitor av) {
+ /*if (api != Opcodes.ASM4) {
+ throw new IllegalArgumentException();
+ }*/
+ this.api = api;
+ this.av = av;
+ }
+
+ /**
+ * Visits a primitive value of the annotation.
+ *
+ * @param name the value name.
+ * @param value the actual value, whose type must be {@link Byte},
+ * {@link Boolean}, {@link Character}, {@link Short}, {@link Integer}
+ * , {@link Long}, {@link Float}, {@link Double}, {@link String} or
+ * {@link Type} or OBJECT or ARRAY sort. This value can also be an
+ * array of byte, boolean, short, char, int, long, float or double
+ * values (this is equivalent to using {@link #visitArray visitArray}
+ * and visiting each array element in turn, but is more convenient).
+ */
+ public void visit(String name, Object value) {
+ if (av != null) {
+ av.visit(name, value);
+ }
+ }
+
+ /**
+ * Visits an enumeration value of the annotation.
+ *
+ * @param name the value name.
+ * @param desc the class descriptor of the enumeration class.
+ * @param value the actual enumeration value.
+ */
+ public void visitEnum(String name, String desc, String value) {
+ if (av != null) {
+ av.visitEnum(name, desc, value);
+ }
+ }
+
+ /**
+ * Visits a nested annotation value of the annotation.
+ *
+ * @param name the value name.
+ * @param desc the class descriptor of the nested annotation class.
+ * @return a visitor to visit the actual nested annotation value, or
+ * <tt>null</tt> if this visitor is not interested in visiting
+ * this nested annotation. <i>The nested annotation value must be
+ * fully visited before calling other methods on this annotation
+ * visitor</i>.
+ */
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ if (av != null) {
+ return av.visitAnnotation(name, desc);
+ }
+ return null;
+ }
+
+ /**
+ * Visits an array value of the annotation. Note that arrays of primitive
+ * types (such as byte, boolean, short, char, int, long, float or double)
+ * can be passed as value to {@link #visit visit}. This is what
+ * {@link ClassReader} does.
+ *
+ * @param name the value name.
+ * @return a visitor to visit the actual array value elements, or
+ * <tt>null</tt> if this visitor is not interested in visiting
+ * these values. The 'name' parameters passed to the methods of this
+ * visitor are ignored. <i>All the array values must be visited
+ * before calling other methods on this annotation visitor</i>.
+ */
+ public AnnotationVisitor visitArray(String name) {
+ if (av != null) {
+ return av.visitArray(name);
+ }
+ return null;
+ }
+
+ /**
+ * Visits the end of the annotation.
+ */
+ public void visitEnd() {
+ if (av != null) {
+ av.visitEnd();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
new file mode 100644
index 0000000..ca72839
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
@@ -0,0 +1,351 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * An {@link AnnotationVisitor} that generates annotations in bytecode form.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+final class AnnotationWriter extends AnnotationVisitor {
+
+ /**
+ * The class writer to which this annotation must be added.
+ */
+ private final ClassWriter cw;
+
+ /**
+ * The number of values in this annotation.
+ */
+ private int size;
+
+ /**
+ * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation
+ * writers used for annotation default and annotation arrays use unnamed
+ * values.
+ */
+ private final boolean named;
+
+ /**
+ * The annotation values in bytecode form. This byte vector only contains
+ * the values themselves, i.e. the number of values must be stored as a
+ * unsigned short just before these bytes.
+ */
+ private final ByteVector bv;
+
+ /**
+ * The byte vector to be used to store the number of values of this
+ * annotation. See {@link #bv}.
+ */
+ private final ByteVector parent;
+
+ /**
+ * Where the number of values of this annotation must be stored in
+ * {@link #parent}.
+ */
+ private final int offset;
+
+ /**
+ * Next annotation writer. This field is used to store annotation lists.
+ */
+ AnnotationWriter next;
+
+ /**
+ * Previous annotation writer. This field is used to store annotation lists.
+ */
+ AnnotationWriter prev;
+
+ // ------------------------------------------------------------------------
+ // Constructor
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new {@link AnnotationWriter}.
+ *
+ * @param cw the class writer to which this annotation must be added.
+ * @param named <tt>true<tt> if values are named, <tt>false</tt> otherwise.
+ * @param bv where the annotation values must be stored.
+ * @param parent where the number of annotation values must be stored.
+ * @param offset where in <tt>parent</tt> the number of annotation values must
+ * be stored.
+ */
+ AnnotationWriter(
+ final ClassWriter cw,
+ final boolean named,
+ final ByteVector bv,
+ final ByteVector parent,
+ final int offset)
+ {
+ super(Opcodes.ASM4);
+ this.cw = cw;
+ this.named = named;
+ this.bv = bv;
+ this.parent = parent;
+ this.offset = offset;
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the AnnotationVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(final String name, final Object value) {
+ ++size;
+ if (named) {
+ bv.putShort(cw.newUTF8(name));
+ }
+ if (value instanceof String) {
+ bv.put12('s', cw.newUTF8((String) value));
+ } else if (value instanceof Byte) {
+ bv.put12('B', cw.newInteger(((Byte) value).byteValue()).index);
+ } else if (value instanceof Boolean) {
+ int v = ((Boolean) value).booleanValue() ? 1 : 0;
+ bv.put12('Z', cw.newInteger(v).index);
+ } else if (value instanceof Character) {
+ bv.put12('C', cw.newInteger(((Character) value).charValue()).index);
+ } else if (value instanceof Short) {
+ bv.put12('S', cw.newInteger(((Short) value).shortValue()).index);
+ } else if (value instanceof Type) {
+ bv.put12('c', cw.newUTF8(((Type) value).getDescriptor()));
+ } else if (value instanceof byte[]) {
+ byte[] v = (byte[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('B', cw.newInteger(v[i]).index);
+ }
+ } else if (value instanceof boolean[]) {
+ boolean[] v = (boolean[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('Z', cw.newInteger(v[i] ? 1 : 0).index);
+ }
+ } else if (value instanceof short[]) {
+ short[] v = (short[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('S', cw.newInteger(v[i]).index);
+ }
+ } else if (value instanceof char[]) {
+ char[] v = (char[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('C', cw.newInteger(v[i]).index);
+ }
+ } else if (value instanceof int[]) {
+ int[] v = (int[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('I', cw.newInteger(v[i]).index);
+ }
+ } else if (value instanceof long[]) {
+ long[] v = (long[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('J', cw.newLong(v[i]).index);
+ }
+ } else if (value instanceof float[]) {
+ float[] v = (float[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('F', cw.newFloat(v[i]).index);
+ }
+ } else if (value instanceof double[]) {
+ double[] v = (double[]) value;
+ bv.put12('[', v.length);
+ for (int i = 0; i < v.length; i++) {
+ bv.put12('D', cw.newDouble(v[i]).index);
+ }
+ } else {
+ Item i = cw.newConstItem(value);
+ bv.put12(".s.IFJDCS".charAt(i.type), i.index);
+ }
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ ++size;
+ if (named) {
+ bv.putShort(cw.newUTF8(name));
+ }
+ bv.put12('e', cw.newUTF8(desc)).putShort(cw.newUTF8(value));
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ ++size;
+ if (named) {
+ bv.putShort(cw.newUTF8(name));
+ }
+ // write tag and type, and reserve space for values count
+ bv.put12('@', cw.newUTF8(desc)).putShort(0);
+ return new AnnotationWriter(cw, true, bv, bv, bv.length - 2);
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(final String name) {
+ ++size;
+ if (named) {
+ bv.putShort(cw.newUTF8(name));
+ }
+ // write tag, and reserve space for array size
+ bv.put12('[', 0);
+ return new AnnotationWriter(cw, false, bv, bv, bv.length - 2);
+ }
+
+ @Override
+ public void visitEnd() {
+ if (parent != null) {
+ byte[] data = parent.data;
+ data[offset] = (byte) (size >>> 8);
+ data[offset + 1] = (byte) size;
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the size of this annotation writer list.
+ *
+ * @return the size of this annotation writer list.
+ */
+ int getSize() {
+ int size = 0;
+ AnnotationWriter aw = this;
+ while (aw != null) {
+ size += aw.bv.length;
+ aw = aw.next;
+ }
+ return size;
+ }
+
+ /**
+ * Puts the annotations of this annotation writer list into the given byte
+ * vector.
+ *
+ * @param out where the annotations must be put.
+ */
+ void put(final ByteVector out) {
+ int n = 0;
+ int size = 2;
+ AnnotationWriter aw = this;
+ AnnotationWriter last = null;
+ while (aw != null) {
+ ++n;
+ size += aw.bv.length;
+ aw.visitEnd(); // in case user forgot to call visitEnd
+ aw.prev = last;
+ last = aw;
+ aw = aw.next;
+ }
+ out.putInt(size);
+ out.putShort(n);
+ aw = last;
+ while (aw != null) {
+ out.putByteArray(aw.bv.data, 0, aw.bv.length);
+ aw = aw.prev;
+ }
+ }
+
+ /**
+ * Puts the given annotation lists into the given byte vector.
+ *
+ * @param panns an array of annotation writer lists.
+ * @param off index of the first annotation to be written.
+ * @param out where the annotations must be put.
+ */
+ static void put(
+ final AnnotationWriter[] panns,
+ final int off,
+ final ByteVector out)
+ {
+ int size = 1 + 2 * (panns.length - off);
+ for (int i = off; i < panns.length; ++i) {
+ size += panns[i] == null ? 0 : panns[i].getSize();
+ }
+ out.putInt(size).putByte(panns.length - off);
+ for (int i = off; i < panns.length; ++i) {
+ AnnotationWriter aw = panns[i];
+ AnnotationWriter last = null;
+ int n = 0;
+ while (aw != null) {
+ ++n;
+ aw.visitEnd(); // in case user forgot to call visitEnd
+ aw.prev = last;
+ last = aw;
+ aw = aw.next;
+ }
+ out.putShort(n);
+ aw = last;
+ while (aw != null) {
+ out.putByteArray(aw.bv.data, 0, aw.bv.length);
+ aw = aw.prev;
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
new file mode 100644
index 0000000..03817bc
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
@@ -0,0 +1,283 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A non standard class, field, method or code attribute.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class Attribute {
+
+ /**
+ * The type of this attribute.
+ */
+ public final String type;
+
+ /**
+ * The raw value of this attribute, used only for unknown attributes.
+ */
+ byte[] value;
+
+ /**
+ * The next attribute in this attribute list. May be <tt>null</tt>.
+ */
+ Attribute next;
+
+ /**
+ * Constructs a new empty attribute.
+ *
+ * @param type the type of the attribute.
+ */
+ protected Attribute(final String type) {
+ this.type = type;
+ }
+
+ /**
+ * Returns <tt>true</tt> if this type of attribute is unknown. The default
+ * implementation of this method always returns <tt>true</tt>.
+ *
+ * @return <tt>true</tt> if this type of attribute is unknown.
+ */
+ public boolean isUnknown() {
+ return true;
+ }
+
+ /**
+ * Returns <tt>true</tt> if this type of attribute is a code attribute.
+ *
+ * @return <tt>true</tt> if this type of attribute is a code attribute.
+ */
+ public boolean isCodeAttribute() {
+ return false;
+ }
+
+ /**
+ * Returns the labels corresponding to this attribute.
+ *
+ * @return the labels corresponding to this attribute, or <tt>null</tt> if
+ * this attribute is not a code attribute that contains labels.
+ */
+ protected Label[] getLabels() {
+ return null;
+ }
+
+ /**
+ * Reads a {@link #type type} attribute. This method must return a <i>new</i>
+ * {@link Attribute} object, of type {@link #type type}, corresponding to
+ * the <tt>len</tt> bytes starting at the given offset, in the given class
+ * reader.
+ *
+ * @param cr the class that contains the attribute to be read.
+ * @param off index of the first byte of the attribute's content in {@link
+ * ClassReader#b cr.b}. The 6 attribute header bytes, containing the
+ * type and the length of the attribute, are not taken into account
+ * here.
+ * @param len the length of the attribute's content.
+ * @param buf buffer to be used to call
+ * {@link ClassReader#readUTF8 readUTF8},
+ * {@link ClassReader#readClass(int,char[]) readClass} or
+ * {@link ClassReader#readConst readConst}.
+ * @param codeOff index of the first byte of code's attribute content in
+ * {@link ClassReader#b cr.b}, or -1 if the attribute to be read is
+ * not a code attribute. The 6 attribute header bytes, containing the
+ * type and the length of the attribute, are not taken into account
+ * here.
+ * @param labels the labels of the method's code, or <tt>null</tt> if the
+ * attribute to be read is not a code attribute.
+ * @return a <i>new</i> {@link Attribute} object corresponding to the given
+ * bytes.
+ */
+ protected Attribute read(
+ final ClassReader cr,
+ final int off,
+ final int len,
+ final char[] buf,
+ final int codeOff,
+ final Label[] labels)
+ {
+ Attribute attr = new Attribute(type);
+ attr.value = new byte[len];
+ System.arraycopy(cr.b, off, attr.value, 0, len);
+ return attr;
+ }
+
+ /**
+ * Returns the byte array form of this attribute.
+ *
+ * @param cw the class to which this attribute must be added. This parameter
+ * can be used to add to the constant pool of this class the items
+ * that corresponds to this attribute.
+ * @param code the bytecode of the method corresponding to this code
+ * attribute, or <tt>null</tt> if this attribute is not a code
+ * attributes.
+ * @param len the length of the bytecode of the method corresponding to this
+ * code attribute, or <tt>null</tt> if this attribute is not a code
+ * attribute.
+ * @param maxStack the maximum stack size of the method corresponding to
+ * this code attribute, or -1 if this attribute is not a code
+ * attribute.
+ * @param maxLocals the maximum number of local variables of the method
+ * corresponding to this code attribute, or -1 if this attribute is
+ * not a code attribute.
+ * @return the byte array form of this attribute.
+ */
+ protected ByteVector write(
+ final ClassWriter cw,
+ final byte[] code,
+ final int len,
+ final int maxStack,
+ final int maxLocals)
+ {
+ ByteVector v = new ByteVector();
+ v.data = value;
+ v.length = value.length;
+ return v;
+ }
+
+ /**
+ * Returns the length of the attribute list that begins with this attribute.
+ *
+ * @return the length of the attribute list that begins with this attribute.
+ */
+ final int getCount() {
+ int count = 0;
+ Attribute attr = this;
+ while (attr != null) {
+ count += 1;
+ attr = attr.next;
+ }
+ return count;
+ }
+
+ /**
+ * Returns the size of all the attributes in this attribute list.
+ *
+ * @param cw the class writer to be used to convert the attributes into byte
+ * arrays, with the {@link #write write} method.
+ * @param code the bytecode of the method corresponding to these code
+ * attributes, or <tt>null</tt> if these attributes are not code
+ * attributes.
+ * @param len the length of the bytecode of the method corresponding to
+ * these code attributes, or <tt>null</tt> if these attributes are
+ * not code attributes.
+ * @param maxStack the maximum stack size of the method corresponding to
+ * these code attributes, or -1 if these attributes are not code
+ * attributes.
+ * @param maxLocals the maximum number of local variables of the method
+ * corresponding to these code attributes, or -1 if these attributes
+ * are not code attributes.
+ * @return the size of all the attributes in this attribute list. This size
+ * includes the size of the attribute headers.
+ */
+ final int getSize(
+ final ClassWriter cw,
+ final byte[] code,
+ final int len,
+ final int maxStack,
+ final int maxLocals)
+ {
+ Attribute attr = this;
+ int size = 0;
+ while (attr != null) {
+ cw.newUTF8(attr.type);
+ size += attr.write(cw, code, len, maxStack, maxLocals).length + 6;
+ attr = attr.next;
+ }
+ return size;
+ }
+
+ /**
+ * Writes all the attributes of this attribute list in the given byte
+ * vector.
+ *
+ * @param cw the class writer to be used to convert the attributes into byte
+ * arrays, with the {@link #write write} method.
+ * @param code the bytecode of the method corresponding to these code
+ * attributes, or <tt>null</tt> if these attributes are not code
+ * attributes.
+ * @param len the length of the bytecode of the method corresponding to
+ * these code attributes, or <tt>null</tt> if these attributes are
+ * not code attributes.
+ * @param maxStack the maximum stack size of the method corresponding to
+ * these code attributes, or -1 if these attributes are not code
+ * attributes.
+ * @param maxLocals the maximum number of local variables of the method
+ * corresponding to these code attributes, or -1 if these attributes
+ * are not code attributes.
+ * @param out where the attributes must be written.
+ */
+ final void put(
+ final ClassWriter cw,
+ final byte[] code,
+ final int len,
+ final int maxStack,
+ final int maxLocals,
+ final ByteVector out)
+ {
+ Attribute attr = this;
+ while (attr != null) {
+ ByteVector b = attr.write(cw, code, len, maxStack, maxLocals);
+ out.putShort(cw.newUTF8(attr.type)).putInt(b.length);
+ out.putByteArray(b.data, 0, b.length);
+ attr = attr.next;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
new file mode 100644
index 0000000..6a00f9d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
@@ -0,0 +1,322 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A dynamically extensible vector of bytes. This class is roughly equivalent to
+ * a DataOutputStream on top of a ByteArrayOutputStream, but is more efficient.
+ *
+ * @author Eric Bruneton
+ */
+public class ByteVector {
+
+ /**
+ * The content of this vector.
+ */
+ byte[] data;
+
+ /**
+ * Actual number of bytes in this vector.
+ */
+ int length;
+
+ /**
+ * Constructs a new {@link ByteVector ByteVector} with a default initial
+ * size.
+ */
+ public ByteVector() {
+ data = new byte[64];
+ }
+
+ /**
+ * Constructs a new {@link ByteVector ByteVector} with the given initial
+ * size.
+ *
+ * @param initialSize the initial size of the byte vector to be constructed.
+ */
+ public ByteVector(final int initialSize) {
+ data = new byte[initialSize];
+ }
+
+ /**
+ * Puts a byte into this byte vector. The byte vector is automatically
+ * enlarged if necessary.
+ *
+ * @param b a byte.
+ * @return this byte vector.
+ */
+ public ByteVector putByte(final int b) {
+ int length = this.length;
+ if (length + 1 > data.length) {
+ enlarge(1);
+ }
+ data[length++] = (byte) b;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts two bytes into this byte vector. The byte vector is automatically
+ * enlarged if necessary.
+ *
+ * @param b1 a byte.
+ * @param b2 another byte.
+ * @return this byte vector.
+ */
+ ByteVector put11(final int b1, final int b2) {
+ int length = this.length;
+ if (length + 2 > data.length) {
+ enlarge(2);
+ }
+ byte[] data = this.data;
+ data[length++] = (byte) b1;
+ data[length++] = (byte) b2;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts a short into this byte vector. The byte vector is automatically
+ * enlarged if necessary.
+ *
+ * @param s a short.
+ * @return this byte vector.
+ */
+ public ByteVector putShort(final int s) {
+ int length = this.length;
+ if (length + 2 > data.length) {
+ enlarge(2);
+ }
+ byte[] data = this.data;
+ data[length++] = (byte) (s >>> 8);
+ data[length++] = (byte) s;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts a byte and a short into this byte vector. The byte vector is
+ * automatically enlarged if necessary.
+ *
+ * @param b a byte.
+ * @param s a short.
+ * @return this byte vector.
+ */
+ ByteVector put12(final int b, final int s) {
+ int length = this.length;
+ if (length + 3 > data.length) {
+ enlarge(3);
+ }
+ byte[] data = this.data;
+ data[length++] = (byte) b;
+ data[length++] = (byte) (s >>> 8);
+ data[length++] = (byte) s;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts an int into this byte vector. The byte vector is automatically
+ * enlarged if necessary.
+ *
+ * @param i an int.
+ * @return this byte vector.
+ */
+ public ByteVector putInt(final int i) {
+ int length = this.length;
+ if (length + 4 > data.length) {
+ enlarge(4);
+ }
+ byte[] data = this.data;
+ data[length++] = (byte) (i >>> 24);
+ data[length++] = (byte) (i >>> 16);
+ data[length++] = (byte) (i >>> 8);
+ data[length++] = (byte) i;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts a long into this byte vector. The byte vector is automatically
+ * enlarged if necessary.
+ *
+ * @param l a long.
+ * @return this byte vector.
+ */
+ public ByteVector putLong(final long l) {
+ int length = this.length;
+ if (length + 8 > data.length) {
+ enlarge(8);
+ }
+ byte[] data = this.data;
+ int i = (int) (l >>> 32);
+ data[length++] = (byte) (i >>> 24);
+ data[length++] = (byte) (i >>> 16);
+ data[length++] = (byte) (i >>> 8);
+ data[length++] = (byte) i;
+ i = (int) l;
+ data[length++] = (byte) (i >>> 24);
+ data[length++] = (byte) (i >>> 16);
+ data[length++] = (byte) (i >>> 8);
+ data[length++] = (byte) i;
+ this.length = length;
+ return this;
+ }
+
+ /**
+ * Puts an UTF8 string into this byte vector. The byte vector is
+ * automatically enlarged if necessary.
+ *
+ * @param s a String.
+ * @return this byte vector.
+ */
+ public ByteVector putUTF8(final String s) {
+ int charLength = s.length();
+ int len = length;
+ if (len + 2 + charLength > data.length) {
+ enlarge(2 + charLength);
+ }
+ byte[] data = this.data;
+ // optimistic algorithm: instead of computing the byte length and then
+ // serializing the string (which requires two loops), we assume the byte
+ // length is equal to char length (which is the most frequent case), and
+ // we start serializing the string right away. During the serialization,
+ // if we find that this assumption is wrong, we continue with the
+ // general method.
+ data[len++] = (byte) (charLength >>> 8);
+ data[len++] = (byte) charLength;
+ for (int i = 0; i < charLength; ++i) {
+ char c = s.charAt(i);
+ if (c >= '\001' && c <= '\177') {
+ data[len++] = (byte) c;
+ } else {
+ int byteLength = i;
+ for (int j = i; j < charLength; ++j) {
+ c = s.charAt(j);
+ if (c >= '\001' && c <= '\177') {
+ byteLength++;
+ } else if (c > '\u07FF') {
+ byteLength += 3;
+ } else {
+ byteLength += 2;
+ }
+ }
+ data[length] = (byte) (byteLength >>> 8);
+ data[length + 1] = (byte) byteLength;
+ if (length + 2 + byteLength > data.length) {
+ length = len;
+ enlarge(2 + byteLength);
+ data = this.data;
+ }
+ for (int j = i; j < charLength; ++j) {
+ c = s.charAt(j);
+ if (c >= '\001' && c <= '\177') {
+ data[len++] = (byte) c;
+ } else if (c > '\u07FF') {
+ data[len++] = (byte) (0xE0 | c >> 12 & 0xF);
+ data[len++] = (byte) (0x80 | c >> 6 & 0x3F);
+ data[len++] = (byte) (0x80 | c & 0x3F);
+ } else {
+ data[len++] = (byte) (0xC0 | c >> 6 & 0x1F);
+ data[len++] = (byte) (0x80 | c & 0x3F);
+ }
+ }
+ break;
+ }
+ }
+ length = len;
+ return this;
+ }
+
+ /**
+ * Puts an array of bytes into this byte vector. The byte vector is
+ * automatically enlarged if necessary.
+ *
+ * @param b an array of bytes. May be <tt>null</tt> to put <tt>len</tt>
+ * null bytes into this byte vector.
+ * @param off index of the fist byte of b that must be copied.
+ * @param len number of bytes of b that must be copied.
+ * @return this byte vector.
+ */
+ public ByteVector putByteArray(final byte[] b, final int off, final int len)
+ {
+ if (length + len > data.length) {
+ enlarge(len);
+ }
+ if (b != null) {
+ System.arraycopy(b, off, data, length, len);
+ }
+ length += len;
+ return this;
+ }
+
+ /**
+ * Enlarge this byte vector so that it can receive n more bytes.
+ *
+ * @param size number of additional bytes that this byte vector should be
+ * able to receive.
+ */
+ private void enlarge(final int size) {
+ int length1 = 2 * data.length;
+ int length2 = length + size;
+ byte[] newData = new byte[length1 > length2 ? length1 : length2];
+ System.arraycopy(data, 0, newData, 0, length);
+ data = newData;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
new file mode 100644
index 0000000..99d8a10
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
@@ -0,0 +1,2245 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A Java class parser to make a {@link ClassVisitor} visit an existing class.
+ * This class parses a byte array conforming to the Java class file format and
+ * calls the appropriate visit methods of a given class visitor for each field,
+ * method and bytecode instruction encountered.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class ClassReader {
+
+ /**
+ * True to enable signatures support.
+ */
+ static final boolean SIGNATURES = true;
+
+ /**
+ * True to enable annotations support.
+ */
+ static final boolean ANNOTATIONS = true;
+
+ /**
+ * True to enable stack map frames support.
+ */
+ static final boolean FRAMES = true;
+
+ /**
+ * True to enable bytecode writing support.
+ */
+ static final boolean WRITER = true;
+
+ /**
+ * True to enable JSR_W and GOTO_W support.
+ */
+ static final boolean RESIZE = true;
+
+ /**
+ * Flag to skip method code. If this class is set <code>CODE</code>
+ * attribute won't be visited. This can be used, for example, to retrieve
+ * annotations for methods and method parameters.
+ */
+ public static final int SKIP_CODE = 1;
+
+ /**
+ * Flag to skip the debug information in the class. If this flag is set the
+ * debug information of the class is not visited, i.e. the
+ * {@link MethodVisitor#visitLocalVariable visitLocalVariable} and
+ * {@link MethodVisitor#visitLineNumber visitLineNumber} methods will not be
+ * called.
+ */
+ public static final int SKIP_DEBUG = 2;
+
+ /**
+ * Flag to skip the stack map frames in the class. If this flag is set the
+ * stack map frames of the class is not visited, i.e. the
+ * {@link MethodVisitor#visitFrame visitFrame} method will not be called.
+ * This flag is useful when the {@link ClassWriter#COMPUTE_FRAMES} option is
+ * used: it avoids visiting frames that will be ignored and recomputed from
+ * scratch in the class writer.
+ */
+ public static final int SKIP_FRAMES = 4;
+
+ /**
+ * Flag to expand the stack map frames. By default stack map frames are
+ * visited in their original format (i.e. "expanded" for classes whose
+ * version is less than V1_6, and "compressed" for the other classes). If
+ * this flag is set, stack map frames are always visited in expanded format
+ * (this option adds a decompression/recompression step in ClassReader and
+ * ClassWriter which degrades performances quite a lot).
+ */
+ public static final int EXPAND_FRAMES = 8;
+
+ /**
+ * The class to be parsed. <i>The content of this array must not be
+ * modified. This field is intended for {@link Attribute} sub classes, and
+ * is normally not needed by class generators or adapters.</i>
+ */
+ public final byte[] b;
+
+ /**
+ * The start index of each constant pool item in {@link #b b}, plus one.
+ * The one byte offset skips the constant pool item tag that indicates its
+ * type.
+ */
+ private final int[] items;
+
+ /**
+ * The String objects corresponding to the CONSTANT_Utf8 items. This cache
+ * avoids multiple parsing of a given CONSTANT_Utf8 constant pool item,
+ * which GREATLY improves performances (by a factor 2 to 3). This caching
+ * strategy could be extended to all constant pool items, but its benefit
+ * would not be so great for these items (because they are much less
+ * expensive to parse than CONSTANT_Utf8 items).
+ */
+ private final String[] strings;
+
+ /**
+ * Maximum length of the strings contained in the constant pool of the
+ * class.
+ */
+ private final int maxStringLength;
+
+ /**
+ * Start index of the class header information (access, name...) in
+ * {@link #b b}.
+ */
+ public final int header;
+
+ // ------------------------------------------------------------------------
+ // Constructors
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new {@link ClassReader} object.
+ *
+ * @param b the bytecode of the class to be read.
+ */
+ public ClassReader(final byte[] b) {
+ this(b, 0, b.length);
+ }
+
+ /**
+ * Constructs a new {@link ClassReader} object.
+ *
+ * @param b the bytecode of the class to be read.
+ * @param off the start offset of the class data.
+ * @param len the length of the class data.
+ */
+ public ClassReader(final byte[] b, final int off, final int len) {
+ this.b = b;
+ // checks the class version
+ if (readShort(6) > Opcodes.V1_7) {
+ throw new IllegalArgumentException();
+ }
+ // parses the constant pool
+ items = new int[readUnsignedShort(off + 8)];
+ int n = items.length;
+ strings = new String[n];
+ int max = 0;
+ int index = off + 10;
+ for (int i = 1; i < n; ++i) {
+ items[i] = index + 1;
+ int size;
+ switch (b[index]) {
+ case ClassWriter.FIELD:
+ case ClassWriter.METH:
+ case ClassWriter.IMETH:
+ case ClassWriter.INT:
+ case ClassWriter.FLOAT:
+ case ClassWriter.NAME_TYPE:
+ case ClassWriter.INDY:
+ size = 5;
+ break;
+ case ClassWriter.LONG:
+ case ClassWriter.DOUBLE:
+ size = 9;
+ ++i;
+ break;
+ case ClassWriter.UTF8:
+ size = 3 + readUnsignedShort(index + 1);
+ if (size > max) {
+ max = size;
+ }
+ break;
+ case ClassWriter.HANDLE:
+ size = 4;
+ break;
+ // case ClassWriter.CLASS:
+ // case ClassWriter.STR:
+ // case ClassWriter.MTYPE
+ default:
+ size = 3;
+ break;
+ }
+ index += size;
+ }
+ maxStringLength = max;
+ // the class header information starts just after the constant pool
+ header = index;
+ }
+
+ /**
+ * Returns the class's access flags (see {@link Opcodes}). This value may
+ * not reflect Deprecated and Synthetic flags when bytecode is before 1.5
+ * and those flags are represented by attributes.
+ *
+ * @return the class access flags
+ *
+ * @see ClassVisitor#visit(int, int, String, String, String, String[])
+ */
+ public int getAccess() {
+ return readUnsignedShort(header);
+ }
+
+ /**
+ * Returns the internal name of the class (see
+ * {@link Type#getInternalName() getInternalName}).
+ *
+ * @return the internal class name
+ *
+ * @see ClassVisitor#visit(int, int, String, String, String, String[])
+ */
+ public String getClassName() {
+ return readClass(header + 2, new char[maxStringLength]);
+ }
+
+ /**
+ * Returns the internal of name of the super class (see
+ * {@link Type#getInternalName() getInternalName}). For interfaces, the
+ * super class is {@link Object}.
+ *
+ * @return the internal name of super class, or <tt>null</tt> for
+ * {@link Object} class.
+ *
+ * @see ClassVisitor#visit(int, int, String, String, String, String[])
+ */
+ public String getSuperName() {
+ int n = items[readUnsignedShort(header + 4)];
+ return n == 0 ? null : readUTF8(n, new char[maxStringLength]);
+ }
+
+ /**
+ * Returns the internal names of the class's interfaces (see
+ * {@link Type#getInternalName() getInternalName}).
+ *
+ * @return the array of internal names for all implemented interfaces or
+ * <tt>null</tt>.
+ *
+ * @see ClassVisitor#visit(int, int, String, String, String, String[])
+ */
+ public String[] getInterfaces() {
+ int index = header + 6;
+ int n = readUnsignedShort(index);
+ String[] interfaces = new String[n];
+ if (n > 0) {
+ char[] buf = new char[maxStringLength];
+ for (int i = 0; i < n; ++i) {
+ index += 2;
+ interfaces[i] = readClass(index, buf);
+ }
+ }
+ return interfaces;
+ }
+
+ /**
+ * Copies the constant pool data into the given {@link ClassWriter}. Should
+ * be called before the {@link #accept(ClassVisitor,int)} method.
+ *
+ * @param classWriter the {@link ClassWriter} to copy constant pool into.
+ */
+ void copyPool(final ClassWriter classWriter) {
+ char[] buf = new char[maxStringLength];
+ int ll = items.length;
+ Item[] items2 = new Item[ll];
+ for (int i = 1; i < ll; i++) {
+ int index = items[i];
+ int tag = b[index - 1];
+ Item item = new Item(i);
+ int nameType;
+ switch (tag) {
+ case ClassWriter.FIELD:
+ case ClassWriter.METH:
+ case ClassWriter.IMETH:
+ nameType = items[readUnsignedShort(index + 2)];
+ item.set(tag,
+ readClass(index, buf),
+ readUTF8(nameType, buf),
+ readUTF8(nameType + 2, buf));
+ break;
+
+ case ClassWriter.INT:
+ item.set(readInt(index));
+ break;
+
+ case ClassWriter.FLOAT:
+ item.set(Float.intBitsToFloat(readInt(index)));
+ break;
+
+ case ClassWriter.NAME_TYPE:
+ item.set(tag,
+ readUTF8(index, buf),
+ readUTF8(index + 2, buf),
+ null);
+ break;
+
+ case ClassWriter.LONG:
+ item.set(readLong(index));
+ ++i;
+ break;
+
+ case ClassWriter.DOUBLE:
+ item.set(Double.longBitsToDouble(readLong(index)));
+ ++i;
+ break;
+
+ case ClassWriter.UTF8: {
+ String s = strings[i];
+ if (s == null) {
+ index = items[i];
+ s = strings[i] = readUTF(index + 2,
+ readUnsignedShort(index),
+ buf);
+ }
+ item.set(tag, s, null, null);
+ }
+ break;
+
+ case ClassWriter.HANDLE: {
+ int fieldOrMethodRef = items[readUnsignedShort(index + 1)];
+ nameType = items[readUnsignedShort(fieldOrMethodRef + 2)];
+ item.set(ClassWriter.HANDLE_BASE + readByte(index),
+ readClass(fieldOrMethodRef, buf),
+ readUTF8(nameType, buf),
+ readUTF8(nameType + 2, buf));
+
+ }
+ break;
+
+
+ case ClassWriter.INDY:
+ if (classWriter.bootstrapMethods == null) {
+ copyBootstrapMethods(classWriter, items2, buf);
+ }
+ nameType = items[readUnsignedShort(index + 2)];
+ item.set(readUTF8(nameType, buf),
+ readUTF8(nameType + 2, buf),
+ readUnsignedShort(index));
+ break;
+
+
+ // case ClassWriter.STR:
+ // case ClassWriter.CLASS:
+ // case ClassWriter.MTYPE
+ default:
+ item.set(tag, readUTF8(index, buf), null, null);
+ break;
+ }
+
+ int index2 = item.hashCode % items2.length;
+ item.next = items2[index2];
+ items2[index2] = item;
+ }
+
+ int off = items[1] - 1;
+ classWriter.pool.putByteArray(b, off, header - off);
+ classWriter.items = items2;
+ classWriter.threshold = (int) (0.75d * ll);
+ classWriter.index = ll;
+ }
+
+ private void copyBootstrapMethods(ClassWriter classWriter, Item[] items2, char[] buf) {
+ int i, j, k, u, v;
+
+ // skip class header
+ v = header;
+ v += 8 + (readUnsignedShort(v + 6) << 1);
+
+ // skips fields and methods
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ j = readUnsignedShort(v + 6);
+ v += 8;
+ for (; j > 0; --j) {
+ v += 6 + readInt(v + 2);
+ }
+ }
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ j = readUnsignedShort(v + 6);
+ v += 8;
+ for (; j > 0; --j) {
+ v += 6 + readInt(v + 2);
+ }
+ }
+
+ // read class attributes
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ String attrName = readUTF8(v, buf);
+ int size = readInt(v + 2);
+ if ("BootstrapMethods".equals(attrName)) {
+ int boostrapMethodCount = readUnsignedShort(v + 6);
+ int x = v + 8;
+ for (j = 0; j < boostrapMethodCount; j++) {
+ int hashCode = readConst(readUnsignedShort(x), buf).hashCode();
+ k = readUnsignedShort(x + 2);
+ u = x + 4;
+ for(; k > 0; --k) {
+ hashCode ^= readConst(readUnsignedShort(u), buf).hashCode();
+ u += 2;
+ }
+ Item item = new Item(j);
+ item.set(x - v - 8, hashCode & 0x7FFFFFFF);
+
+ int index2 = item.hashCode % items2.length;
+ item.next = items2[index2];
+ items2[index2] = item;
+
+ x = u;
+ }
+
+ classWriter.bootstrapMethodsCount = boostrapMethodCount;
+ ByteVector bootstrapMethods = new ByteVector(size + 62);
+ bootstrapMethods.putByteArray(b, v + 8, size - 2);
+ classWriter.bootstrapMethods = bootstrapMethods;
+ return;
+ }
+ v += 6 + size;
+ }
+
+ // we are in trouble !!!
+ }
+
+ /**
+ * Constructs a new {@link ClassReader} object.
+ *
+ * @param is an input stream from which to read the class.
+ * @throws IOException if a problem occurs during reading.
+ */
+ public ClassReader(final InputStream is) throws IOException {
+ this(readClass(is, false));
+ }
+
+ /**
+ * Constructs a new {@link ClassReader} object.
+ *
+ * @param name the binary qualified name of the class to be read.
+ * @throws IOException if an exception occurs during reading.
+ */
+ public ClassReader(final String name) throws IOException {
+ this(readClass(ClassLoader.getSystemResourceAsStream(name.replace('.', '/')
+ + ".class"), true));
+ }
+
+ /**
+ * Reads the bytecode of a class.
+ *
+ * @param is an input stream from which to read the class.
+ * @param close true to close the input stream after reading.
+ * @return the bytecode read from the given input stream.
+ * @throws IOException if a problem occurs during reading.
+ */
+ private static byte[] readClass(final InputStream is, boolean close)
+ throws IOException
+ {
+ if (is == null) {
+ throw new IOException("Class not found");
+ }
+ try {
+ byte[] b = new byte[is.available()];
+ int len = 0;
+ while (true) {
+ int n = is.read(b, len, b.length - len);
+ if (n == -1) {
+ if (len < b.length) {
+ byte[] c = new byte[len];
+ System.arraycopy(b, 0, c, 0, len);
+ b = c;
+ }
+ return b;
+ }
+ len += n;
+ if (len == b.length) {
+ int last = is.read();
+ if (last < 0) {
+ return b;
+ }
+ byte[] c = new byte[b.length + 1000];
+ System.arraycopy(b, 0, c, 0, len);
+ c[len++] = (byte) last;
+ b = c;
+ }
+ }
+ } finally {
+ if (close) {
+ is.close();
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Public methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Makes the given visitor visit the Java class of this {@link ClassReader}.
+ * This class is the one specified in the constructor (see
+ * {@link #ClassReader(byte[]) ClassReader}).
+ *
+ * @param classVisitor the visitor that must visit this class.
+ * @param flags option flags that can be used to modify the default behavior
+ * of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES},
+ * {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+ */
+ public void accept(final ClassVisitor classVisitor, final int flags) {
+ accept(classVisitor, new Attribute[0], flags);
+ }
+
+ /**
+ * Makes the given visitor visit the Java class of this {@link ClassReader}.
+ * This class is the one specified in the constructor (see
+ * {@link #ClassReader(byte[]) ClassReader}).
+ *
+ * @param classVisitor the visitor that must visit this class.
+ * @param attrs prototypes of the attributes that must be parsed during the
+ * visit of the class. Any attribute whose type is not equal to the
+ * type of one the prototypes will not be parsed: its byte array
+ * value will be passed unchanged to the ClassWriter. <i>This may
+ * corrupt it if this value contains references to the constant pool,
+ * or has syntactic or semantic links with a class element that has
+ * been transformed by a class adapter between the reader and the
+ * writer</i>.
+ * @param flags option flags that can be used to modify the default behavior
+ * of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES},
+ * {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+ */
+ public void accept(
+ final ClassVisitor classVisitor,
+ final Attribute[] attrs,
+ final int flags)
+ {
+ byte[] b = this.b; // the bytecode array
+ char[] c = new char[maxStringLength]; // buffer used to read strings
+ int i, j, k; // loop variables
+ int u, v, w; // indexes in b
+ Attribute attr;
+
+ int access;
+ String name;
+ String desc;
+ String attrName;
+ String signature;
+ int anns = 0;
+ int ianns = 0;
+ Attribute cattrs = null;
+
+ // visits the header
+ u = header;
+ access = readUnsignedShort(u);
+ name = readClass(u + 2, c);
+ v = items[readUnsignedShort(u + 4)];
+ String superClassName = v == 0 ? null : readUTF8(v, c);
+ String[] implementedItfs = new String[readUnsignedShort(u + 6)];
+ w = 0;
+ u += 8;
+ for (i = 0; i < implementedItfs.length; ++i) {
+ implementedItfs[i] = readClass(u, c);
+ u += 2;
+ }
+
+ boolean skipCode = (flags & SKIP_CODE) != 0;
+ boolean skipDebug = (flags & SKIP_DEBUG) != 0;
+ boolean unzip = (flags & EXPAND_FRAMES) != 0;
+
+ // skips fields and methods
+ v = u;
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ j = readUnsignedShort(v + 6);
+ v += 8;
+ for (; j > 0; --j) {
+ v += 6 + readInt(v + 2);
+ }
+ }
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ j = readUnsignedShort(v + 6);
+ v += 8;
+ for (; j > 0; --j) {
+ v += 6 + readInt(v + 2);
+ }
+ }
+ // reads the class's attributes
+ signature = null;
+ String sourceFile = null;
+ String sourceDebug = null;
+ String enclosingOwner = null;
+ String enclosingName = null;
+ String enclosingDesc = null;
+ int[] bootstrapMethods = null; // start indexed of the bsms
+
+ i = readUnsignedShort(v);
+ v += 2;
+ for (; i > 0; --i) {
+ attrName = readUTF8(v, c);
+ // tests are sorted in decreasing frequency order
+ // (based on frequencies observed on typical classes)
+ if ("SourceFile".equals(attrName)) {
+ sourceFile = readUTF8(v + 6, c);
+ } else if ("InnerClasses".equals(attrName)) {
+ w = v + 6;
+ } else if ("EnclosingMethod".equals(attrName)) {
+ enclosingOwner = readClass(v + 6, c);
+ int item = readUnsignedShort(v + 8);
+ if (item != 0) {
+ enclosingName = readUTF8(items[item], c);
+ enclosingDesc = readUTF8(items[item] + 2, c);
+ }
+ } else if (SIGNATURES && "Signature".equals(attrName)) {
+ signature = readUTF8(v + 6, c);
+ } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+ anns = v + 6;
+ } else if ("Deprecated".equals(attrName)) {
+ access |= Opcodes.ACC_DEPRECATED;
+ } else if ("Synthetic".equals(attrName)) {
+ access |= Opcodes.ACC_SYNTHETIC | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+ } else if ("SourceDebugExtension".equals(attrName)) {
+ int len = readInt(v + 2);
+ sourceDebug = readUTF(v + 6, len, new char[len]);
+ } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+ ianns = v + 6;
+ } else if ("BootstrapMethods".equals(attrName)) {
+ int boostrapMethodCount = readUnsignedShort(v + 6);
+ bootstrapMethods = new int[boostrapMethodCount];
+ int x = v + 8;
+ for (j = 0; j < boostrapMethodCount; j++) {
+ bootstrapMethods[j] = x;
+ x += 2 + readUnsignedShort(x + 2) << 1;
+ }
+ } else {
+ attr = readAttribute(attrs,
+ attrName,
+ v + 6,
+ readInt(v + 2),
+ c,
+ -1,
+ null);
+ if (attr != null) {
+ attr.next = cattrs;
+ cattrs = attr;
+ }
+ }
+ v += 6 + readInt(v + 2);
+ }
+ // calls the visit method
+ classVisitor.visit(readInt(4),
+ access,
+ name,
+ signature,
+ superClassName,
+ implementedItfs);
+
+ // calls the visitSource method
+ if (!skipDebug && (sourceFile != null || sourceDebug != null)) {
+ classVisitor.visitSource(sourceFile, sourceDebug);
+ }
+
+ // calls the visitOuterClass method
+ if (enclosingOwner != null) {
+ classVisitor.visitOuterClass(enclosingOwner,
+ enclosingName,
+ enclosingDesc);
+ }
+
+ // visits the class annotations
+ if (ANNOTATIONS) {
+ for (i = 1; i >= 0; --i) {
+ v = i == 0 ? ianns : anns;
+ if (v != 0) {
+ j = readUnsignedShort(v);
+ v += 2;
+ for (; j > 0; --j) {
+ v = readAnnotationValues(v + 2,
+ c,
+ true,
+ classVisitor.visitAnnotation(readUTF8(v, c), i != 0));
+ }
+ }
+ }
+ }
+
+ // visits the class attributes
+ while (cattrs != null) {
+ attr = cattrs.next;
+ cattrs.next = null;
+ classVisitor.visitAttribute(cattrs);
+ cattrs = attr;
+ }
+
+ // calls the visitInnerClass method
+ if (w != 0) {
+ i = readUnsignedShort(w);
+ w += 2;
+ for (; i > 0; --i) {
+ classVisitor.visitInnerClass(readUnsignedShort(w) == 0
+ ? null
+ : readClass(w, c), readUnsignedShort(w + 2) == 0
+ ? null
+ : readClass(w + 2, c), readUnsignedShort(w + 4) == 0
+ ? null
+ : readUTF8(w + 4, c), readUnsignedShort(w + 6));
+ w += 8;
+ }
+ }
+
+ // visits the fields
+ i = readUnsignedShort(u);
+ u += 2;
+ for (; i > 0; --i) {
+ access = readUnsignedShort(u);
+ name = readUTF8(u + 2, c);
+ desc = readUTF8(u + 4, c);
+ // visits the field's attributes and looks for a ConstantValue
+ // attribute
+ int fieldValueItem = 0;
+ signature = null;
+ anns = 0;
+ ianns = 0;
+ cattrs = null;
+
+ j = readUnsignedShort(u + 6);
+ u += 8;
+ for (; j > 0; --j) {
+ attrName = readUTF8(u, c);
+ // tests are sorted in decreasing frequency order
+ // (based on frequencies observed on typical classes)
+ if ("ConstantValue".equals(attrName)) {
+ fieldValueItem = readUnsignedShort(u + 6);
+ } else if (SIGNATURES && "Signature".equals(attrName)) {
+ signature = readUTF8(u + 6, c);
+ } else if ("Deprecated".equals(attrName)) {
+ access |= Opcodes.ACC_DEPRECATED;
+ } else if ("Synthetic".equals(attrName)) {
+ access |= Opcodes.ACC_SYNTHETIC | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+ } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+ anns = u + 6;
+ } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+ ianns = u + 6;
+ } else {
+ attr = readAttribute(attrs,
+ attrName,
+ u + 6,
+ readInt(u + 2),
+ c,
+ -1,
+ null);
+ if (attr != null) {
+ attr.next = cattrs;
+ cattrs = attr;
+ }
+ }
+ u += 6 + readInt(u + 2);
+ }
+ // visits the field
+ FieldVisitor fv = classVisitor.visitField(access,
+ name,
+ desc,
+ signature,
+ fieldValueItem == 0 ? null : readConst(fieldValueItem, c));
+ // visits the field annotations and attributes
+ if (fv != null) {
+ if (ANNOTATIONS) {
+ for (j = 1; j >= 0; --j) {
+ v = j == 0 ? ianns : anns;
+ if (v != 0) {
+ k = readUnsignedShort(v);
+ v += 2;
+ for (; k > 0; --k) {
+ v = readAnnotationValues(v + 2,
+ c,
+ true,
+ fv.visitAnnotation(readUTF8(v, c), j != 0));
+ }
+ }
+ }
+ }
+ while (cattrs != null) {
+ attr = cattrs.next;
+ cattrs.next = null;
+ fv.visitAttribute(cattrs);
+ cattrs = attr;
+ }
+ fv.visitEnd();
+ }
+ }
+
+ // visits the methods
+ i = readUnsignedShort(u);
+ u += 2;
+ for (; i > 0; --i) {
+ int u0 = u + 6;
+ access = readUnsignedShort(u);
+ name = readUTF8(u + 2, c);
+ desc = readUTF8(u + 4, c);
+ signature = null;
+ anns = 0;
+ ianns = 0;
+ int dann = 0;
+ int mpanns = 0;
+ int impanns = 0;
+ cattrs = null;
+ v = 0;
+ w = 0;
+
+ // looks for Code and Exceptions attributes
+ j = readUnsignedShort(u + 6);
+ u += 8;
+ for (; j > 0; --j) {
+ attrName = readUTF8(u, c);
+ int attrSize = readInt(u + 2);
+ u += 6;
+ // tests are sorted in decreasing frequency order
+ // (based on frequencies observed on typical classes)
+ if ("Code".equals(attrName)) {
+ if (!skipCode) {
+ v = u;
+ }
+ } else if ("Exceptions".equals(attrName)) {
+ w = u;
+ } else if (SIGNATURES && "Signature".equals(attrName)) {
+ signature = readUTF8(u, c);
+ } else if ("Deprecated".equals(attrName)) {
+ access |= Opcodes.ACC_DEPRECATED;
+ } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+ anns = u;
+ } else if (ANNOTATIONS && "AnnotationDefault".equals(attrName)) {
+ dann = u;
+ } else if ("Synthetic".equals(attrName)) {
+ access |= Opcodes.ACC_SYNTHETIC | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE;
+ } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+ ianns = u;
+ } else if (ANNOTATIONS && "RuntimeVisibleParameterAnnotations".equals(attrName))
+ {
+ mpanns = u;
+ } else if (ANNOTATIONS && "RuntimeInvisibleParameterAnnotations".equals(attrName))
+ {
+ impanns = u;
+ } else {
+ attr = readAttribute(attrs,
+ attrName,
+ u,
+ attrSize,
+ c,
+ -1,
+ null);
+ if (attr != null) {
+ attr.next = cattrs;
+ cattrs = attr;
+ }
+ }
+ u += attrSize;
+ }
+ // reads declared exceptions
+ String[] exceptions;
+ if (w == 0) {
+ exceptions = null;
+ } else {
+ exceptions = new String[readUnsignedShort(w)];
+ w += 2;
+ for (j = 0; j < exceptions.length; ++j) {
+ exceptions[j] = readClass(w, c);
+ w += 2;
+ }
+ }
+
+ // visits the method's code, if any
+ MethodVisitor mv = classVisitor.visitMethod(access,
+ name,
+ desc,
+ signature,
+ exceptions);
+
+ if (mv != null) {
+ /*
+ * if the returned MethodVisitor is in fact a MethodWriter, it
+ * means there is no method adapter between the reader and the
+ * writer. If, in addition, the writer's constant pool was
+ * copied from this reader (mw.cw.cr == this), and the signature
+ * and exceptions of the method have not been changed, then it
+ * is possible to skip all visit events and just copy the
+ * original code of the method to the writer (the access, name
+ * and descriptor can have been changed, this is not important
+ * since they are not copied as is from the reader).
+ */
+ if (WRITER && mv instanceof MethodWriter) {
+ MethodWriter mw = (MethodWriter) mv;
+ if (mw.cw.cr == this) {
+ if (signature == mw.signature) {
+ boolean sameExceptions = false;
+ if (exceptions == null) {
+ sameExceptions = mw.exceptionCount == 0;
+ } else {
+ if (exceptions.length == mw.exceptionCount) {
+ sameExceptions = true;
+ for (j = exceptions.length - 1; j >= 0; --j)
+ {
+ w -= 2;
+ if (mw.exceptions[j] != readUnsignedShort(w))
+ {
+ sameExceptions = false;
+ break;
+ }
+ }
+ }
+ }
+ if (sameExceptions) {
+ /*
+ * we do not copy directly the code into
+ * MethodWriter to save a byte array copy
+ * operation. The real copy will be done in
+ * ClassWriter.toByteArray().
+ */
+ mw.classReaderOffset = u0;
+ mw.classReaderLength = u - u0;
+ continue;
+ }
+ }
+ }
+ }
+
+ if (ANNOTATIONS && dann != 0) {
+ AnnotationVisitor dv = mv.visitAnnotationDefault();
+ readAnnotationValue(dann, c, null, dv);
+ if (dv != null) {
+ dv.visitEnd();
+ }
+ }
+ if (ANNOTATIONS) {
+ for (j = 1; j >= 0; --j) {
+ w = j == 0 ? ianns : anns;
+ if (w != 0) {
+ k = readUnsignedShort(w);
+ w += 2;
+ for (; k > 0; --k) {
+ w = readAnnotationValues(w + 2,
+ c,
+ true,
+ mv.visitAnnotation(readUTF8(w, c), j != 0));
+ }
+ }
+ }
+ }
+ if (ANNOTATIONS && mpanns != 0) {
+ readParameterAnnotations(mpanns, desc, c, true, mv);
+ }
+ if (ANNOTATIONS && impanns != 0) {
+ readParameterAnnotations(impanns, desc, c, false, mv);
+ }
+ while (cattrs != null) {
+ attr = cattrs.next;
+ cattrs.next = null;
+ mv.visitAttribute(cattrs);
+ cattrs = attr;
+ }
+ }
+
+ if (mv != null && v != 0) {
+ int maxStack = readUnsignedShort(v);
+ int maxLocals = readUnsignedShort(v + 2);
+ int codeLength = readInt(v + 4);
+ v += 8;
+
+ int codeStart = v;
+ int codeEnd = v + codeLength;
+
+ mv.visitCode();
+
+ // 1st phase: finds the labels
+ int label;
+ Label[] labels = new Label[codeLength + 2];
+ readLabel(codeLength + 1, labels);
+ while (v < codeEnd) {
+ w = v - codeStart;
+ int opcode = b[v] & 0xFF;
+ switch (ClassWriter.TYPE[opcode]) {
+ case ClassWriter.NOARG_INSN:
+ case ClassWriter.IMPLVAR_INSN:
+ v += 1;
+ break;
+ case ClassWriter.LABEL_INSN:
+ readLabel(w + readShort(v + 1), labels);
+ v += 3;
+ break;
+ case ClassWriter.LABELW_INSN:
+ readLabel(w + readInt(v + 1), labels);
+ v += 5;
+ break;
+ case ClassWriter.WIDE_INSN:
+ opcode = b[v + 1] & 0xFF;
+ if (opcode == Opcodes.IINC) {
+ v += 6;
+ } else {
+ v += 4;
+ }
+ break;
+ case ClassWriter.TABL_INSN:
+ // skips 0 to 3 padding bytes*
+ v = v + 4 - (w & 3);
+ // reads instruction
+ readLabel(w + readInt(v), labels);
+ j = readInt(v + 8) - readInt(v + 4) + 1;
+ v += 12;
+ for (; j > 0; --j) {
+ readLabel(w + readInt(v), labels);
+ v += 4;
+ }
+ break;
+ case ClassWriter.LOOK_INSN:
+ // skips 0 to 3 padding bytes*
+ v = v + 4 - (w & 3);
+ // reads instruction
+ readLabel(w + readInt(v), labels);
+ j = readInt(v + 4);
+ v += 8;
+ for (; j > 0; --j) {
+ readLabel(w + readInt(v + 4), labels);
+ v += 8;
+ }
+ break;
+ case ClassWriter.VAR_INSN:
+ case ClassWriter.SBYTE_INSN:
+ case ClassWriter.LDC_INSN:
+ v += 2;
+ break;
+ case ClassWriter.SHORT_INSN:
+ case ClassWriter.LDCW_INSN:
+ case ClassWriter.FIELDORMETH_INSN:
+ case ClassWriter.TYPE_INSN:
+ case ClassWriter.IINC_INSN:
+ v += 3;
+ break;
+ case ClassWriter.ITFMETH_INSN:
+ case ClassWriter.INDYMETH_INSN:
+ v += 5;
+ break;
+ // case MANA_INSN:
+ default:
+ v += 4;
+ break;
+ }
+ }
+ // parses the try catch entries
+ j = readUnsignedShort(v);
+ v += 2;
+ for (; j > 0; --j) {
+ Label start = readLabel(readUnsignedShort(v), labels);
+ Label end = readLabel(readUnsignedShort(v + 2), labels);
+ Label handler = readLabel(readUnsignedShort(v + 4), labels);
+ int type = readUnsignedShort(v + 6);
+ if (type == 0) {
+ mv.visitTryCatchBlock(start, end, handler, null);
+ } else {
+ mv.visitTryCatchBlock(start,
+ end,
+ handler,
+ readUTF8(items[type], c));
+ }
+ v += 8;
+ }
+ // parses the local variable, line number tables, and code
+ // attributes
+ int varTable = 0;
+ int varTypeTable = 0;
+ int stackMap = 0;
+ int stackMapSize = 0;
+ int frameCount = 0;
+ int frameMode = 0;
+ int frameOffset = 0;
+ int frameLocalCount = 0;
+ int frameLocalDiff = 0;
+ int frameStackCount = 0;
+ Object[] frameLocal = null;
+ Object[] frameStack = null;
+ boolean zip = true;
+ cattrs = null;
+ j = readUnsignedShort(v);
+ v += 2;
+ for (; j > 0; --j) {
+ attrName = readUTF8(v, c);
+ if ("LocalVariableTable".equals(attrName)) {
+ if (!skipDebug) {
+ varTable = v + 6;
+ k = readUnsignedShort(v + 6);
+ w = v + 8;
+ for (; k > 0; --k) {
+ label = readUnsignedShort(w);
+ if (labels[label] == null) {
+ readLabel(label, labels).status |= Label.DEBUG;
+ }
+ label += readUnsignedShort(w + 2);
+ if (labels[label] == null) {
+ readLabel(label, labels).status |= Label.DEBUG;
+ }
+ w += 10;
+ }
+ }
+ } else if ("LocalVariableTypeTable".equals(attrName)) {
+ varTypeTable = v + 6;
+ } else if ("LineNumberTable".equals(attrName)) {
+ if (!skipDebug) {
+ k = readUnsignedShort(v + 6);
+ w = v + 8;
+ for (; k > 0; --k) {
+ label = readUnsignedShort(w);
+ if (labels[label] == null) {
+ readLabel(label, labels).status |= Label.DEBUG;
+ }
+ labels[label].line = readUnsignedShort(w + 2);
+ w += 4;
+ }
+ }
+ } else if (FRAMES && "StackMapTable".equals(attrName)) {
+ if ((flags & SKIP_FRAMES) == 0) {
+ stackMap = v + 8;
+ stackMapSize = readInt(v + 2);
+ frameCount = readUnsignedShort(v + 6);
+ }
+ /*
+ * here we do not extract the labels corresponding to
+ * the attribute content. This would require a full
+ * parsing of the attribute, which would need to be
+ * repeated in the second phase (see below). Instead the
+ * content of the attribute is read one frame at a time
+ * (i.e. after a frame has been visited, the next frame
+ * is read), and the labels it contains are also
+ * extracted one frame at a time. Thanks to the ordering
+ * of frames, having only a "one frame lookahead" is not
+ * a problem, i.e. it is not possible to see an offset
+ * smaller than the offset of the current insn and for
+ * which no Label exist.
+ */
+ /*
+ * This is not true for UNINITIALIZED type offsets. We
+ * solve this by parsing the stack map table without a
+ * full decoding (see below).
+ */
+ } else if (FRAMES && "StackMap".equals(attrName)) {
+ if ((flags & SKIP_FRAMES) == 0) {
+ stackMap = v + 8;
+ stackMapSize = readInt(v + 2);
+ frameCount = readUnsignedShort(v + 6);
+ zip = false;
+ }
+ /*
+ * IMPORTANT! here we assume that the frames are
+ * ordered, as in the StackMapTable attribute, although
+ * this is not guaranteed by the attribute format.
+ */
+ } else {
+ for (k = 0; k < attrs.length; ++k) {
+ if (attrs[k].type.equals(attrName)) {
+ attr = attrs[k].read(this,
+ v + 6,
+ readInt(v + 2),
+ c,
+ codeStart - 8,
+ labels);
+ if (attr != null) {
+ attr.next = cattrs;
+ cattrs = attr;
+ }
+ }
+ }
+ }
+ v += 6 + readInt(v + 2);
+ }
+
+ // 2nd phase: visits each instruction
+ if (FRAMES && stackMap != 0) {
+ // creates the very first (implicit) frame from the method
+ // descriptor
+ frameLocal = new Object[maxLocals];
+ frameStack = new Object[maxStack];
+ if (unzip) {
+ int local = 0;
+ if ((access & Opcodes.ACC_STATIC) == 0) {
+ if ("<init>".equals(name)) {
+ frameLocal[local++] = Opcodes.UNINITIALIZED_THIS;
+ } else {
+ frameLocal[local++] = readClass(header + 2, c);
+ }
+ }
+ j = 1;
+ loop: while (true) {
+ k = j;
+ switch (desc.charAt(j++)) {
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ frameLocal[local++] = Opcodes.INTEGER;
+ break;
+ case 'F':
+ frameLocal[local++] = Opcodes.FLOAT;
+ break;
+ case 'J':
+ frameLocal[local++] = Opcodes.LONG;
+ break;
+ case 'D':
+ frameLocal[local++] = Opcodes.DOUBLE;
+ break;
+ case '[':
+ while (desc.charAt(j) == '[') {
+ ++j;
+ }
+ if (desc.charAt(j) == 'L') {
+ ++j;
+ while (desc.charAt(j) != ';') {
+ ++j;
+ }
+ }
+ frameLocal[local++] = desc.substring(k, ++j);
+ break;
+ case 'L':
+ while (desc.charAt(j) != ';') {
+ ++j;
+ }
+ frameLocal[local++] = desc.substring(k + 1,
+ j++);
+ break;
+ default:
+ break loop;
+ }
+ }
+ frameLocalCount = local;
+ }
+ /*
+ * for the first explicit frame the offset is not
+ * offset_delta + 1 but only offset_delta; setting the
+ * implicit frame offset to -1 allow the use of the
+ * "offset_delta + 1" rule in all cases
+ */
+ frameOffset = -1;
+ /*
+ * Finds labels for UNINITIALIZED frame types. Instead of
+ * decoding each element of the stack map table, we look
+ * for 3 consecutive bytes that "look like" an UNINITIALIZED
+ * type (tag 8, offset within code bounds, NEW instruction
+ * at this offset). We may find false positives (i.e. not
+ * real UNINITIALIZED types), but this should be rare, and
+ * the only consequence will be the creation of an unneeded
+ * label. This is better than creating a label for each NEW
+ * instruction, and faster than fully decoding the whole
+ * stack map table.
+ */
+ for (j = stackMap; j < stackMap + stackMapSize - 2; ++j) {
+ if (b[j] == 8) { // UNINITIALIZED FRAME TYPE
+ k = readUnsignedShort(j + 1);
+ if (k >= 0 && k < codeLength) { // potential offset
+ if ((b[codeStart + k] & 0xFF) == Opcodes.NEW) { // NEW at this offset
+ readLabel(k, labels);
+ }
+ }
+ }
+ }
+ }
+ v = codeStart;
+ Label l;
+ while (v < codeEnd) {
+ w = v - codeStart;
+
+ l = labels[w];
+ if (l != null) {
+ mv.visitLabel(l);
+ if (!skipDebug && l.line > 0) {
+ mv.visitLineNumber(l.line, l);
+ }
+ }
+
+ while (FRAMES && frameLocal != null
+ && (frameOffset == w || frameOffset == -1))
+ {
+ // if there is a frame for this offset,
+ // makes the visitor visit it,
+ // and reads the next frame if there is one.
+ if (!zip || unzip) {
+ mv.visitFrame(Opcodes.F_NEW,
+ frameLocalCount,
+ frameLocal,
+ frameStackCount,
+ frameStack);
+ } else if (frameOffset != -1) {
+ mv.visitFrame(frameMode,
+ frameLocalDiff,
+ frameLocal,
+ frameStackCount,
+ frameStack);
+ }
+
+ if (frameCount > 0) {
+ int tag, delta, n;
+ if (zip) {
+ tag = b[stackMap++] & 0xFF;
+ } else {
+ tag = MethodWriter.FULL_FRAME;
+ frameOffset = -1;
+ }
+ frameLocalDiff = 0;
+ if (tag < MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME)
+ {
+ delta = tag;
+ frameMode = Opcodes.F_SAME;
+ frameStackCount = 0;
+ } else if (tag < MethodWriter.RESERVED) {
+ delta = tag
+ - MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME;
+ stackMap = readFrameType(frameStack,
+ 0,
+ stackMap,
+ c,
+ labels);
+ frameMode = Opcodes.F_SAME1;
+ frameStackCount = 1;
+ } else {
+ delta = readUnsignedShort(stackMap);
+ stackMap += 2;
+ if (tag == MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+ {
+ stackMap = readFrameType(frameStack,
+ 0,
+ stackMap,
+ c,
+ labels);
+ frameMode = Opcodes.F_SAME1;
+ frameStackCount = 1;
+ } else if (tag >= MethodWriter.CHOP_FRAME
+ && tag < MethodWriter.SAME_FRAME_EXTENDED)
+ {
+ frameMode = Opcodes.F_CHOP;
+ frameLocalDiff = MethodWriter.SAME_FRAME_EXTENDED
+ - tag;
+ frameLocalCount -= frameLocalDiff;
+ frameStackCount = 0;
+ } else if (tag == MethodWriter.SAME_FRAME_EXTENDED)
+ {
+ frameMode = Opcodes.F_SAME;
+ frameStackCount = 0;
+ } else if (tag < MethodWriter.FULL_FRAME) {
+ j = unzip ? frameLocalCount : 0;
+ for (k = tag
+ - MethodWriter.SAME_FRAME_EXTENDED; k > 0; k--)
+ {
+ stackMap = readFrameType(frameLocal,
+ j++,
+ stackMap,
+ c,
+ labels);
+ }
+ frameMode = Opcodes.F_APPEND;
+ frameLocalDiff = tag
+ - MethodWriter.SAME_FRAME_EXTENDED;
+ frameLocalCount += frameLocalDiff;
+ frameStackCount = 0;
+ } else { // if (tag == FULL_FRAME) {
+ frameMode = Opcodes.F_FULL;
+ n = frameLocalDiff = frameLocalCount = readUnsignedShort(stackMap);
+ stackMap += 2;
+ for (j = 0; n > 0; n--) {
+ stackMap = readFrameType(frameLocal,
+ j++,
+ stackMap,
+ c,
+ labels);
+ }
+ n = frameStackCount = readUnsignedShort(stackMap);
+ stackMap += 2;
+ for (j = 0; n > 0; n--) {
+ stackMap = readFrameType(frameStack,
+ j++,
+ stackMap,
+ c,
+ labels);
+ }
+ }
+ }
+ frameOffset += delta + 1;
+ readLabel(frameOffset, labels);
+
+ --frameCount;
+ } else {
+ frameLocal = null;
+ }
+ }
+
+ int opcode = b[v] & 0xFF;
+ switch (ClassWriter.TYPE[opcode]) {
+ case ClassWriter.NOARG_INSN:
+ mv.visitInsn(opcode);
+ v += 1;
+ break;
+ case ClassWriter.IMPLVAR_INSN:
+ if (opcode > Opcodes.ISTORE) {
+ opcode -= 59; // ISTORE_0
+ mv.visitVarInsn(Opcodes.ISTORE + (opcode >> 2),
+ opcode & 0x3);
+ } else {
+ opcode -= 26; // ILOAD_0
+ mv.visitVarInsn(Opcodes.ILOAD + (opcode >> 2),
+ opcode & 0x3);
+ }
+ v += 1;
+ break;
+ case ClassWriter.LABEL_INSN:
+ mv.visitJumpInsn(opcode, labels[w
+ + readShort(v + 1)]);
+ v += 3;
+ break;
+ case ClassWriter.LABELW_INSN:
+ mv.visitJumpInsn(opcode - 33, labels[w
+ + readInt(v + 1)]);
+ v += 5;
+ break;
+ case ClassWriter.WIDE_INSN:
+ opcode = b[v + 1] & 0xFF;
+ if (opcode == Opcodes.IINC) {
+ mv.visitIincInsn(readUnsignedShort(v + 2),
+ readShort(v + 4));
+ v += 6;
+ } else {
+ mv.visitVarInsn(opcode,
+ readUnsignedShort(v + 2));
+ v += 4;
+ }
+ break;
+ case ClassWriter.TABL_INSN:
+ // skips 0 to 3 padding bytes
+ v = v + 4 - (w & 3);
+ // reads instruction
+ label = w + readInt(v);
+ int min = readInt(v + 4);
+ int max = readInt(v + 8);
+ v += 12;
+ Label[] table = new Label[max - min + 1];
+ for (j = 0; j < table.length; ++j) {
+ table[j] = labels[w + readInt(v)];
+ v += 4;
+ }
+ mv.visitTableSwitchInsn(min,
+ max,
+ labels[label],
+ table);
+ break;
+ case ClassWriter.LOOK_INSN:
+ // skips 0 to 3 padding bytes
+ v = v + 4 - (w & 3);
+ // reads instruction
+ label = w + readInt(v);
+ j = readInt(v + 4);
+ v += 8;
+ int[] keys = new int[j];
+ Label[] values = new Label[j];
+ for (j = 0; j < keys.length; ++j) {
+ keys[j] = readInt(v);
+ values[j] = labels[w + readInt(v + 4)];
+ v += 8;
+ }
+ mv.visitLookupSwitchInsn(labels[label],
+ keys,
+ values);
+ break;
+ case ClassWriter.VAR_INSN:
+ mv.visitVarInsn(opcode, b[v + 1] & 0xFF);
+ v += 2;
+ break;
+ case ClassWriter.SBYTE_INSN:
+ mv.visitIntInsn(opcode, b[v + 1]);
+ v += 2;
+ break;
+ case ClassWriter.SHORT_INSN:
+ mv.visitIntInsn(opcode, readShort(v + 1));
+ v += 3;
+ break;
+ case ClassWriter.LDC_INSN:
+ mv.visitLdcInsn(readConst(b[v + 1] & 0xFF, c));
+ v += 2;
+ break;
+ case ClassWriter.LDCW_INSN:
+ mv.visitLdcInsn(readConst(readUnsignedShort(v + 1),
+ c));
+ v += 3;
+ break;
+ case ClassWriter.FIELDORMETH_INSN:
+ case ClassWriter.ITFMETH_INSN: {
+ int cpIndex = items[readUnsignedShort(v + 1)];
+ String iowner = readClass(cpIndex, c);
+ cpIndex = items[readUnsignedShort(cpIndex + 2)];
+ String iname = readUTF8(cpIndex, c);
+ String idesc = readUTF8(cpIndex + 2, c);
+ if (opcode < Opcodes.INVOKEVIRTUAL) {
+ mv.visitFieldInsn(opcode, iowner, iname, idesc);
+ } else {
+ mv.visitMethodInsn(opcode, iowner, iname, idesc);
+ }
+ if (opcode == Opcodes.INVOKEINTERFACE) {
+ v += 5;
+ } else {
+ v += 3;
+ }
+ break;
+ }
+ case ClassWriter.INDYMETH_INSN: {
+ int cpIndex = items[readUnsignedShort(v + 1)];
+ int bsmIndex = bootstrapMethods[readUnsignedShort(cpIndex)];
+ cpIndex = items[readUnsignedShort(cpIndex + 2)];
+ String iname = readUTF8(cpIndex, c);
+ String idesc = readUTF8(cpIndex + 2, c);
+
+ int mhIndex = readUnsignedShort(bsmIndex);
+ Handle bsm = (Handle) readConst(mhIndex, c);
+ int bsmArgCount = readUnsignedShort(bsmIndex + 2);
+ Object[] bsmArgs = new Object[bsmArgCount];
+ bsmIndex += 4;
+ for(int a = 0; a < bsmArgCount; a++) {
+ int argIndex = readUnsignedShort(bsmIndex);
+ bsmArgs[a] = readConst(argIndex, c);
+ bsmIndex += 2;
+ }
+ mv.visitInvokeDynamicInsn(iname, idesc, bsm, bsmArgs);
+
+ v += 5;
+ break;
+ }
+ case ClassWriter.TYPE_INSN:
+ mv.visitTypeInsn(opcode, readClass(v + 1, c));
+ v += 3;
+ break;
+ case ClassWriter.IINC_INSN:
+ mv.visitIincInsn(b[v + 1] & 0xFF, b[v + 2]);
+ v += 3;
+ break;
+ // case MANA_INSN:
+ default:
+ mv.visitMultiANewArrayInsn(readClass(v + 1, c),
+ b[v + 3] & 0xFF);
+ v += 4;
+ break;
+ }
+ }
+ l = labels[codeEnd - codeStart];
+ if (l != null) {
+ mv.visitLabel(l);
+ }
+ // visits the local variable tables
+ if (!skipDebug && varTable != 0) {
+ int[] typeTable = null;
+ if (varTypeTable != 0) {
+ k = readUnsignedShort(varTypeTable) * 3;
+ w = varTypeTable + 2;
+ typeTable = new int[k];
+ while (k > 0) {
+ typeTable[--k] = w + 6; // signature
+ typeTable[--k] = readUnsignedShort(w + 8); // index
+ typeTable[--k] = readUnsignedShort(w); // start
+ w += 10;
+ }
+ }
+ k = readUnsignedShort(varTable);
+ w = varTable + 2;
+ for (; k > 0; --k) {
+ int start = readUnsignedShort(w);
+ int length = readUnsignedShort(w + 2);
+ int index = readUnsignedShort(w + 8);
+ String vsignature = null;
+ if (typeTable != null) {
+ for (int a = 0; a < typeTable.length; a += 3) {
+ if (typeTable[a] == start
+ && typeTable[a + 1] == index)
+ {
+ vsignature = readUTF8(typeTable[a + 2], c);
+ break;
+ }
+ }
+ }
+ mv.visitLocalVariable(readUTF8(w + 4, c),
+ readUTF8(w + 6, c),
+ vsignature,
+ labels[start],
+ labels[start + length],
+ index);
+ w += 10;
+ }
+ }
+ // visits the other attributes
+ while (cattrs != null) {
+ attr = cattrs.next;
+ cattrs.next = null;
+ mv.visitAttribute(cattrs);
+ cattrs = attr;
+ }
+ // visits the max stack and max locals values
+ mv.visitMaxs(maxStack, maxLocals);
+ }
+
+ if (mv != null) {
+ mv.visitEnd();
+ }
+ }
+
+ // visits the end of the class
+ classVisitor.visitEnd();
+ }
+
+ /**
+ * Reads parameter annotations and makes the given visitor visit them.
+ *
+ * @param v start offset in {@link #b b} of the annotations to be read.
+ * @param desc the method descriptor.
+ * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+ * {@link #readClass(int,char[]) readClass} or
+ * {@link #readConst readConst}.
+ * @param visible <tt>true</tt> if the annotations to be read are visible
+ * at runtime.
+ * @param mv the visitor that must visit the annotations.
+ */
+ private void readParameterAnnotations(
+ int v,
+ final String desc,
+ final char[] buf,
+ final boolean visible,
+ final MethodVisitor mv)
+ {
+ int i;
+ int n = b[v++] & 0xFF;
+ // workaround for a bug in javac (javac compiler generates a parameter
+ // annotation array whose size is equal to the number of parameters in
+ // the Java source file, while it should generate an array whose size is
+ // equal to the number of parameters in the method descriptor - which
+ // includes the synthetic parameters added by the compiler). This work-
+ // around supposes that the synthetic parameters are the first ones.
+ int synthetics = Type.getArgumentTypes(desc).length - n;
+ AnnotationVisitor av;
+ for (i = 0; i < synthetics; ++i) {
+ // virtual annotation to detect synthetic parameters in MethodWriter
+ av = mv.visitParameterAnnotation(i, "Ljava/lang/Synthetic;", false);
+ if (av != null) {
+ av.visitEnd();
+ }
+ }
+ for (; i < n + synthetics; ++i) {
+ int j = readUnsignedShort(v);
+ v += 2;
+ for (; j > 0; --j) {
+ av = mv.visitParameterAnnotation(i, readUTF8(v, buf), visible);
+ v = readAnnotationValues(v + 2, buf, true, av);
+ }
+ }
+ }
+
+ /**
+ * Reads the values of an annotation and makes the given visitor visit them.
+ *
+ * @param v the start offset in {@link #b b} of the values to be read
+ * (including the unsigned short that gives the number of values).
+ * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+ * {@link #readClass(int,char[]) readClass} or
+ * {@link #readConst readConst}.
+ * @param named if the annotation values are named or not.
+ * @param av the visitor that must visit the values.
+ * @return the end offset of the annotation values.
+ */
+ private int readAnnotationValues(
+ int v,
+ final char[] buf,
+ final boolean named,
+ final AnnotationVisitor av)
+ {
+ int i = readUnsignedShort(v);
+ v += 2;
+ if (named) {
+ for (; i > 0; --i) {
+ v = readAnnotationValue(v + 2, buf, readUTF8(v, buf), av);
+ }
+ } else {
+ for (; i > 0; --i) {
+ v = readAnnotationValue(v, buf, null, av);
+ }
+ }
+ if (av != null) {
+ av.visitEnd();
+ }
+ return v;
+ }
+
+ /**
+ * Reads a value of an annotation and makes the given visitor visit it.
+ *
+ * @param v the start offset in {@link #b b} of the value to be read (<i>not
+ * including the value name constant pool index</i>).
+ * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+ * {@link #readClass(int,char[]) readClass} or
+ * {@link #readConst readConst}.
+ * @param name the name of the value to be read.
+ * @param av the visitor that must visit the value.
+ * @return the end offset of the annotation value.
+ */
+ private int readAnnotationValue(
+ int v,
+ final char[] buf,
+ final String name,
+ final AnnotationVisitor av)
+ {
+ int i;
+ if (av == null) {
+ switch (b[v] & 0xFF) {
+ case 'e': // enum_const_value
+ return v + 5;
+ case '@': // annotation_value
+ return readAnnotationValues(v + 3, buf, true, null);
+ case '[': // array_value
+ return readAnnotationValues(v + 1, buf, false, null);
+ default:
+ return v + 3;
+ }
+ }
+ switch (b[v++] & 0xFF) {
+ case 'I': // pointer to CONSTANT_Integer
+ case 'J': // pointer to CONSTANT_Long
+ case 'F': // pointer to CONSTANT_Float
+ case 'D': // pointer to CONSTANT_Double
+ av.visit(name, readConst(readUnsignedShort(v), buf));
+ v += 2;
+ break;
+ case 'B': // pointer to CONSTANT_Byte
+ av.visit(name,
+ new Byte((byte) readInt(items[readUnsignedShort(v)])));
+ v += 2;
+ break;
+ case 'Z': // pointer to CONSTANT_Boolean
+ av.visit(name, readInt(items[readUnsignedShort(v)]) == 0
+ ? Boolean.FALSE
+ : Boolean.TRUE);
+ v += 2;
+ break;
+ case 'S': // pointer to CONSTANT_Short
+ av.visit(name,
+ new Short((short) readInt(items[readUnsignedShort(v)])));
+ v += 2;
+ break;
+ case 'C': // pointer to CONSTANT_Char
+ av.visit(name,
+ new Character((char) readInt(items[readUnsignedShort(v)])));
+ v += 2;
+ break;
+ case 's': // pointer to CONSTANT_Utf8
+ av.visit(name, readUTF8(v, buf));
+ v += 2;
+ break;
+ case 'e': // enum_const_value
+ av.visitEnum(name, readUTF8(v, buf), readUTF8(v + 2, buf));
+ v += 4;
+ break;
+ case 'c': // class_info
+ av.visit(name, Type.getType(readUTF8(v, buf)));
+ v += 2;
+ break;
+ case '@': // annotation_value
+ v = readAnnotationValues(v + 2,
+ buf,
+ true,
+ av.visitAnnotation(name, readUTF8(v, buf)));
+ break;
+ case '[': // array_value
+ int size = readUnsignedShort(v);
+ v += 2;
+ if (size == 0) {
+ return readAnnotationValues(v - 2,
+ buf,
+ false,
+ av.visitArray(name));
+ }
+ switch (this.b[v++] & 0xFF) {
+ case 'B':
+ byte[] bv = new byte[size];
+ for (i = 0; i < size; i++) {
+ bv[i] = (byte) readInt(items[readUnsignedShort(v)]);
+ v += 3;
+ }
+ av.visit(name, bv);
+ --v;
+ break;
+ case 'Z':
+ boolean[] zv = new boolean[size];
+ for (i = 0; i < size; i++) {
+ zv[i] = readInt(items[readUnsignedShort(v)]) != 0;
+ v += 3;
+ }
+ av.visit(name, zv);
+ --v;
+ break;
+ case 'S':
+ short[] sv = new short[size];
+ for (i = 0; i < size; i++) {
+ sv[i] = (short) readInt(items[readUnsignedShort(v)]);
+ v += 3;
+ }
+ av.visit(name, sv);
+ --v;
+ break;
+ case 'C':
+ char[] cv = new char[size];
+ for (i = 0; i < size; i++) {
+ cv[i] = (char) readInt(items[readUnsignedShort(v)]);
+ v += 3;
+ }
+ av.visit(name, cv);
+ --v;
+ break;
+ case 'I':
+ int[] iv = new int[size];
+ for (i = 0; i < size; i++) {
+ iv[i] = readInt(items[readUnsignedShort(v)]);
+ v += 3;
+ }
+ av.visit(name, iv);
+ --v;
+ break;
+ case 'J':
+ long[] lv = new long[size];
+ for (i = 0; i < size; i++) {
+ lv[i] = readLong(items[readUnsignedShort(v)]);
+ v += 3;
+ }
+ av.visit(name, lv);
+ --v;
+ break;
+ case 'F':
+ float[] fv = new float[size];
+ for (i = 0; i < size; i++) {
+ fv[i] = Float.intBitsToFloat(readInt(items[readUnsignedShort(v)]));
+ v += 3;
+ }
+ av.visit(name, fv);
+ --v;
+ break;
+ case 'D':
+ double[] dv = new double[size];
+ for (i = 0; i < size; i++) {
+ dv[i] = Double.longBitsToDouble(readLong(items[readUnsignedShort(v)]));
+ v += 3;
+ }
+ av.visit(name, dv);
+ --v;
+ break;
+ default:
+ v = readAnnotationValues(v - 3,
+ buf,
+ false,
+ av.visitArray(name));
+ }
+ }
+ return v;
+ }
+
+ private int readFrameType(
+ final Object[] frame,
+ final int index,
+ int v,
+ final char[] buf,
+ final Label[] labels)
+ {
+ int type = b[v++] & 0xFF;
+ switch (type) {
+ case 0:
+ frame[index] = Opcodes.TOP;
+ break;
+ case 1:
+ frame[index] = Opcodes.INTEGER;
+ break;
+ case 2:
+ frame[index] = Opcodes.FLOAT;
+ break;
+ case 3:
+ frame[index] = Opcodes.DOUBLE;
+ break;
+ case 4:
+ frame[index] = Opcodes.LONG;
+ break;
+ case 5:
+ frame[index] = Opcodes.NULL;
+ break;
+ case 6:
+ frame[index] = Opcodes.UNINITIALIZED_THIS;
+ break;
+ case 7: // Object
+ frame[index] = readClass(v, buf);
+ v += 2;
+ break;
+ default: // Uninitialized
+ frame[index] = readLabel(readUnsignedShort(v), labels);
+ v += 2;
+ }
+ return v;
+ }
+
+ /**
+ * Returns the label corresponding to the given offset. The default
+ * implementation of this method creates a label for the given offset if it
+ * has not been already created.
+ *
+ * @param offset a bytecode offset in a method.
+ * @param labels the already created labels, indexed by their offset. If a
+ * label already exists for offset this method must not create a new
+ * one. Otherwise it must store the new label in this array.
+ * @return a non null Label, which must be equal to labels[offset].
+ */
+ protected Label readLabel(int offset, Label[] labels) {
+ if (labels[offset] == null) {
+ labels[offset] = new Label();
+ }
+ return labels[offset];
+ }
+
+ /**
+ * Reads an attribute in {@link #b b}.
+ *
+ * @param attrs prototypes of the attributes that must be parsed during the
+ * visit of the class. Any attribute whose type is not equal to the
+ * type of one the prototypes is ignored (i.e. an empty
+ * {@link Attribute} instance is returned).
+ * @param type the type of the attribute.
+ * @param off index of the first byte of the attribute's content in
+ * {@link #b b}. The 6 attribute header bytes, containing the type
+ * and the length of the attribute, are not taken into account here
+ * (they have already been read).
+ * @param len the length of the attribute's content.
+ * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+ * {@link #readClass(int,char[]) readClass} or
+ * {@link #readConst readConst}.
+ * @param codeOff index of the first byte of code's attribute content in
+ * {@link #b b}, or -1 if the attribute to be read is not a code
+ * attribute. The 6 attribute header bytes, containing the type and
+ * the length of the attribute, are not taken into account here.
+ * @param labels the labels of the method's code, or <tt>null</tt> if the
+ * attribute to be read is not a code attribute.
+ * @return the attribute that has been read, or <tt>null</tt> to skip this
+ * attribute.
+ */
+ private Attribute readAttribute(
+ final Attribute[] attrs,
+ final String type,
+ final int off,
+ final int len,
+ final char[] buf,
+ final int codeOff,
+ final Label[] labels)
+ {
+ for (int i = 0; i < attrs.length; ++i) {
+ if (attrs[i].type.equals(type)) {
+ return attrs[i].read(this, off, len, buf, codeOff, labels);
+ }
+ }
+ return new Attribute(type).read(this, off, len, null, -1, null);
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: low level parsing
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the number of constant pool items in {@link #b b}.
+ *
+ * @return the number of constant pool items in {@link #b b}.
+ */
+ public int getItemCount() {
+ return items.length;
+ }
+
+ /**
+ * Returns the start index of the constant pool item in {@link #b b}, plus
+ * one. <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param item the index a constant pool item.
+ * @return the start index of the constant pool item in {@link #b b}, plus
+ * one.
+ */
+ public int getItem(final int item) {
+ return items[item];
+ }
+
+ /**
+ * Returns the maximum length of the strings contained in the constant pool
+ * of the class.
+ *
+ * @return the maximum length of the strings contained in the constant pool
+ * of the class.
+ */
+ public int getMaxStringLength() {
+ return maxStringLength;
+ }
+
+ /**
+ * Reads a byte value in {@link #b b}. <i>This method is intended for
+ * {@link Attribute} sub classes, and is normally not needed by class
+ * generators or adapters.</i>
+ *
+ * @param index the start index of the value to be read in {@link #b b}.
+ * @return the read value.
+ */
+ public int readByte(final int index) {
+ return b[index] & 0xFF;
+ }
+
+ /**
+ * Reads an unsigned short value in {@link #b b}. <i>This method is
+ * intended for {@link Attribute} sub classes, and is normally not needed by
+ * class generators or adapters.</i>
+ *
+ * @param index the start index of the value to be read in {@link #b b}.
+ * @return the read value.
+ */
+ public int readUnsignedShort(final int index) {
+ byte[] b = this.b;
+ return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+ }
+
+ /**
+ * Reads a signed short value in {@link #b b}. <i>This method is intended
+ * for {@link Attribute} sub classes, and is normally not needed by class
+ * generators or adapters.</i>
+ *
+ * @param index the start index of the value to be read in {@link #b b}.
+ * @return the read value.
+ */
+ public short readShort(final int index) {
+ byte[] b = this.b;
+ return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+ }
+
+ /**
+ * Reads a signed int value in {@link #b b}. <i>This method is intended for
+ * {@link Attribute} sub classes, and is normally not needed by class
+ * generators or adapters.</i>
+ *
+ * @param index the start index of the value to be read in {@link #b b}.
+ * @return the read value.
+ */
+ public int readInt(final int index) {
+ byte[] b = this.b;
+ return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+ | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+ }
+
+ /**
+ * Reads a signed long value in {@link #b b}. <i>This method is intended
+ * for {@link Attribute} sub classes, and is normally not needed by class
+ * generators or adapters.</i>
+ *
+ * @param index the start index of the value to be read in {@link #b b}.
+ * @return the read value.
+ */
+ public long readLong(final int index) {
+ long l1 = readInt(index);
+ long l0 = readInt(index + 4) & 0xFFFFFFFFL;
+ return (l1 << 32) | l0;
+ }
+
+ /**
+ * Reads an UTF8 string constant pool item in {@link #b b}. <i>This method
+ * is intended for {@link Attribute} sub classes, and is normally not needed
+ * by class generators or adapters.</i>
+ *
+ * @param index the start index of an unsigned short value in {@link #b b},
+ * whose value is the index of an UTF8 constant pool item.
+ * @param buf buffer to be used to read the item. This buffer must be
+ * sufficiently large. It is not automatically resized.
+ * @return the String corresponding to the specified UTF8 item.
+ */
+ public String readUTF8(int index, final char[] buf) {
+ int item = readUnsignedShort(index);
+ String s = strings[item];
+ if (s != null) {
+ return s;
+ }
+ index = items[item];
+ return strings[item] = readUTF(index + 2, readUnsignedShort(index), buf);
+ }
+
+ /**
+ * Reads UTF8 string in {@link #b b}.
+ *
+ * @param index start offset of the UTF8 string to be read.
+ * @param utfLen length of the UTF8 string to be read.
+ * @param buf buffer to be used to read the string. This buffer must be
+ * sufficiently large. It is not automatically resized.
+ * @return the String corresponding to the specified UTF8 string.
+ */
+ private String readUTF(int index, final int utfLen, final char[] buf) {
+ int endIndex = index + utfLen;
+ byte[] b = this.b;
+ int strLen = 0;
+ int c;
+ int st = 0;
+ char cc = 0;
+ while (index < endIndex) {
+ c = b[index++];
+ switch (st) {
+ case 0:
+ c = c & 0xFF;
+ if (c < 0x80) { // 0xxxxxxx
+ buf[strLen++] = (char) c;
+ } else if (c < 0xE0 && c > 0xBF) { // 110x xxxx 10xx xxxx
+ cc = (char) (c & 0x1F);
+ st = 1;
+ } else { // 1110 xxxx 10xx xxxx 10xx xxxx
+ cc = (char) (c & 0x0F);
+ st = 2;
+ }
+ break;
+
+ case 1: // byte 2 of 2-byte char or byte 3 of 3-byte char
+ buf[strLen++] = (char) ((cc << 6) | (c & 0x3F));
+ st = 0;
+ break;
+
+ case 2: // byte 2 of 3-byte char
+ cc = (char) ((cc << 6) | (c & 0x3F));
+ st = 1;
+ break;
+ }
+ }
+ return new String(buf, 0, strLen);
+ }
+
+ /**
+ * Reads a class constant pool item in {@link #b b}. <i>This method is
+ * intended for {@link Attribute} sub classes, and is normally not needed by
+ * class generators or adapters.</i>
+ *
+ * @param index the start index of an unsigned short value in {@link #b b},
+ * whose value is the index of a class constant pool item.
+ * @param buf buffer to be used to read the item. This buffer must be
+ * sufficiently large. It is not automatically resized.
+ * @return the String corresponding to the specified class item.
+ */
+ public String readClass(final int index, final char[] buf) {
+ // computes the start index of the CONSTANT_Class item in b
+ // and reads the CONSTANT_Utf8 item designated by
+ // the first two bytes of this CONSTANT_Class item
+ return readUTF8(items[readUnsignedShort(index)], buf);
+ }
+
+ /**
+ * Reads a numeric or string constant pool item in {@link #b b}. <i>This
+ * method is intended for {@link Attribute} sub classes, and is normally not
+ * needed by class generators or adapters.</i>
+ *
+ * @param item the index of a constant pool item.
+ * @param buf buffer to be used to read the item. This buffer must be
+ * sufficiently large. It is not automatically resized.
+ * @return the {@link Integer}, {@link Float}, {@link Long}, {@link Double},
+ * {@link String}, {@link Type} or {@link Handle} corresponding to
+ * the given constant pool item.
+ */
+ public Object readConst(final int item, final char[] buf) {
+ int index = items[item];
+ switch (b[index - 1]) {
+ case ClassWriter.INT:
+ return new Integer(readInt(index));
+ case ClassWriter.FLOAT:
+ return new Float(Float.intBitsToFloat(readInt(index)));
+ case ClassWriter.LONG:
+ return new Long(readLong(index));
+ case ClassWriter.DOUBLE:
+ return new Double(Double.longBitsToDouble(readLong(index)));
+ case ClassWriter.CLASS:
+ return Type.getObjectType(readUTF8(index, buf));
+ case ClassWriter.STR:
+ return readUTF8(index, buf);
+ case ClassWriter.MTYPE:
+ return Type.getMethodType(readUTF8(index, buf));
+
+ //case ClassWriter.HANDLE_BASE + [1..9]:
+ default: {
+ int tag = readByte(index);
+ int[] items = this.items;
+ int cpIndex = items[readUnsignedShort(index + 1)];
+ String owner = readClass(cpIndex, buf);
+ cpIndex = items[readUnsignedShort(cpIndex + 2)];
+ String name = readUTF8(cpIndex, buf);
+ String desc = readUTF8(cpIndex + 2, buf);
+ return new Handle(tag, owner, name, desc);
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
new file mode 100644
index 0000000..73096fa
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
@@ -0,0 +1,306 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java class. The methods of this class must be called
+ * in the following order: <tt>visit</tt> [ <tt>visitSource</tt> ] [
+ * <tt>visitOuterClass</tt> ] ( <tt>visitAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* ( <tt>visitInnerClass</tt> |
+ * <tt>visitField</tt> | <tt>visitMethod</tt> )* <tt>visitEnd</tt>.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class ClassVisitor {
+
+ /**
+ * The ASM API version implemented by this visitor. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * The class visitor to which this visitor must delegate method calls. May
+ * be null.
+ */
+ protected ClassVisitor cv;
+
+ /**
+ * Constructs a new {@link ClassVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public ClassVisitor(final int api) {
+ this(api, null);
+ }
+
+ /**
+ * Constructs a new {@link ClassVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param cv the class visitor to which this visitor must delegate method
+ * calls. May be null.
+ */
+ public ClassVisitor(final int api, final ClassVisitor cv) {
+ /*if (api != Opcodes.ASM4) {
+ throw new IllegalArgumentException();
+ }*/
+ this.api = api;
+ this.cv = cv;
+ }
+
+ /**
+ * Visits the header of the class.
+ *
+ * @param version the class version.
+ * @param access the class's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the class is deprecated.
+ * @param name the internal name of the class (see
+ * {@link Type#getInternalName() getInternalName}).
+ * @param signature the signature of this class. May be <tt>null</tt> if
+ * the class is not a generic one, and does not extend or implement
+ * generic classes or interfaces.
+ * @param superName the internal of name of the super class (see
+ * {@link Type#getInternalName() getInternalName}). For interfaces,
+ * the super class is {@link Object}. May be <tt>null</tt>, but
+ * only for the {@link Object} class.
+ * @param interfaces the internal names of the class's interfaces (see
+ * {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ */
+ public void visit(
+ int version,
+ int access,
+ String name,
+ String signature,
+ String superName,
+ String[] interfaces)
+ {
+ if (cv != null) {
+ cv.visit(version, access, name, signature, superName, interfaces);
+ }
+ }
+
+ /**
+ * Visits the source of the class.
+ *
+ * @param source the name of the source file from which the class was
+ * compiled. May be <tt>null</tt>.
+ * @param debug additional debug information to compute the correspondance
+ * between source and compiled elements of the class. May be
+ * <tt>null</tt>.
+ */
+ public void visitSource(String source, String debug) {
+ if (cv != null) {
+ cv.visitSource(source, debug);
+ }
+ }
+
+ /**
+ * Visits the enclosing class of the class. This method must be called only
+ * if the class has an enclosing class.
+ *
+ * @param owner internal name of the enclosing class of the class.
+ * @param name the name of the method that contains the class, or
+ * <tt>null</tt> if the class is not enclosed in a method of its
+ * enclosing class.
+ * @param desc the descriptor of the method that contains the class, or
+ * <tt>null</tt> if the class is not enclosed in a method of its
+ * enclosing class.
+ */
+ public void visitOuterClass(String owner, String name, String desc) {
+ if (cv != null) {
+ cv.visitOuterClass(owner, name, desc);
+ }
+ }
+
+ /**
+ * Visits an annotation of the class.
+ *
+ * @param desc the class descriptor of the annotation class.
+ * @param visible <tt>true</tt> if the annotation is visible at runtime.
+ * @return a visitor to visit the annotation values, or <tt>null</tt> if
+ * this visitor is not interested in visiting this annotation.
+ */
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ if (cv != null) {
+ return cv.visitAnnotation(desc, visible);
+ }
+ return null;
+ }
+
+ /**
+ * Visits a non standard attribute of the class.
+ *
+ * @param attr an attribute.
+ */
+ public void visitAttribute(Attribute attr) {
+ if (cv != null) {
+ cv.visitAttribute(attr);
+ }
+ }
+
+ /**
+ * Visits information about an inner class. This inner class is not
+ * necessarily a member of the class being visited.
+ *
+ * @param name the internal name of an inner class (see
+ * {@link Type#getInternalName() getInternalName}).
+ * @param outerName the internal name of the class to which the inner class
+ * belongs (see {@link Type#getInternalName() getInternalName}). May
+ * be <tt>null</tt> for not member classes.
+ * @param innerName the (simple) name of the inner class inside its
+ * enclosing class. May be <tt>null</tt> for anonymous inner
+ * classes.
+ * @param access the access flags of the inner class as originally declared
+ * in the enclosing class.
+ */
+ public void visitInnerClass(
+ String name,
+ String outerName,
+ String innerName,
+ int access)
+ {
+ if (cv != null) {
+ cv.visitInnerClass(name, outerName, innerName, access);
+ }
+ }
+
+ /**
+ * Visits a field of the class.
+ *
+ * @param access the field's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the field is synthetic and/or
+ * deprecated.
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link Type Type}).
+ * @param signature the field's signature. May be <tt>null</tt> if the
+ * field's type does not use generic types.
+ * @param value the field's initial value. This parameter, which may be
+ * <tt>null</tt> if the field does not have an initial value, must
+ * be an {@link Integer}, a {@link Float}, a {@link Long}, a
+ * {@link Double} or a {@link String} (for <tt>int</tt>,
+ * <tt>float</tt>, <tt>long</tt> or <tt>String</tt> fields
+ * respectively). <i>This parameter is only used for static fields</i>.
+ * Its value is ignored for non static fields, which must be
+ * initialized through bytecode instructions in constructors or
+ * methods.
+ * @return a visitor to visit field annotations and attributes, or
+ * <tt>null</tt> if this class visitor is not interested in
+ * visiting these annotations and attributes.
+ */
+ public FieldVisitor visitField(
+ int access,
+ String name,
+ String desc,
+ String signature,
+ Object value)
+ {
+ if (cv != null) {
+ return cv.visitField(access, name, desc, signature, value);
+ }
+ return null;
+ }
+
+ /**
+ * Visits a method of the class. This method <i>must</i> return a new
+ * {@link MethodVisitor} instance (or <tt>null</tt>) each time it is
+ * called, i.e., it should not return a previously returned visitor.
+ *
+ * @param access the method's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the method is synthetic and/or
+ * deprecated.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param signature the method's signature. May be <tt>null</tt> if the
+ * method parameters, return type and exceptions do not use generic
+ * types.
+ * @param exceptions the internal names of the method's exception classes
+ * (see {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ * @return an object to visit the byte code of the method, or <tt>null</tt>
+ * if this class visitor is not interested in visiting the code of
+ * this method.
+ */
+ public MethodVisitor visitMethod(
+ int access,
+ String name,
+ String desc,
+ String signature,
+ String[] exceptions)
+ {
+ if (cv != null) {
+ return cv.visitMethod(access, name, desc, signature, exceptions);
+ }
+ return null;
+ }
+
+ /**
+ * Visits the end of the class. This method, which is the last one to be
+ * called, is used to inform the visitor that all the fields and methods of
+ * the class have been visited.
+ */
+ public void visitEnd() {
+ if (cv != null) {
+ cv.visitEnd();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
new file mode 100644
index 0000000..33c9829
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
@@ -0,0 +1,1701 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A {@link ClassVisitor} that generates classes in bytecode form. More
+ * precisely this visitor generates a byte array conforming to the Java class
+ * file format. It can be used alone, to generate a Java class "from scratch",
+ * or with one or more {@link ClassReader ClassReader} and adapter class visitor
+ * to generate a modified class from one or more existing Java classes.
+ *
+ * @author Eric Bruneton
+ */
+public class ClassWriter extends ClassVisitor {
+
+ /**
+ * Flag to automatically compute the maximum stack size and the maximum
+ * number of local variables of methods. If this flag is set, then the
+ * arguments of the {@link MethodVisitor#visitMaxs visitMaxs} method of the
+ * {@link MethodVisitor} returned by the {@link #visitMethod visitMethod}
+ * method will be ignored, and computed automatically from the signature and
+ * the bytecode of each method.
+ *
+ * @see #ClassWriter(int)
+ */
+ public static final int COMPUTE_MAXS = 1;
+
+ /**
+ * Flag to automatically compute the stack map frames of methods from
+ * scratch. If this flag is set, then the calls to the
+ * {@link MethodVisitor#visitFrame} method are ignored, and the stack map
+ * frames are recomputed from the methods bytecode. The arguments of the
+ * {@link MethodVisitor#visitMaxs visitMaxs} method are also ignored and
+ * recomputed from the bytecode. In other words, computeFrames implies
+ * computeMaxs.
+ *
+ * @see #ClassWriter(int)
+ */
+ public static final int COMPUTE_FRAMES = 2;
+
+ /**
+ * Pseudo access flag to distinguish between the synthetic attribute and
+ * the synthetic access flag.
+ */
+ static final int ACC_SYNTHETIC_ATTRIBUTE = 0x40000;
+
+ /**
+ * The type of instructions without any argument.
+ */
+ static final int NOARG_INSN = 0;
+
+ /**
+ * The type of instructions with an signed byte argument.
+ */
+ static final int SBYTE_INSN = 1;
+
+ /**
+ * The type of instructions with an signed short argument.
+ */
+ static final int SHORT_INSN = 2;
+
+ /**
+ * The type of instructions with a local variable index argument.
+ */
+ static final int VAR_INSN = 3;
+
+ /**
+ * The type of instructions with an implicit local variable index argument.
+ */
+ static final int IMPLVAR_INSN = 4;
+
+ /**
+ * The type of instructions with a type descriptor argument.
+ */
+ static final int TYPE_INSN = 5;
+
+ /**
+ * The type of field and method invocations instructions.
+ */
+ static final int FIELDORMETH_INSN = 6;
+
+ /**
+ * The type of the INVOKEINTERFACE/INVOKEDYNAMIC instruction.
+ */
+ static final int ITFMETH_INSN = 7;
+
+ /**
+ * The type of the INVOKEDYNAMIC instruction.
+ */
+ static final int INDYMETH_INSN = 8;
+
+ /**
+ * The type of instructions with a 2 bytes bytecode offset label.
+ */
+ static final int LABEL_INSN = 9;
+
+ /**
+ * The type of instructions with a 4 bytes bytecode offset label.
+ */
+ static final int LABELW_INSN = 10;
+
+ /**
+ * The type of the LDC instruction.
+ */
+ static final int LDC_INSN = 11;
+
+ /**
+ * The type of the LDC_W and LDC2_W instructions.
+ */
+ static final int LDCW_INSN = 12;
+
+ /**
+ * The type of the IINC instruction.
+ */
+ static final int IINC_INSN = 13;
+
+ /**
+ * The type of the TABLESWITCH instruction.
+ */
+ static final int TABL_INSN = 14;
+
+ /**
+ * The type of the LOOKUPSWITCH instruction.
+ */
+ static final int LOOK_INSN = 15;
+
+ /**
+ * The type of the MULTIANEWARRAY instruction.
+ */
+ static final int MANA_INSN = 16;
+
+ /**
+ * The type of the WIDE instruction.
+ */
+ static final int WIDE_INSN = 17;
+
+ /**
+ * The instruction types of all JVM opcodes.
+ */
+ static final byte[] TYPE;
+
+ /**
+ * The type of CONSTANT_Class constant pool items.
+ */
+ static final int CLASS = 7;
+
+ /**
+ * The type of CONSTANT_Fieldref constant pool items.
+ */
+ static final int FIELD = 9;
+
+ /**
+ * The type of CONSTANT_Methodref constant pool items.
+ */
+ static final int METH = 10;
+
+ /**
+ * The type of CONSTANT_InterfaceMethodref constant pool items.
+ */
+ static final int IMETH = 11;
+
+ /**
+ * The type of CONSTANT_String constant pool items.
+ */
+ static final int STR = 8;
+
+ /**
+ * The type of CONSTANT_Integer constant pool items.
+ */
+ static final int INT = 3;
+
+ /**
+ * The type of CONSTANT_Float constant pool items.
+ */
+ static final int FLOAT = 4;
+
+ /**
+ * The type of CONSTANT_Long constant pool items.
+ */
+ static final int LONG = 5;
+
+ /**
+ * The type of CONSTANT_Double constant pool items.
+ */
+ static final int DOUBLE = 6;
+
+ /**
+ * The type of CONSTANT_NameAndType constant pool items.
+ */
+ static final int NAME_TYPE = 12;
+
+ /**
+ * The type of CONSTANT_Utf8 constant pool items.
+ */
+ static final int UTF8 = 1;
+
+ /**
+ * The type of CONSTANT_MethodType constant pool items.
+ */
+ static final int MTYPE = 16;
+
+ /**
+ * The type of CONSTANT_MethodHandle constant pool items.
+ */
+ static final int HANDLE = 15;
+
+ /**
+ * The type of CONSTANT_InvokeDynamic constant pool items.
+ */
+ static final int INDY = 18;
+
+ /**
+ * The base value for all CONSTANT_MethodHandle constant pool items.
+ * Internally, ASM store the 9 variations of CONSTANT_MethodHandle into
+ * 9 different items.
+ */
+ static final int HANDLE_BASE = 20;
+
+ /**
+ * Normal type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+ * instead of the constant pool, in order to avoid clashes with normal
+ * constant pool items in the ClassWriter constant pool's hash table.
+ */
+ static final int TYPE_NORMAL = 30;
+
+ /**
+ * Uninitialized type Item stored in the ClassWriter
+ * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+ * avoid clashes with normal constant pool items in the ClassWriter constant
+ * pool's hash table.
+ */
+ static final int TYPE_UNINIT = 31;
+
+ /**
+ * Merged type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+ * instead of the constant pool, in order to avoid clashes with normal
+ * constant pool items in the ClassWriter constant pool's hash table.
+ */
+ static final int TYPE_MERGED = 32;
+
+ /**
+ * The type of BootstrapMethods items. These items are stored in a
+ * special class attribute named BootstrapMethods and
+ * not in the constant pool.
+ */
+ static final int BSM = 33;
+
+ /**
+ * The class reader from which this class writer was constructed, if any.
+ */
+ ClassReader cr;
+
+ /**
+ * Minor and major version numbers of the class to be generated.
+ */
+ int version;
+
+ /**
+ * Index of the next item to be added in the constant pool.
+ */
+ int index;
+
+ /**
+ * The constant pool of this class.
+ */
+ final ByteVector pool;
+
+ /**
+ * The constant pool's hash table data.
+ */
+ Item[] items;
+
+ /**
+ * The threshold of the constant pool's hash table.
+ */
+ int threshold;
+
+ /**
+ * A reusable key used to look for items in the {@link #items} hash table.
+ */
+ final Item key;
+
+ /**
+ * A reusable key used to look for items in the {@link #items} hash table.
+ */
+ final Item key2;
+
+ /**
+ * A reusable key used to look for items in the {@link #items} hash table.
+ */
+ final Item key3;
+
+ /**
+ * A reusable key used to look for items in the {@link #items} hash table.
+ */
+ final Item key4;
+
+ /**
+ * A type table used to temporarily store internal names that will not
+ * necessarily be stored in the constant pool. This type table is used by
+ * the control flow and data flow analysis algorithm used to compute stack
+ * map frames from scratch. This array associates to each index <tt>i</tt>
+ * the Item whose index is <tt>i</tt>. All Item objects stored in this
+ * array are also stored in the {@link #items} hash table. These two arrays
+ * allow to retrieve an Item from its index or, conversely, to get the index
+ * of an Item from its value. Each Item stores an internal name in its
+ * {@link Item#strVal1} field.
+ */
+ Item[] typeTable;
+
+ /**
+ * Number of elements in the {@link #typeTable} array.
+ */
+ private short typeCount;
+
+ /**
+ * The access flags of this class.
+ */
+ private int access;
+
+ /**
+ * The constant pool item that contains the internal name of this class.
+ */
+ private int name;
+
+ /**
+ * The internal name of this class.
+ */
+ String thisName;
+
+ /**
+ * The constant pool item that contains the signature of this class.
+ */
+ private int signature;
+
+ /**
+ * The constant pool item that contains the internal name of the super class
+ * of this class.
+ */
+ private int superName;
+
+ /**
+ * Number of interfaces implemented or extended by this class or interface.
+ */
+ private int interfaceCount;
+
+ /**
+ * The interfaces implemented or extended by this class or interface. More
+ * precisely, this array contains the indexes of the constant pool items
+ * that contain the internal names of these interfaces.
+ */
+ private int[] interfaces;
+
+ /**
+ * The index of the constant pool item that contains the name of the source
+ * file from which this class was compiled.
+ */
+ private int sourceFile;
+
+ /**
+ * The SourceDebug attribute of this class.
+ */
+ private ByteVector sourceDebug;
+
+ /**
+ * The constant pool item that contains the name of the enclosing class of
+ * this class.
+ */
+ private int enclosingMethodOwner;
+
+ /**
+ * The constant pool item that contains the name and descriptor of the
+ * enclosing method of this class.
+ */
+ private int enclosingMethod;
+
+ /**
+ * The runtime visible annotations of this class.
+ */
+ private AnnotationWriter anns;
+
+ /**
+ * The runtime invisible annotations of this class.
+ */
+ private AnnotationWriter ianns;
+
+ /**
+ * The non standard attributes of this class.
+ */
+ private Attribute attrs;
+
+ /**
+ * The number of entries in the InnerClasses attribute.
+ */
+ private int innerClassesCount;
+
+ /**
+ * The InnerClasses attribute.
+ */
+ private ByteVector innerClasses;
+
+ /**
+ * The number of entries in the BootstrapMethods attribute.
+ */
+ int bootstrapMethodsCount;
+
+ /**
+ * The BootstrapMethods attribute.
+ */
+ ByteVector bootstrapMethods;
+
+ /**
+ * The fields of this class. These fields are stored in a linked list of
+ * {@link FieldWriter} objects, linked to each other by their
+ * {@link FieldWriter#fv} field. This field stores the first element of
+ * this list.
+ */
+ FieldWriter firstField;
+
+ /**
+ * The fields of this class. These fields are stored in a linked list of
+ * {@link FieldWriter} objects, linked to each other by their
+ * {@link FieldWriter#fv} field. This field stores the last element of
+ * this list.
+ */
+ FieldWriter lastField;
+
+ /**
+ * The methods of this class. These methods are stored in a linked list of
+ * {@link MethodWriter} objects, linked to each other by their
+ * {@link MethodWriter#mv} field. This field stores the first element of
+ * this list.
+ */
+ MethodWriter firstMethod;
+
+ /**
+ * The methods of this class. These methods are stored in a linked list of
+ * {@link MethodWriter} objects, linked to each other by their
+ * {@link MethodWriter#mv} field. This field stores the last element of
+ * this list.
+ */
+ MethodWriter lastMethod;
+
+ /**
+ * <tt>true</tt> if the maximum stack size and number of local variables
+ * must be automatically computed.
+ */
+ private final boolean computeMaxs;
+
+ /**
+ * <tt>true</tt> if the stack map frames must be recomputed from scratch.
+ */
+ private final boolean computeFrames;
+
+ /**
+ * <tt>true</tt> if the stack map tables of this class are invalid. The
+ * {@link MethodWriter#resizeInstructions} method cannot transform existing
+ * stack map tables, and so produces potentially invalid classes when it is
+ * executed. In this case the class is reread and rewritten with the
+ * {@link #COMPUTE_FRAMES} option (the resizeInstructions method can resize
+ * stack map tables when this option is used).
+ */
+ boolean invalidFrames;
+
+ // ------------------------------------------------------------------------
+ // Static initializer
+ // ------------------------------------------------------------------------
+
+ /**
+ * Computes the instruction types of JVM opcodes.
+ */
+ static {
+ int i;
+ byte[] b = new byte[220];
+ String s = "AAAAAAAAAAAAAAAABCLMMDDDDDEEEEEEEEEEEEEEEEEEEEAAAAAAAADD"
+ + "DDDEEEEEEEEEEEEEEEEEEEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ + "AAAAAAAAAAAAAAAAANAAAAAAAAAAAAAAAAAAAAJJJJJJJJJJJJJJJJDOPAA"
+ + "AAAAGGGGGGGHIFBFAAFFAARQJJKKJJJJJJJJJJJJJJJJJJ";
+ for (i = 0; i < b.length; ++i) {
+ b[i] = (byte) (s.charAt(i) - 'A');
+ }
+ TYPE = b;
+
+ // code to generate the above string
+ //
+ // // SBYTE_INSN instructions
+ // b[Constants.NEWARRAY] = SBYTE_INSN;
+ // b[Constants.BIPUSH] = SBYTE_INSN;
+ //
+ // // SHORT_INSN instructions
+ // b[Constants.SIPUSH] = SHORT_INSN;
+ //
+ // // (IMPL)VAR_INSN instructions
+ // b[Constants.RET] = VAR_INSN;
+ // for (i = Constants.ILOAD; i <= Constants.ALOAD; ++i) {
+ // b[i] = VAR_INSN;
+ // }
+ // for (i = Constants.ISTORE; i <= Constants.ASTORE; ++i) {
+ // b[i] = VAR_INSN;
+ // }
+ // for (i = 26; i <= 45; ++i) { // ILOAD_0 to ALOAD_3
+ // b[i] = IMPLVAR_INSN;
+ // }
+ // for (i = 59; i <= 78; ++i) { // ISTORE_0 to ASTORE_3
+ // b[i] = IMPLVAR_INSN;
+ // }
+ //
+ // // TYPE_INSN instructions
+ // b[Constants.NEW] = TYPE_INSN;
+ // b[Constants.ANEWARRAY] = TYPE_INSN;
+ // b[Constants.CHECKCAST] = TYPE_INSN;
+ // b[Constants.INSTANCEOF] = TYPE_INSN;
+ //
+ // // (Set)FIELDORMETH_INSN instructions
+ // for (i = Constants.GETSTATIC; i <= Constants.INVOKESTATIC; ++i) {
+ // b[i] = FIELDORMETH_INSN;
+ // }
+ // b[Constants.INVOKEINTERFACE] = ITFMETH_INSN;
+ // b[Constants.INVOKEDYNAMIC] = INDYMETH_INSN;
+ //
+ // // LABEL(W)_INSN instructions
+ // for (i = Constants.IFEQ; i <= Constants.JSR; ++i) {
+ // b[i] = LABEL_INSN;
+ // }
+ // b[Constants.IFNULL] = LABEL_INSN;
+ // b[Constants.IFNONNULL] = LABEL_INSN;
+ // b[200] = LABELW_INSN; // GOTO_W
+ // b[201] = LABELW_INSN; // JSR_W
+ // // temporary opcodes used internally by ASM - see Label and
+ // MethodWriter
+ // for (i = 202; i < 220; ++i) {
+ // b[i] = LABEL_INSN;
+ // }
+ //
+ // // LDC(_W) instructions
+ // b[Constants.LDC] = LDC_INSN;
+ // b[19] = LDCW_INSN; // LDC_W
+ // b[20] = LDCW_INSN; // LDC2_W
+ //
+ // // special instructions
+ // b[Constants.IINC] = IINC_INSN;
+ // b[Constants.TABLESWITCH] = TABL_INSN;
+ // b[Constants.LOOKUPSWITCH] = LOOK_INSN;
+ // b[Constants.MULTIANEWARRAY] = MANA_INSN;
+ // b[196] = WIDE_INSN; // WIDE
+ //
+ // for (i = 0; i < b.length; ++i) {
+ // System.err.print((char)('A' + b[i]));
+ // }
+ // System.err.println();
+ }
+
+ // ------------------------------------------------------------------------
+ // Constructor
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new {@link ClassWriter} object.
+ *
+ * @param flags option flags that can be used to modify the default behavior
+ * of this class. See {@link #COMPUTE_MAXS}, {@link #COMPUTE_FRAMES}.
+ */
+ public ClassWriter(final int flags) {
+ super(Opcodes.ASM4);
+ index = 1;
+ pool = new ByteVector();
+ items = new Item[256];
+ threshold = (int) (0.75d * items.length);
+ key = new Item();
+ key2 = new Item();
+ key3 = new Item();
+ key4 = new Item();
+ this.computeMaxs = (flags & COMPUTE_MAXS) != 0;
+ this.computeFrames = (flags & COMPUTE_FRAMES) != 0;
+ }
+
+ /**
+ * Constructs a new {@link ClassWriter} object and enables optimizations for
+ * "mostly add" bytecode transformations. These optimizations are the
+ * following:
+ *
+ * <ul> <li>The constant pool from the original class is copied as is in the
+ * new class, which saves time. New constant pool entries will be added at
+ * the end if necessary, but unused constant pool entries <i>won't be
+ * removed</i>.</li> <li>Methods that are not transformed are copied as is
+ * in the new class, directly from the original class bytecode (i.e. without
+ * emitting visit events for all the method instructions), which saves a
+ * <i>lot</i> of time. Untransformed methods are detected by the fact that
+ * the {@link ClassReader} receives {@link MethodVisitor} objects that come
+ * from a {@link ClassWriter} (and not from any other {@link ClassVisitor}
+ * instance).</li> </ul>
+ *
+ * @param classReader the {@link ClassReader} used to read the original
+ * class. It will be used to copy the entire constant pool from the
+ * original class and also to copy other fragments of original
+ * bytecode where applicable.
+ * @param flags option flags that can be used to modify the default behavior
+ * of this class. <i>These option flags do not affect methods that
+ * are copied as is in the new class. This means that the maximum
+ * stack size nor the stack frames will be computed for these
+ * methods</i>. See {@link #COMPUTE_MAXS}, {@link #COMPUTE_FRAMES}.
+ */
+ public ClassWriter(final ClassReader classReader, final int flags) {
+ this(flags);
+ classReader.copyPool(this);
+ this.cr = classReader;
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the ClassVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public final void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ this.version = version;
+ this.access = access;
+ this.name = newClass(name);
+ thisName = name;
+ if (ClassReader.SIGNATURES && signature != null) {
+ this.signature = newUTF8(signature);
+ }
+ this.superName = superName == null ? 0 : newClass(superName);
+ if (interfaces != null && interfaces.length > 0) {
+ interfaceCount = interfaces.length;
+ this.interfaces = new int[interfaceCount];
+ for (int i = 0; i < interfaceCount; ++i) {
+ this.interfaces[i] = newClass(interfaces[i]);
+ }
+ }
+ }
+
+ @Override
+ public final void visitSource(final String file, final String debug) {
+ if (file != null) {
+ sourceFile = newUTF8(file);
+ }
+ if (debug != null) {
+ sourceDebug = new ByteVector().putUTF8(debug);
+ }
+ }
+
+ @Override
+ public final void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ enclosingMethodOwner = newClass(owner);
+ if (name != null && desc != null) {
+ enclosingMethod = newNameType(name, desc);
+ }
+ }
+
+ @Override
+ public final AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ if (!ClassReader.ANNOTATIONS) {
+ return null;
+ }
+ ByteVector bv = new ByteVector();
+ // write type, and reserve space for values count
+ bv.putShort(newUTF8(desc)).putShort(0);
+ AnnotationWriter aw = new AnnotationWriter(this, true, bv, bv, 2);
+ if (visible) {
+ aw.next = anns;
+ anns = aw;
+ } else {
+ aw.next = ianns;
+ ianns = aw;
+ }
+ return aw;
+ }
+
+ @Override
+ public final void visitAttribute(final Attribute attr) {
+ attr.next = attrs;
+ attrs = attr;
+ }
+
+ @Override
+ public final void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ if (innerClasses == null) {
+ innerClasses = new ByteVector();
+ }
+ ++innerClassesCount;
+ innerClasses.putShort(name == null ? 0 : newClass(name));
+ innerClasses.putShort(outerName == null ? 0 : newClass(outerName));
+ innerClasses.putShort(innerName == null ? 0 : newUTF8(innerName));
+ innerClasses.putShort(access);
+ }
+
+ @Override
+ public final FieldVisitor visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ return new FieldWriter(this, access, name, desc, signature, value);
+ }
+
+ @Override
+ public final MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ return new MethodWriter(this,
+ access,
+ name,
+ desc,
+ signature,
+ exceptions,
+ computeMaxs,
+ computeFrames);
+ }
+
+ @Override
+ public final void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Other public methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the bytecode of the class that was build with this class writer.
+ *
+ * @return the bytecode of the class that was build with this class writer.
+ */
+ public byte[] toByteArray() {
+ if (index > Short.MAX_VALUE) {
+ throw new RuntimeException("Class file too large!");
+ }
+ // computes the real size of the bytecode of this class
+ int size = 24 + 2 * interfaceCount;
+ int nbFields = 0;
+ FieldWriter fb = firstField;
+ while (fb != null) {
+ ++nbFields;
+ size += fb.getSize();
+ fb = (FieldWriter) fb.fv;
+ }
+ int nbMethods = 0;
+ MethodWriter mb = firstMethod;
+ while (mb != null) {
+ ++nbMethods;
+ size += mb.getSize();
+ mb = (MethodWriter) mb.mv;
+ }
+ int attributeCount = 0;
+ if (bootstrapMethods != null) { // we put it as first argument in order
+ // to improve a bit ClassReader.copyBootstrapMethods
+ ++attributeCount;
+ size += 8 + bootstrapMethods.length;
+ newUTF8("BootstrapMethods");
+ }
+ if (ClassReader.SIGNATURES && signature != 0) {
+ ++attributeCount;
+ size += 8;
+ newUTF8("Signature");
+ }
+ if (sourceFile != 0) {
+ ++attributeCount;
+ size += 8;
+ newUTF8("SourceFile");
+ }
+ if (sourceDebug != null) {
+ ++attributeCount;
+ size += sourceDebug.length + 4;
+ newUTF8("SourceDebugExtension");
+ }
+ if (enclosingMethodOwner != 0) {
+ ++attributeCount;
+ size += 10;
+ newUTF8("EnclosingMethod");
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ ++attributeCount;
+ size += 6;
+ newUTF8("Deprecated");
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((version & 0xFFFF) < Opcodes.V1_5 || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ ++attributeCount;
+ size += 6;
+ newUTF8("Synthetic");
+ }
+ if (innerClasses != null) {
+ ++attributeCount;
+ size += 8 + innerClasses.length;
+ newUTF8("InnerClasses");
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ ++attributeCount;
+ size += 8 + anns.getSize();
+ newUTF8("RuntimeVisibleAnnotations");
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ ++attributeCount;
+ size += 8 + ianns.getSize();
+ newUTF8("RuntimeInvisibleAnnotations");
+ }
+ if (attrs != null) {
+ attributeCount += attrs.getCount();
+ size += attrs.getSize(this, null, 0, -1, -1);
+ }
+ size += pool.length;
+ // allocates a byte vector of this size, in order to avoid unnecessary
+ // arraycopy operations in the ByteVector.enlarge() method
+ ByteVector out = new ByteVector(size);
+ out.putInt(0xCAFEBABE).putInt(version);
+ out.putShort(index).putByteArray(pool.data, 0, pool.length);
+ int mask = Opcodes.ACC_DEPRECATED
+ | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / (ClassWriter.ACC_SYNTHETIC_ATTRIBUTE / Opcodes.ACC_SYNTHETIC));
+ out.putShort(access & ~mask).putShort(name).putShort(superName);
+ out.putShort(interfaceCount);
+ for (int i = 0; i < interfaceCount; ++i) {
+ out.putShort(interfaces[i]);
+ }
+ out.putShort(nbFields);
+ fb = firstField;
+ while (fb != null) {
+ fb.put(out);
+ fb = (FieldWriter) fb.fv;
+ }
+ out.putShort(nbMethods);
+ mb = firstMethod;
+ while (mb != null) {
+ mb.put(out);
+ mb = (MethodWriter) mb.mv;
+ }
+ out.putShort(attributeCount);
+ if (bootstrapMethods != null) { // should be the first class attribute ?
+ out.putShort(newUTF8("BootstrapMethods"));
+ out.putInt(bootstrapMethods.length + 2).putShort(bootstrapMethodsCount);
+ out.putByteArray(bootstrapMethods.data, 0, bootstrapMethods.length);
+ }
+ if (ClassReader.SIGNATURES && signature != 0) {
+ out.putShort(newUTF8("Signature")).putInt(2).putShort(signature);
+ }
+ if (sourceFile != 0) {
+ out.putShort(newUTF8("SourceFile")).putInt(2).putShort(sourceFile);
+ }
+ if (sourceDebug != null) {
+ int len = sourceDebug.length - 2;
+ out.putShort(newUTF8("SourceDebugExtension")).putInt(len);
+ out.putByteArray(sourceDebug.data, 2, len);
+ }
+ if (enclosingMethodOwner != 0) {
+ out.putShort(newUTF8("EnclosingMethod")).putInt(4);
+ out.putShort(enclosingMethodOwner).putShort(enclosingMethod);
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ out.putShort(newUTF8("Deprecated")).putInt(0);
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((version & 0xFFFF) < Opcodes.V1_5 || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ out.putShort(newUTF8("Synthetic")).putInt(0);
+ }
+ if (innerClasses != null) {
+ out.putShort(newUTF8("InnerClasses"));
+ out.putInt(innerClasses.length + 2).putShort(innerClassesCount);
+ out.putByteArray(innerClasses.data, 0, innerClasses.length);
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ out.putShort(newUTF8("RuntimeVisibleAnnotations"));
+ anns.put(out);
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ out.putShort(newUTF8("RuntimeInvisibleAnnotations"));
+ ianns.put(out);
+ }
+ if (attrs != null) {
+ attrs.put(this, null, 0, -1, -1, out);
+ }
+ if (invalidFrames) {
+ ClassWriter cw = new ClassWriter(COMPUTE_FRAMES);
+ new ClassReader(out.data).accept(cw, ClassReader.SKIP_FRAMES);
+ return cw.toByteArray();
+ }
+ return out.data;
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: constant pool management
+ // ------------------------------------------------------------------------
+
+ /**
+ * Adds a number or string constant to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ *
+ * @param cst the value of the constant to be added to the constant pool.
+ * This parameter must be an {@link Integer}, a {@link Float}, a
+ * {@link Long}, a {@link Double}, a {@link String} or a
+ * {@link Type}.
+ * @return a new or already existing constant item with the given value.
+ */
+ Item newConstItem(final Object cst) {
+ if (cst instanceof Integer) {
+ int val = ((Integer) cst).intValue();
+ return newInteger(val);
+ } else if (cst instanceof Byte) {
+ int val = ((Byte) cst).intValue();
+ return newInteger(val);
+ } else if (cst instanceof Character) {
+ int val = ((Character) cst).charValue();
+ return newInteger(val);
+ } else if (cst instanceof Short) {
+ int val = ((Short) cst).intValue();
+ return newInteger(val);
+ } else if (cst instanceof Boolean) {
+ int val = ((Boolean) cst).booleanValue() ? 1 : 0;
+ return newInteger(val);
+ } else if (cst instanceof Float) {
+ float val = ((Float) cst).floatValue();
+ return newFloat(val);
+ } else if (cst instanceof Long) {
+ long val = ((Long) cst).longValue();
+ return newLong(val);
+ } else if (cst instanceof Double) {
+ double val = ((Double) cst).doubleValue();
+ return newDouble(val);
+ } else if (cst instanceof String) {
+ return newString((String) cst);
+ } else if (cst instanceof Type) {
+ Type t = (Type) cst;
+ int s = t.getSort();
+ if (s == Type.ARRAY) {
+ return newClassItem(t.getDescriptor());
+ } else if (s == Type.OBJECT) {
+ return newClassItem(t.getInternalName());
+ } else { // s == Type.METHOD
+ return newMethodTypeItem(t.getDescriptor());
+ }
+ } else if (cst instanceof Handle) {
+ Handle h = (Handle) cst;
+ return newHandleItem(h.tag, h.owner, h.name, h.desc);
+ } else {
+ throw new IllegalArgumentException("value " + cst);
+ }
+ }
+
+ /**
+ * Adds a number or string constant to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param cst the value of the constant to be added to the constant pool.
+ * This parameter must be an {@link Integer}, a {@link Float}, a
+ * {@link Long}, a {@link Double} or a {@link String}.
+ * @return the index of a new or already existing constant item with the
+ * given value.
+ */
+ public int newConst(final Object cst) {
+ return newConstItem(cst).index;
+ }
+
+ /**
+ * Adds an UTF8 string to the constant pool of the class being build. Does
+ * nothing if the constant pool already contains a similar item. <i>This
+ * method is intended for {@link Attribute} sub classes, and is normally not
+ * needed by class generators or adapters.</i>
+ *
+ * @param value the String value.
+ * @return the index of a new or already existing UTF8 item.
+ */
+ public int newUTF8(final String value) {
+ key.set(UTF8, value, null, null);
+ Item result = get(key);
+ if (result == null) {
+ pool.putByte(UTF8).putUTF8(value);
+ result = new Item(index++, key);
+ put(result);
+ }
+ return result.index;
+ }
+
+ /**
+ * Adds a class reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param value the internal name of the class.
+ * @return a new or already existing class reference item.
+ */
+ Item newClassItem(final String value) {
+ key2.set(CLASS, value, null, null);
+ Item result = get(key2);
+ if (result == null) {
+ pool.put12(CLASS, newUTF8(value));
+ result = new Item(index++, key2);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a class reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param value the internal name of the class.
+ * @return the index of a new or already existing class reference item.
+ */
+ public int newClass(final String value) {
+ return newClassItem(value).index;
+ }
+
+ /**
+ * Adds a method type reference to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param methodDesc method descriptor of the method type.
+ * @return a new or already existing method type reference item.
+ */
+ Item newMethodTypeItem(final String methodDesc) {
+ key2.set(MTYPE, methodDesc, null, null);
+ Item result = get(key2);
+ if (result == null) {
+ pool.put12(MTYPE, newUTF8(methodDesc));
+ result = new Item(index++, key2);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a method type reference to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param methodDesc method descriptor of the method type.
+ * @return the index of a new or already existing method type reference
+ * item.
+ */
+ public int newMethodType(final String methodDesc) {
+ return newMethodTypeItem(methodDesc).index;
+ }
+
+ /**
+ * Adds a handle to the constant pool of the class being build. Does nothing
+ * if the constant pool already contains a similar item. <i>This method is
+ * intended for {@link Attribute} sub classes, and is normally not needed by
+ * class generators or adapters.</i>
+ *
+ * @param tag the kind of this handle. Must be {@link Opcodes#H_GETFIELD},
+ * {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD},
+ * {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL},
+ * {@link Opcodes#H_INVOKESTATIC}, {@link Opcodes#H_INVOKESPECIAL},
+ * {@link Opcodes#H_NEWINVOKESPECIAL} or
+ * {@link Opcodes#H_INVOKEINTERFACE}.
+ * @param owner the internal name of the field or method owner class.
+ * @param name the name of the field or method.
+ * @param desc the descriptor of the field or method.
+ * @return a new or an already existing method type reference item.
+ */
+ Item newHandleItem(
+ final int tag,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ key4.set(HANDLE_BASE + tag, owner, name, desc);
+ Item result = get(key4);
+ if (result == null) {
+ if (tag <= Opcodes.H_PUTSTATIC) {
+ put112(HANDLE, tag, newField(owner, name, desc));
+ } else {
+ put112(HANDLE, tag, newMethod(owner,
+ name,
+ desc,
+ tag == Opcodes.H_INVOKEINTERFACE));
+ }
+ result = new Item(index++, key4);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a handle to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param tag the kind of this handle. Must be {@link Opcodes#H_GETFIELD},
+ * {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD},
+ * {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL},
+ * {@link Opcodes#H_INVOKESTATIC}, {@link Opcodes#H_INVOKESPECIAL},
+ * {@link Opcodes#H_NEWINVOKESPECIAL} or
+ * {@link Opcodes#H_INVOKEINTERFACE}.
+ * @param owner the internal name of the field or method owner class.
+ * @param name the name of the field or method.
+ * @param desc the descriptor of the field or method.
+ * @return the index of a new or already existing method type reference
+ * item.
+ */
+ public int newHandle(
+ final int tag,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ return newHandleItem(tag, owner, name, desc).index;
+ }
+
+ /**
+ * Adds an invokedynamic reference to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param name name of the invoked method.
+ * @param desc descriptor of the invoke method.
+ * @param bsm the bootstrap method.
+ * @param bsmArgs the bootstrap method constant arguments.
+ *
+ * @return a new or an already existing invokedynamic type reference item.
+ */
+ Item newInvokeDynamicItem(
+ final String name,
+ final String desc,
+ final Handle bsm,
+ final Object... bsmArgs)
+ {
+ // cache for performance
+ ByteVector bootstrapMethods = this.bootstrapMethods;
+ if (bootstrapMethods == null) {
+ bootstrapMethods = this.bootstrapMethods = new ByteVector();
+ }
+
+ int position = bootstrapMethods.length; // record current position
+
+ int hashCode = bsm.hashCode();
+ bootstrapMethods.putShort(newHandle(bsm.tag,
+ bsm.owner,
+ bsm.name,
+ bsm.desc));
+
+ int argsLength = bsmArgs.length;
+ bootstrapMethods.putShort(argsLength);
+
+ for (int i = 0; i < argsLength; i++) {
+ Object bsmArg = bsmArgs[i];
+ hashCode ^= bsmArg.hashCode();
+ bootstrapMethods.putShort(newConst(bsmArg));
+ }
+
+ byte[] data = bootstrapMethods.data;
+ int length = (1 + 1 + argsLength) << 1; // (bsm + argCount + arguments)
+ hashCode &= 0x7FFFFFFF;
+ Item result = items[hashCode % items.length];
+ loop: while (result != null) {
+ if (result.type != BSM || result.hashCode != hashCode) {
+ result = result.next;
+ continue;
+ }
+
+ // because the data encode the size of the argument
+ // we don't need to test if these size are equals
+ int resultPosition = result.intVal;
+ for (int p = 0; p < length; p++) {
+ if (data[position + p] != data[resultPosition + p]) {
+ result = result.next;
+ continue loop;
+ }
+ }
+ break;
+ }
+
+ int bootstrapMethodIndex;
+ if (result != null) {
+ bootstrapMethodIndex = result.index;
+ bootstrapMethods.length = position; // revert to old position
+ } else {
+ bootstrapMethodIndex = bootstrapMethodsCount++;
+ result = new Item(bootstrapMethodIndex);
+ result.set(position, hashCode);
+ put(result);
+ }
+
+ // now, create the InvokeDynamic constant
+ key3.set(name, desc, bootstrapMethodIndex);
+ result = get(key3);
+ if (result == null) {
+ put122(INDY, bootstrapMethodIndex, newNameType(name, desc));
+ result = new Item(index++, key3);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds an invokedynamic reference to the constant pool of the class being
+ * build. Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param name name of the invoked method.
+ * @param desc descriptor of the invoke method.
+ * @param bsm the bootstrap method.
+ * @param bsmArgs the bootstrap method constant arguments.
+ *
+ * @return the index of a new or already existing invokedynamic
+ * reference item.
+ */
+ public int newInvokeDynamic(
+ final String name,
+ final String desc,
+ final Handle bsm,
+ final Object... bsmArgs)
+ {
+ return newInvokeDynamicItem(name, desc, bsm, bsmArgs).index;
+ }
+
+ /**
+ * Adds a field reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ *
+ * @param owner the internal name of the field's owner class.
+ * @param name the field's name.
+ * @param desc the field's descriptor.
+ * @return a new or already existing field reference item.
+ */
+ Item newFieldItem(final String owner, final String name, final String desc)
+ {
+ key3.set(FIELD, owner, name, desc);
+ Item result = get(key3);
+ if (result == null) {
+ put122(FIELD, newClass(owner), newNameType(name, desc));
+ result = new Item(index++, key3);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a field reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param owner the internal name of the field's owner class.
+ * @param name the field's name.
+ * @param desc the field's descriptor.
+ * @return the index of a new or already existing field reference item.
+ */
+ public int newField(final String owner, final String name, final String desc)
+ {
+ return newFieldItem(owner, name, desc).index;
+ }
+
+ /**
+ * Adds a method reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ *
+ * @param owner the internal name of the method's owner class.
+ * @param name the method's name.
+ * @param desc the method's descriptor.
+ * @param itf <tt>true</tt> if <tt>owner</tt> is an interface.
+ * @return a new or already existing method reference item.
+ */
+ Item newMethodItem(
+ final String owner,
+ final String name,
+ final String desc,
+ final boolean itf)
+ {
+ int type = itf ? IMETH : METH;
+ key3.set(type, owner, name, desc);
+ Item result = get(key3);
+ if (result == null) {
+ put122(type, newClass(owner), newNameType(name, desc));
+ result = new Item(index++, key3);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a method reference to the constant pool of the class being build.
+ * Does nothing if the constant pool already contains a similar item.
+ * <i>This method is intended for {@link Attribute} sub classes, and is
+ * normally not needed by class generators or adapters.</i>
+ *
+ * @param owner the internal name of the method's owner class.
+ * @param name the method's name.
+ * @param desc the method's descriptor.
+ * @param itf <tt>true</tt> if <tt>owner</tt> is an interface.
+ * @return the index of a new or already existing method reference item.
+ */
+ public int newMethod(
+ final String owner,
+ final String name,
+ final String desc,
+ final boolean itf)
+ {
+ return newMethodItem(owner, name, desc, itf).index;
+ }
+
+ /**
+ * Adds an integer to the constant pool of the class being build. Does
+ * nothing if the constant pool already contains a similar item.
+ *
+ * @param value the int value.
+ * @return a new or already existing int item.
+ */
+ Item newInteger(final int value) {
+ key.set(value);
+ Item result = get(key);
+ if (result == null) {
+ pool.putByte(INT).putInt(value);
+ result = new Item(index++, key);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a float to the constant pool of the class being build. Does nothing
+ * if the constant pool already contains a similar item.
+ *
+ * @param value the float value.
+ * @return a new or already existing float item.
+ */
+ Item newFloat(final float value) {
+ key.set(value);
+ Item result = get(key);
+ if (result == null) {
+ pool.putByte(FLOAT).putInt(key.intVal);
+ result = new Item(index++, key);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a long to the constant pool of the class being build. Does nothing
+ * if the constant pool already contains a similar item.
+ *
+ * @param value the long value.
+ * @return a new or already existing long item.
+ */
+ Item newLong(final long value) {
+ key.set(value);
+ Item result = get(key);
+ if (result == null) {
+ pool.putByte(LONG).putLong(value);
+ result = new Item(index, key);
+ index += 2;
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a double to the constant pool of the class being build. Does nothing
+ * if the constant pool already contains a similar item.
+ *
+ * @param value the double value.
+ * @return a new or already existing double item.
+ */
+ Item newDouble(final double value) {
+ key.set(value);
+ Item result = get(key);
+ if (result == null) {
+ pool.putByte(DOUBLE).putLong(key.longVal);
+ result = new Item(index, key);
+ index += 2;
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a string to the constant pool of the class being build. Does nothing
+ * if the constant pool already contains a similar item.
+ *
+ * @param value the String value.
+ * @return a new or already existing string item.
+ */
+ private Item newString(final String value) {
+ key2.set(STR, value, null, null);
+ Item result = get(key2);
+ if (result == null) {
+ pool.put12(STR, newUTF8(value));
+ result = new Item(index++, key2);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds a name and type to the constant pool of the class being build. Does
+ * nothing if the constant pool already contains a similar item. <i>This
+ * method is intended for {@link Attribute} sub classes, and is normally not
+ * needed by class generators or adapters.</i>
+ *
+ * @param name a name.
+ * @param desc a type descriptor.
+ * @return the index of a new or already existing name and type item.
+ */
+ public int newNameType(final String name, final String desc) {
+ return newNameTypeItem(name, desc).index;
+ }
+
+ /**
+ * Adds a name and type to the constant pool of the class being build. Does
+ * nothing if the constant pool already contains a similar item.
+ *
+ * @param name a name.
+ * @param desc a type descriptor.
+ * @return a new or already existing name and type item.
+ */
+ Item newNameTypeItem(final String name, final String desc) {
+ key2.set(NAME_TYPE, name, desc, null);
+ Item result = get(key2);
+ if (result == null) {
+ put122(NAME_TYPE, newUTF8(name), newUTF8(desc));
+ result = new Item(index++, key2);
+ put(result);
+ }
+ return result;
+ }
+
+ /**
+ * Adds the given internal name to {@link #typeTable} and returns its index.
+ * Does nothing if the type table already contains this internal name.
+ *
+ * @param type the internal name to be added to the type table.
+ * @return the index of this internal name in the type table.
+ */
+ int addType(final String type) {
+ key.set(TYPE_NORMAL, type, null, null);
+ Item result = get(key);
+ if (result == null) {
+ result = addType(key);
+ }
+ return result.index;
+ }
+
+ /**
+ * Adds the given "uninitialized" type to {@link #typeTable} and returns its
+ * index. This method is used for UNINITIALIZED types, made of an internal
+ * name and a bytecode offset.
+ *
+ * @param type the internal name to be added to the type table.
+ * @param offset the bytecode offset of the NEW instruction that created
+ * this UNINITIALIZED type value.
+ * @return the index of this internal name in the type table.
+ */
+ int addUninitializedType(final String type, final int offset) {
+ key.type = TYPE_UNINIT;
+ key.intVal = offset;
+ key.strVal1 = type;
+ key.hashCode = 0x7FFFFFFF & (TYPE_UNINIT + type.hashCode() + offset);
+ Item result = get(key);
+ if (result == null) {
+ result = addType(key);
+ }
+ return result.index;
+ }
+
+ /**
+ * Adds the given Item to {@link #typeTable}.
+ *
+ * @param item the value to be added to the type table.
+ * @return the added Item, which a new Item instance with the same value as
+ * the given Item.
+ */
+ private Item addType(final Item item) {
+ ++typeCount;
+ Item result = new Item(typeCount, key);
+ put(result);
+ if (typeTable == null) {
+ typeTable = new Item[16];
+ }
+ if (typeCount == typeTable.length) {
+ Item[] newTable = new Item[2 * typeTable.length];
+ System.arraycopy(typeTable, 0, newTable, 0, typeTable.length);
+ typeTable = newTable;
+ }
+ typeTable[typeCount] = result;
+ return result;
+ }
+
+ /**
+ * Returns the index of the common super type of the two given types. This
+ * method calls {@link #getCommonSuperClass} and caches the result in the
+ * {@link #items} hash table to speedup future calls with the same
+ * parameters.
+ *
+ * @param type1 index of an internal name in {@link #typeTable}.
+ * @param type2 index of an internal name in {@link #typeTable}.
+ * @return the index of the common super type of the two given types.
+ */
+ int getMergedType(final int type1, final int type2) {
+ key2.type = TYPE_MERGED;
+ key2.longVal = type1 | (((long) type2) << 32);
+ key2.hashCode = 0x7FFFFFFF & (TYPE_MERGED + type1 + type2);
+ Item result = get(key2);
+ if (result == null) {
+ String t = typeTable[type1].strVal1;
+ String u = typeTable[type2].strVal1;
+ key2.intVal = addType(getCommonSuperClass(t, u));
+ result = new Item((short) 0, key2);
+ put(result);
+ }
+ return result.intVal;
+ }
+
+ /**
+ * Returns the common super type of the two given types. The default
+ * implementation of this method <i>loads<i> the two given classes and uses
+ * the java.lang.Class methods to find the common super class. It can be
+ * overridden to compute this common super type in other ways, in particular
+ * without actually loading any class, or to take into account the class
+ * that is currently being generated by this ClassWriter, which can of
+ * course not be loaded since it is under construction.
+ *
+ * @param type1 the internal name of a class.
+ * @param type2 the internal name of another class.
+ * @return the internal name of the common super class of the two given
+ * classes.
+ */
+ protected String getCommonSuperClass(final String type1, final String type2)
+ {
+ Class<?> c, d;
+ ClassLoader classLoader = getClass().getClassLoader();
+ try {
+ c = Class.forName(type1.replace('/', '.'), false, classLoader);
+ d = Class.forName(type2.replace('/', '.'), false, classLoader);
+ } catch (Exception e) {
+ throw new RuntimeException(e.toString());
+ }
+ if (c.isAssignableFrom(d)) {
+ return type1;
+ }
+ if (d.isAssignableFrom(c)) {
+ return type2;
+ }
+ if (c.isInterface() || d.isInterface()) {
+ return "java/lang/Object";
+ } else {
+ do {
+ c = c.getSuperclass();
+ } while (!c.isAssignableFrom(d));
+ return c.getName().replace('.', '/');
+ }
+ }
+
+ /**
+ * Returns the constant pool's hash table item which is equal to the given
+ * item.
+ *
+ * @param key a constant pool item.
+ * @return the constant pool's hash table item which is equal to the given
+ * item, or <tt>null</tt> if there is no such item.
+ */
+ private Item get(final Item key) {
+ Item i = items[key.hashCode % items.length];
+ while (i != null && (i.type != key.type || !key.isEqualTo(i))) {
+ i = i.next;
+ }
+ return i;
+ }
+
+ /**
+ * Puts the given item in the constant pool's hash table. The hash table
+ * <i>must</i> not already contains this item.
+ *
+ * @param i the item to be added to the constant pool's hash table.
+ */
+ private void put(final Item i) {
+ if (index + typeCount > threshold) {
+ int ll = items.length;
+ int nl = ll * 2 + 1;
+ Item[] newItems = new Item[nl];
+ for (int l = ll - 1; l >= 0; --l) {
+ Item j = items[l];
+ while (j != null) {
+ int index = j.hashCode % newItems.length;
+ Item k = j.next;
+ j.next = newItems[index];
+ newItems[index] = j;
+ j = k;
+ }
+ }
+ items = newItems;
+ threshold = (int) (nl * 0.75);
+ }
+ int index = i.hashCode % items.length;
+ i.next = items[index];
+ items[index] = i;
+ }
+
+ /**
+ * Puts one byte and two shorts into the constant pool.
+ *
+ * @param b a byte.
+ * @param s1 a short.
+ * @param s2 another short.
+ */
+ private void put122(final int b, final int s1, final int s2) {
+ pool.put12(b, s1).putShort(s2);
+ }
+
+ /**
+ * Puts two bytes and one short into the constant pool.
+ *
+ * @param b1 a byte.
+ * @param b2 another byte.
+ * @param s a short.
+ */
+ private void put112(final int b1, final int b2, final int s) {
+ pool.put11(b1, b2).putShort(s);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java
new file mode 100644
index 0000000..62e1e6d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java
@@ -0,0 +1,104 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * An edge in the control flow graph of a method body. See {@link Label Label}.
+ *
+ * @author Eric Bruneton
+ */
+class Edge {
+
+ /**
+ * Denotes a normal control flow graph edge.
+ */
+ static final int NORMAL = 0;
+
+ /**
+ * Denotes a control flow graph edge corresponding to an exception handler.
+ * More precisely any {@link Edge} whose {@link #info} is strictly positive
+ * corresponds to an exception handler. The actual value of {@link #info} is
+ * the index, in the {@link ClassWriter} type table, of the exception that
+ * is catched.
+ */
+ static final int EXCEPTION = 0x7FFFFFFF;
+
+ /**
+ * Information about this control flow graph edge. If
+ * {@link ClassWriter#COMPUTE_MAXS} is used this field is the (relative)
+ * stack size in the basic block from which this edge originates. This size
+ * is equal to the stack size at the "jump" instruction to which this edge
+ * corresponds, relatively to the stack size at the beginning of the
+ * originating basic block. If {@link ClassWriter#COMPUTE_FRAMES} is used,
+ * this field is the kind of this control flow graph edge (i.e. NORMAL or
+ * EXCEPTION).
+ */
+ int info;
+
+ /**
+ * The successor block of the basic block from which this edge originates.
+ */
+ Label successor;
+
+ /**
+ * The next edge in the list of successors of the originating basic block.
+ * See {@link Label#successors successors}.
+ */
+ Edge next;
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
new file mode 100644
index 0000000..116be9f
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
@@ -0,0 +1,144 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java field. The methods of this class must be called
+ * in the following order: ( <tt>visitAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* <tt>visitEnd</tt>.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class FieldVisitor {
+
+ /**
+ * The ASM API version implemented by this visitor. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * The field visitor to which this visitor must delegate method calls. May
+ * be null.
+ */
+ protected FieldVisitor fv;
+
+ /**
+ * Constructs a new {@link FieldVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public FieldVisitor(final int api) {
+ this(api, null);
+ }
+
+ /**
+ * Constructs a new {@link FieldVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param fv the field visitor to which this visitor must delegate method
+ * calls. May be null.
+ */
+ public FieldVisitor(final int api, final FieldVisitor fv) {
+ /*if (api != Opcodes.ASM4) {
+ throw new IllegalArgumentException();
+ }*/
+ this.api = api;
+ this.fv = fv;
+ }
+
+ /**
+ * Visits an annotation of the field.
+ *
+ * @param desc the class descriptor of the annotation class.
+ * @param visible <tt>true</tt> if the annotation is visible at runtime.
+ * @return a visitor to visit the annotation values, or <tt>null</tt> if
+ * this visitor is not interested in visiting this annotation.
+ */
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ if (fv != null) {
+ return fv.visitAnnotation(desc, visible);
+ }
+ return null;
+ }
+
+ /**
+ * Visits a non standard attribute of the field.
+ *
+ * @param attr an attribute.
+ */
+ public void visitAttribute(Attribute attr) {
+ if (fv != null) {
+ fv.visitAttribute(attr);
+ }
+ }
+
+ /**
+ * Visits the end of the field. This method, which is the last one to be
+ * called, is used to inform the visitor that all the annotations and
+ * attributes of the field have been visited.
+ */
+ public void visitEnd() {
+ if (fv != null) {
+ fv.visitEnd();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
new file mode 100644
index 0000000..53d3fa2
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
@@ -0,0 +1,300 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * An {@link FieldVisitor} that generates Java fields in bytecode form.
+ *
+ * @author Eric Bruneton
+ */
+final class FieldWriter extends FieldVisitor {
+
+ /**
+ * The class writer to which this field must be added.
+ */
+ private final ClassWriter cw;
+
+ /**
+ * Access flags of this field.
+ */
+ private final int access;
+
+ /**
+ * The index of the constant pool item that contains the name of this
+ * method.
+ */
+ private final int name;
+
+ /**
+ * The index of the constant pool item that contains the descriptor of this
+ * field.
+ */
+ private final int desc;
+
+ /**
+ * The index of the constant pool item that contains the signature of this
+ * field.
+ */
+ private int signature;
+
+ /**
+ * The index of the constant pool item that contains the constant value of
+ * this field.
+ */
+ private int value;
+
+ /**
+ * The runtime visible annotations of this field. May be <tt>null</tt>.
+ */
+ private AnnotationWriter anns;
+
+ /**
+ * The runtime invisible annotations of this field. May be <tt>null</tt>.
+ */
+ private AnnotationWriter ianns;
+
+ /**
+ * The non standard attributes of this field. May be <tt>null</tt>.
+ */
+ private Attribute attrs;
+
+ // ------------------------------------------------------------------------
+ // Constructor
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new {@link FieldWriter}.
+ *
+ * @param cw the class writer to which this field must be added.
+ * @param access the field's access flags (see {@link Opcodes}).
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link Type}).
+ * @param signature the field's signature. May be <tt>null</tt>.
+ * @param value the field's constant value. May be <tt>null</tt>.
+ */
+ FieldWriter(
+ final ClassWriter cw,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ super(Opcodes.ASM4);
+ if (cw.firstField == null) {
+ cw.firstField = this;
+ } else {
+ cw.lastField.fv = this;
+ }
+ cw.lastField = this;
+ this.cw = cw;
+ this.access = access;
+ this.name = cw.newUTF8(name);
+ this.desc = cw.newUTF8(desc);
+ if (ClassReader.SIGNATURES && signature != null) {
+ this.signature = cw.newUTF8(signature);
+ }
+ if (value != null) {
+ this.value = cw.newConstItem(value).index;
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the FieldVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ if (!ClassReader.ANNOTATIONS) {
+ return null;
+ }
+ ByteVector bv = new ByteVector();
+ // write type, and reserve space for values count
+ bv.putShort(cw.newUTF8(desc)).putShort(0);
+ AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+ if (visible) {
+ aw.next = anns;
+ anns = aw;
+ } else {
+ aw.next = ianns;
+ ianns = aw;
+ }
+ return aw;
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ attr.next = attrs;
+ attrs = attr;
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the size of this field.
+ *
+ * @return the size of this field.
+ */
+ int getSize() {
+ int size = 8;
+ if (value != 0) {
+ cw.newUTF8("ConstantValue");
+ size += 8;
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ cw.newUTF8("Synthetic");
+ size += 6;
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ cw.newUTF8("Deprecated");
+ size += 6;
+ }
+ if (ClassReader.SIGNATURES && signature != 0) {
+ cw.newUTF8("Signature");
+ size += 8;
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ cw.newUTF8("RuntimeVisibleAnnotations");
+ size += 8 + anns.getSize();
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ cw.newUTF8("RuntimeInvisibleAnnotations");
+ size += 8 + ianns.getSize();
+ }
+ if (attrs != null) {
+ size += attrs.getSize(cw, null, 0, -1, -1);
+ }
+ return size;
+ }
+
+ /**
+ * Puts the content of this field into the given byte vector.
+ *
+ * @param out where the content of this field must be put.
+ */
+ void put(final ByteVector out) {
+ int mask = Opcodes.ACC_DEPRECATED
+ | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / (ClassWriter.ACC_SYNTHETIC_ATTRIBUTE / Opcodes.ACC_SYNTHETIC));
+ out.putShort(access & ~mask).putShort(name).putShort(desc);
+ int attributeCount = 0;
+ if (value != 0) {
+ ++attributeCount;
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ ++attributeCount;
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ ++attributeCount;
+ }
+ if (ClassReader.SIGNATURES && signature != 0) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ ++attributeCount;
+ }
+ if (attrs != null) {
+ attributeCount += attrs.getCount();
+ }
+ out.putShort(attributeCount);
+ if (value != 0) {
+ out.putShort(cw.newUTF8("ConstantValue"));
+ out.putInt(2).putShort(value);
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+ }
+ if (ClassReader.SIGNATURES && signature != 0) {
+ out.putShort(cw.newUTF8("Signature"));
+ out.putInt(2).putShort(signature);
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+ anns.put(out);
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+ ianns.put(out);
+ }
+ if (attrs != null) {
+ attrs.put(cw, null, 0, -1, -1, out);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java
new file mode 100644
index 0000000..48e331d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java
@@ -0,0 +1,1464 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * Information about the input and output stack map frames of a basic block.
+ *
+ * @author Eric Bruneton
+ */
+final class Frame {
+
+ /*
+ * Frames are computed in a two steps process: during the visit of each
+ * instruction, the state of the frame at the end of current basic block is
+ * updated by simulating the action of the instruction on the previous state
+ * of this so called "output frame". In visitMaxs, a fix point algorithm is
+ * used to compute the "input frame" of each basic block, i.e. the stack map
+ * frame at the beginning of the basic block, starting from the input frame
+ * of the first basic block (which is computed from the method descriptor),
+ * and by using the previously computed output frames to compute the input
+ * state of the other blocks.
+ *
+ * All output and input frames are stored as arrays of integers. Reference
+ * and array types are represented by an index into a type table (which is
+ * not the same as the constant pool of the class, in order to avoid adding
+ * unnecessary constants in the pool - not all computed frames will end up
+ * being stored in the stack map table). This allows very fast type
+ * comparisons.
+ *
+ * Output stack map frames are computed relatively to the input frame of the
+ * basic block, which is not yet known when output frames are computed. It
+ * is therefore necessary to be able to represent abstract types such as
+ * "the type at position x in the input frame locals" or "the type at
+ * position x from the top of the input frame stack" or even "the type at
+ * position x in the input frame, with y more (or less) array dimensions".
+ * This explains the rather complicated type format used in output frames.
+ *
+ * This format is the following: DIM KIND VALUE (4, 4 and 24 bits). DIM is a
+ * signed number of array dimensions (from -8 to 7). KIND is either BASE,
+ * LOCAL or STACK. BASE is used for types that are not relative to the input
+ * frame. LOCAL is used for types that are relative to the input local
+ * variable types. STACK is used for types that are relative to the input
+ * stack types. VALUE depends on KIND. For LOCAL types, it is an index in
+ * the input local variable types. For STACK types, it is a position
+ * relatively to the top of input frame stack. For BASE types, it is either
+ * one of the constants defined in FrameVisitor, or for OBJECT and
+ * UNINITIALIZED types, a tag and an index in the type table.
+ *
+ * Output frames can contain types of any kind and with a positive or
+ * negative dimension (and even unassigned types, represented by 0 - which
+ * does not correspond to any valid type value). Input frames can only
+ * contain BASE types of positive or null dimension. In all cases the type
+ * table contains only internal type names (array type descriptors are
+ * forbidden - dimensions must be represented through the DIM field).
+ *
+ * The LONG and DOUBLE types are always represented by using two slots (LONG +
+ * TOP or DOUBLE + TOP), for local variable types as well as in the operand
+ * stack. This is necessary to be able to simulate DUPx_y instructions,
+ * whose effect would be dependent on the actual type values if types were
+ * always represented by a single slot in the stack (and this is not
+ * possible, since actual type values are not always known - cf LOCAL and
+ * STACK type kinds).
+ */
+
+ /**
+ * Mask to get the dimension of a frame type. This dimension is a signed
+ * integer between -8 and 7.
+ */
+ static final int DIM = 0xF0000000;
+
+ /**
+ * Constant to be added to a type to get a type with one more dimension.
+ */
+ static final int ARRAY_OF = 0x10000000;
+
+ /**
+ * Constant to be added to a type to get a type with one less dimension.
+ */
+ static final int ELEMENT_OF = 0xF0000000;
+
+ /**
+ * Mask to get the kind of a frame type.
+ *
+ * @see #BASE
+ * @see #LOCAL
+ * @see #STACK
+ */
+ static final int KIND = 0xF000000;
+
+ /**
+ * Flag used for LOCAL and STACK types. Indicates that if this type happens
+ * to be a long or double type (during the computations of input frames),
+ * then it must be set to TOP because the second word of this value has
+ * been reused to store other data in the basic block. Hence the first word
+ * no longer stores a valid long or double value.
+ */
+ static final int TOP_IF_LONG_OR_DOUBLE = 0x800000;
+
+ /**
+ * Mask to get the value of a frame type.
+ */
+ static final int VALUE = 0x7FFFFF;
+
+ /**
+ * Mask to get the kind of base types.
+ */
+ static final int BASE_KIND = 0xFF00000;
+
+ /**
+ * Mask to get the value of base types.
+ */
+ static final int BASE_VALUE = 0xFFFFF;
+
+ /**
+ * Kind of the types that are not relative to an input stack map frame.
+ */
+ static final int BASE = 0x1000000;
+
+ /**
+ * Base kind of the base reference types. The BASE_VALUE of such types is an
+ * index into the type table.
+ */
+ static final int OBJECT = BASE | 0x700000;
+
+ /**
+ * Base kind of the uninitialized base types. The BASE_VALUE of such types
+ * in an index into the type table (the Item at that index contains both an
+ * instruction offset and an internal class name).
+ */
+ static final int UNINITIALIZED = BASE | 0x800000;
+
+ /**
+ * Kind of the types that are relative to the local variable types of an
+ * input stack map frame. The value of such types is a local variable index.
+ */
+ private static final int LOCAL = 0x2000000;
+
+ /**
+ * Kind of the the types that are relative to the stack of an input stack
+ * map frame. The value of such types is a position relatively to the top of
+ * this stack.
+ */
+ private static final int STACK = 0x3000000;
+
+ /**
+ * The TOP type. This is a BASE type.
+ */
+ static final int TOP = BASE | 0;
+
+ /**
+ * The BOOLEAN type. This is a BASE type mainly used for array types.
+ */
+ static final int BOOLEAN = BASE | 9;
+
+ /**
+ * The BYTE type. This is a BASE type mainly used for array types.
+ */
+ static final int BYTE = BASE | 10;
+
+ /**
+ * The CHAR type. This is a BASE type mainly used for array types.
+ */
+ static final int CHAR = BASE | 11;
+
+ /**
+ * The SHORT type. This is a BASE type mainly used for array types.
+ */
+ static final int SHORT = BASE | 12;
+
+ /**
+ * The INTEGER type. This is a BASE type.
+ */
+ static final int INTEGER = BASE | 1;
+
+ /**
+ * The FLOAT type. This is a BASE type.
+ */
+ static final int FLOAT = BASE | 2;
+
+ /**
+ * The DOUBLE type. This is a BASE type.
+ */
+ static final int DOUBLE = BASE | 3;
+
+ /**
+ * The LONG type. This is a BASE type.
+ */
+ static final int LONG = BASE | 4;
+
+ /**
+ * The NULL type. This is a BASE type.
+ */
+ static final int NULL = BASE | 5;
+
+ /**
+ * The UNINITIALIZED_THIS type. This is a BASE type.
+ */
+ static final int UNINITIALIZED_THIS = BASE | 6;
+
+ /**
+ * The stack size variation corresponding to each JVM instruction. This
+ * stack variation is equal to the size of the values produced by an
+ * instruction, minus the size of the values consumed by this instruction.
+ */
+ static final int[] SIZE;
+
+ /**
+ * Computes the stack size variation corresponding to each JVM instruction.
+ */
+ static {
+ int i;
+ int[] b = new int[202];
+ String s = "EFFFFFFFFGGFFFGGFFFEEFGFGFEEEEEEEEEEEEEEEEEEEEDEDEDDDDD"
+ + "CDCDEEEEEEEEEEEEEEEEEEEEBABABBBBDCFFFGGGEDCDCDCDCDCDCDCDCD"
+ + "CDCEEEEDDDDDDDCDCDCEFEFDDEEFFDEDEEEBDDBBDDDDDDCCCCCCCCEFED"
+ + "DDCDCDEEEEEEEEEEFEEEEEEDDEEDDEE";
+ for (i = 0; i < b.length; ++i) {
+ b[i] = s.charAt(i) - 'E';
+ }
+ SIZE = b;
+
+ // code to generate the above string
+ //
+ // int NA = 0; // not applicable (unused opcode or variable size opcode)
+ //
+ // b = new int[] {
+ // 0, //NOP, // visitInsn
+ // 1, //ACONST_NULL, // -
+ // 1, //ICONST_M1, // -
+ // 1, //ICONST_0, // -
+ // 1, //ICONST_1, // -
+ // 1, //ICONST_2, // -
+ // 1, //ICONST_3, // -
+ // 1, //ICONST_4, // -
+ // 1, //ICONST_5, // -
+ // 2, //LCONST_0, // -
+ // 2, //LCONST_1, // -
+ // 1, //FCONST_0, // -
+ // 1, //FCONST_1, // -
+ // 1, //FCONST_2, // -
+ // 2, //DCONST_0, // -
+ // 2, //DCONST_1, // -
+ // 1, //BIPUSH, // visitIntInsn
+ // 1, //SIPUSH, // -
+ // 1, //LDC, // visitLdcInsn
+ // NA, //LDC_W, // -
+ // NA, //LDC2_W, // -
+ // 1, //ILOAD, // visitVarInsn
+ // 2, //LLOAD, // -
+ // 1, //FLOAD, // -
+ // 2, //DLOAD, // -
+ // 1, //ALOAD, // -
+ // NA, //ILOAD_0, // -
+ // NA, //ILOAD_1, // -
+ // NA, //ILOAD_2, // -
+ // NA, //ILOAD_3, // -
+ // NA, //LLOAD_0, // -
+ // NA, //LLOAD_1, // -
+ // NA, //LLOAD_2, // -
+ // NA, //LLOAD_3, // -
+ // NA, //FLOAD_0, // -
+ // NA, //FLOAD_1, // -
+ // NA, //FLOAD_2, // -
+ // NA, //FLOAD_3, // -
+ // NA, //DLOAD_0, // -
+ // NA, //DLOAD_1, // -
+ // NA, //DLOAD_2, // -
+ // NA, //DLOAD_3, // -
+ // NA, //ALOAD_0, // -
+ // NA, //ALOAD_1, // -
+ // NA, //ALOAD_2, // -
+ // NA, //ALOAD_3, // -
+ // -1, //IALOAD, // visitInsn
+ // 0, //LALOAD, // -
+ // -1, //FALOAD, // -
+ // 0, //DALOAD, // -
+ // -1, //AALOAD, // -
+ // -1, //BALOAD, // -
+ // -1, //CALOAD, // -
+ // -1, //SALOAD, // -
+ // -1, //ISTORE, // visitVarInsn
+ // -2, //LSTORE, // -
+ // -1, //FSTORE, // -
+ // -2, //DSTORE, // -
+ // -1, //ASTORE, // -
+ // NA, //ISTORE_0, // -
+ // NA, //ISTORE_1, // -
+ // NA, //ISTORE_2, // -
+ // NA, //ISTORE_3, // -
+ // NA, //LSTORE_0, // -
+ // NA, //LSTORE_1, // -
+ // NA, //LSTORE_2, // -
+ // NA, //LSTORE_3, // -
+ // NA, //FSTORE_0, // -
+ // NA, //FSTORE_1, // -
+ // NA, //FSTORE_2, // -
+ // NA, //FSTORE_3, // -
+ // NA, //DSTORE_0, // -
+ // NA, //DSTORE_1, // -
+ // NA, //DSTORE_2, // -
+ // NA, //DSTORE_3, // -
+ // NA, //ASTORE_0, // -
+ // NA, //ASTORE_1, // -
+ // NA, //ASTORE_2, // -
+ // NA, //ASTORE_3, // -
+ // -3, //IASTORE, // visitInsn
+ // -4, //LASTORE, // -
+ // -3, //FASTORE, // -
+ // -4, //DASTORE, // -
+ // -3, //AASTORE, // -
+ // -3, //BASTORE, // -
+ // -3, //CASTORE, // -
+ // -3, //SASTORE, // -
+ // -1, //POP, // -
+ // -2, //POP2, // -
+ // 1, //DUP, // -
+ // 1, //DUP_X1, // -
+ // 1, //DUP_X2, // -
+ // 2, //DUP2, // -
+ // 2, //DUP2_X1, // -
+ // 2, //DUP2_X2, // -
+ // 0, //SWAP, // -
+ // -1, //IADD, // -
+ // -2, //LADD, // -
+ // -1, //FADD, // -
+ // -2, //DADD, // -
+ // -1, //ISUB, // -
+ // -2, //LSUB, // -
+ // -1, //FSUB, // -
+ // -2, //DSUB, // -
+ // -1, //IMUL, // -
+ // -2, //LMUL, // -
+ // -1, //FMUL, // -
+ // -2, //DMUL, // -
+ // -1, //IDIV, // -
+ // -2, //LDIV, // -
+ // -1, //FDIV, // -
+ // -2, //DDIV, // -
+ // -1, //IREM, // -
+ // -2, //LREM, // -
+ // -1, //FREM, // -
+ // -2, //DREM, // -
+ // 0, //INEG, // -
+ // 0, //LNEG, // -
+ // 0, //FNEG, // -
+ // 0, //DNEG, // -
+ // -1, //ISHL, // -
+ // -1, //LSHL, // -
+ // -1, //ISHR, // -
+ // -1, //LSHR, // -
+ // -1, //IUSHR, // -
+ // -1, //LUSHR, // -
+ // -1, //IAND, // -
+ // -2, //LAND, // -
+ // -1, //IOR, // -
+ // -2, //LOR, // -
+ // -1, //IXOR, // -
+ // -2, //LXOR, // -
+ // 0, //IINC, // visitIincInsn
+ // 1, //I2L, // visitInsn
+ // 0, //I2F, // -
+ // 1, //I2D, // -
+ // -1, //L2I, // -
+ // -1, //L2F, // -
+ // 0, //L2D, // -
+ // 0, //F2I, // -
+ // 1, //F2L, // -
+ // 1, //F2D, // -
+ // -1, //D2I, // -
+ // 0, //D2L, // -
+ // -1, //D2F, // -
+ // 0, //I2B, // -
+ // 0, //I2C, // -
+ // 0, //I2S, // -
+ // -3, //LCMP, // -
+ // -1, //FCMPL, // -
+ // -1, //FCMPG, // -
+ // -3, //DCMPL, // -
+ // -3, //DCMPG, // -
+ // -1, //IFEQ, // visitJumpInsn
+ // -1, //IFNE, // -
+ // -1, //IFLT, // -
+ // -1, //IFGE, // -
+ // -1, //IFGT, // -
+ // -1, //IFLE, // -
+ // -2, //IF_ICMPEQ, // -
+ // -2, //IF_ICMPNE, // -
+ // -2, //IF_ICMPLT, // -
+ // -2, //IF_ICMPGE, // -
+ // -2, //IF_ICMPGT, // -
+ // -2, //IF_ICMPLE, // -
+ // -2, //IF_ACMPEQ, // -
+ // -2, //IF_ACMPNE, // -
+ // 0, //GOTO, // -
+ // 1, //JSR, // -
+ // 0, //RET, // visitVarInsn
+ // -1, //TABLESWITCH, // visiTableSwitchInsn
+ // -1, //LOOKUPSWITCH, // visitLookupSwitch
+ // -1, //IRETURN, // visitInsn
+ // -2, //LRETURN, // -
+ // -1, //FRETURN, // -
+ // -2, //DRETURN, // -
+ // -1, //ARETURN, // -
+ // 0, //RETURN, // -
+ // NA, //GETSTATIC, // visitFieldInsn
+ // NA, //PUTSTATIC, // -
+ // NA, //GETFIELD, // -
+ // NA, //PUTFIELD, // -
+ // NA, //INVOKEVIRTUAL, // visitMethodInsn
+ // NA, //INVOKESPECIAL, // -
+ // NA, //INVOKESTATIC, // -
+ // NA, //INVOKEINTERFACE, // -
+ // NA, //INVOKEDYNAMIC, // visitInvokeDynamicInsn
+ // 1, //NEW, // visitTypeInsn
+ // 0, //NEWARRAY, // visitIntInsn
+ // 0, //ANEWARRAY, // visitTypeInsn
+ // 0, //ARRAYLENGTH, // visitInsn
+ // NA, //ATHROW, // -
+ // 0, //CHECKCAST, // visitTypeInsn
+ // 0, //INSTANCEOF, // -
+ // -1, //MONITORENTER, // visitInsn
+ // -1, //MONITOREXIT, // -
+ // NA, //WIDE, // NOT VISITED
+ // NA, //MULTIANEWARRAY, // visitMultiANewArrayInsn
+ // -1, //IFNULL, // visitJumpInsn
+ // -1, //IFNONNULL, // -
+ // NA, //GOTO_W, // -
+ // NA, //JSR_W, // -
+ // };
+ // for (i = 0; i < b.length; ++i) {
+ // System.err.print((char)('E' + b[i]));
+ // }
+ // System.err.println();
+ }
+
+ /**
+ * The label (i.e. basic block) to which these input and output stack map
+ * frames correspond.
+ */
+ Label owner;
+
+ /**
+ * The input stack map frame locals.
+ */
+ int[] inputLocals;
+
+ /**
+ * The input stack map frame stack.
+ */
+ int[] inputStack;
+
+ /**
+ * The output stack map frame locals.
+ */
+ private int[] outputLocals;
+
+ /**
+ * The output stack map frame stack.
+ */
+ private int[] outputStack;
+
+ /**
+ * Relative size of the output stack. The exact semantics of this field
+ * depends on the algorithm that is used.
+ *
+ * When only the maximum stack size is computed, this field is the size of
+ * the output stack relatively to the top of the input stack.
+ *
+ * When the stack map frames are completely computed, this field is the
+ * actual number of types in {@link #outputStack}.
+ */
+ private int outputStackTop;
+
+ /**
+ * Number of types that are initialized in the basic block.
+ *
+ * @see #initializations
+ */
+ private int initializationCount;
+
+ /**
+ * The types that are initialized in the basic block. A constructor
+ * invocation on an UNINITIALIZED or UNINITIALIZED_THIS type must replace
+ * <i>every occurence</i> of this type in the local variables and in the
+ * operand stack. This cannot be done during the first phase of the
+ * algorithm since, during this phase, the local variables and the operand
+ * stack are not completely computed. It is therefore necessary to store the
+ * types on which constructors are invoked in the basic block, in order to
+ * do this replacement during the second phase of the algorithm, where the
+ * frames are fully computed. Note that this array can contain types that
+ * are relative to input locals or to the input stack (see below for the
+ * description of the algorithm).
+ */
+ private int[] initializations;
+
+ /**
+ * Returns the output frame local variable type at the given index.
+ *
+ * @param local the index of the local that must be returned.
+ * @return the output frame local variable type at the given index.
+ */
+ private int get(final int local) {
+ if (outputLocals == null || local >= outputLocals.length) {
+ // this local has never been assigned in this basic block,
+ // so it is still equal to its value in the input frame
+ return LOCAL | local;
+ } else {
+ int type = outputLocals[local];
+ if (type == 0) {
+ // this local has never been assigned in this basic block,
+ // so it is still equal to its value in the input frame
+ type = outputLocals[local] = LOCAL | local;
+ }
+ return type;
+ }
+ }
+
+ /**
+ * Sets the output frame local variable type at the given index.
+ *
+ * @param local the index of the local that must be set.
+ * @param type the value of the local that must be set.
+ */
+ private void set(final int local, final int type) {
+ // creates and/or resizes the output local variables array if necessary
+ if (outputLocals == null) {
+ outputLocals = new int[10];
+ }
+ int n = outputLocals.length;
+ if (local >= n) {
+ int[] t = new int[Math.max(local + 1, 2 * n)];
+ System.arraycopy(outputLocals, 0, t, 0, n);
+ outputLocals = t;
+ }
+ // sets the local variable
+ outputLocals[local] = type;
+ }
+
+ /**
+ * Pushes a new type onto the output frame stack.
+ *
+ * @param type the type that must be pushed.
+ */
+ private void push(final int type) {
+ // creates and/or resizes the output stack array if necessary
+ if (outputStack == null) {
+ outputStack = new int[10];
+ }
+ int n = outputStack.length;
+ if (outputStackTop >= n) {
+ int[] t = new int[Math.max(outputStackTop + 1, 2 * n)];
+ System.arraycopy(outputStack, 0, t, 0, n);
+ outputStack = t;
+ }
+ // pushes the type on the output stack
+ outputStack[outputStackTop++] = type;
+ // updates the maximun height reached by the output stack, if needed
+ int top = owner.inputStackTop + outputStackTop;
+ if (top > owner.outputStackMax) {
+ owner.outputStackMax = top;
+ }
+ }
+
+ /**
+ * Pushes a new type onto the output frame stack.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param desc the descriptor of the type to be pushed. Can also be a method
+ * descriptor (in this case this method pushes its return type onto
+ * the output frame stack).
+ */
+ private void push(final ClassWriter cw, final String desc) {
+ int type = type(cw, desc);
+ if (type != 0) {
+ push(type);
+ if (type == LONG || type == DOUBLE) {
+ push(TOP);
+ }
+ }
+ }
+
+ /**
+ * Returns the int encoding of the given type.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param desc a type descriptor.
+ * @return the int encoding of the given type.
+ */
+ private static int type(final ClassWriter cw, final String desc) {
+ String t;
+ int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0;
+ switch (desc.charAt(index)) {
+ case 'V':
+ return 0;
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ return INTEGER;
+ case 'F':
+ return FLOAT;
+ case 'J':
+ return LONG;
+ case 'D':
+ return DOUBLE;
+ case 'L':
+ // stores the internal name, not the descriptor!
+ t = desc.substring(index + 1, desc.length() - 1);
+ return OBJECT | cw.addType(t);
+ // case '[':
+ default:
+ // extracts the dimensions and the element type
+ int data;
+ int dims = index + 1;
+ while (desc.charAt(dims) == '[') {
+ ++dims;
+ }
+ switch (desc.charAt(dims)) {
+ case 'Z':
+ data = BOOLEAN;
+ break;
+ case 'C':
+ data = CHAR;
+ break;
+ case 'B':
+ data = BYTE;
+ break;
+ case 'S':
+ data = SHORT;
+ break;
+ case 'I':
+ data = INTEGER;
+ break;
+ case 'F':
+ data = FLOAT;
+ break;
+ case 'J':
+ data = LONG;
+ break;
+ case 'D':
+ data = DOUBLE;
+ break;
+ // case 'L':
+ default:
+ // stores the internal name, not the descriptor
+ t = desc.substring(dims + 1, desc.length() - 1);
+ data = OBJECT | cw.addType(t);
+ }
+ return (dims - index) << 28 | data;
+ }
+ }
+
+ /**
+ * Pops a type from the output frame stack and returns its value.
+ *
+ * @return the type that has been popped from the output frame stack.
+ */
+ private int pop() {
+ if (outputStackTop > 0) {
+ return outputStack[--outputStackTop];
+ } else {
+ // if the output frame stack is empty, pops from the input stack
+ return STACK | -(--owner.inputStackTop);
+ }
+ }
+
+ /**
+ * Pops the given number of types from the output frame stack.
+ *
+ * @param elements the number of types that must be popped.
+ */
+ private void pop(final int elements) {
+ if (outputStackTop >= elements) {
+ outputStackTop -= elements;
+ } else {
+ // if the number of elements to be popped is greater than the number
+ // of elements in the output stack, clear it, and pops the remaining
+ // elements from the input stack.
+ owner.inputStackTop -= elements - outputStackTop;
+ outputStackTop = 0;
+ }
+ }
+
+ /**
+ * Pops a type from the output frame stack.
+ *
+ * @param desc the descriptor of the type to be popped. Can also be a method
+ * descriptor (in this case this method pops the types corresponding
+ * to the method arguments).
+ */
+ private void pop(final String desc) {
+ char c = desc.charAt(0);
+ if (c == '(') {
+ pop((Type.getArgumentsAndReturnSizes(desc) >> 2) - 1);
+ } else if (c == 'J' || c == 'D') {
+ pop(2);
+ } else {
+ pop(1);
+ }
+ }
+
+ /**
+ * Adds a new type to the list of types on which a constructor is invoked in
+ * the basic block.
+ *
+ * @param var a type on a which a constructor is invoked.
+ */
+ private void init(final int var) {
+ // creates and/or resizes the initializations array if necessary
+ if (initializations == null) {
+ initializations = new int[2];
+ }
+ int n = initializations.length;
+ if (initializationCount >= n) {
+ int[] t = new int[Math.max(initializationCount + 1, 2 * n)];
+ System.arraycopy(initializations, 0, t, 0, n);
+ initializations = t;
+ }
+ // stores the type to be initialized
+ initializations[initializationCount++] = var;
+ }
+
+ /**
+ * Replaces the given type with the appropriate type if it is one of the
+ * types on which a constructor is invoked in the basic block.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param t a type
+ * @return t or, if t is one of the types on which a constructor is invoked
+ * in the basic block, the type corresponding to this constructor.
+ */
+ private int init(final ClassWriter cw, final int t) {
+ int s;
+ if (t == UNINITIALIZED_THIS) {
+ s = OBJECT | cw.addType(cw.thisName);
+ } else if ((t & (DIM | BASE_KIND)) == UNINITIALIZED) {
+ String type = cw.typeTable[t & BASE_VALUE].strVal1;
+ s = OBJECT | cw.addType(type);
+ } else {
+ return t;
+ }
+ for (int j = 0; j < initializationCount; ++j) {
+ int u = initializations[j];
+ int dim = u & DIM;
+ int kind = u & KIND;
+ if (kind == LOCAL) {
+ u = dim + inputLocals[u & VALUE];
+ } else if (kind == STACK) {
+ u = dim + inputStack[inputStack.length - (u & VALUE)];
+ }
+ if (t == u) {
+ return s;
+ }
+ }
+ return t;
+ }
+
+ /**
+ * Initializes the input frame of the first basic block from the method
+ * descriptor.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param access the access flags of the method to which this label belongs.
+ * @param args the formal parameter types of this method.
+ * @param maxLocals the maximum number of local variables of this method.
+ */
+ void initInputFrame(
+ final ClassWriter cw,
+ final int access,
+ final Type[] args,
+ final int maxLocals)
+ {
+ inputLocals = new int[maxLocals];
+ inputStack = new int[0];
+ int i = 0;
+ if ((access & Opcodes.ACC_STATIC) == 0) {
+ if ((access & MethodWriter.ACC_CONSTRUCTOR) == 0) {
+ inputLocals[i++] = OBJECT | cw.addType(cw.thisName);
+ } else {
+ inputLocals[i++] = UNINITIALIZED_THIS;
+ }
+ }
+ for (int j = 0; j < args.length; ++j) {
+ int t = type(cw, args[j].getDescriptor());
+ inputLocals[i++] = t;
+ if (t == LONG || t == DOUBLE) {
+ inputLocals[i++] = TOP;
+ }
+ }
+ while (i < maxLocals) {
+ inputLocals[i++] = TOP;
+ }
+ }
+
+ /**
+ * Simulates the action of the given instruction on the output stack frame.
+ *
+ * @param opcode the opcode of the instruction.
+ * @param arg the operand of the instruction, if any.
+ * @param cw the class writer to which this label belongs.
+ * @param item the operand of the instructions, if any.
+ */
+ void execute(
+ final int opcode,
+ final int arg,
+ final ClassWriter cw,
+ final Item item)
+ {
+ int t1, t2, t3, t4;
+ switch (opcode) {
+ case Opcodes.NOP:
+ case Opcodes.INEG:
+ case Opcodes.LNEG:
+ case Opcodes.FNEG:
+ case Opcodes.DNEG:
+ case Opcodes.I2B:
+ case Opcodes.I2C:
+ case Opcodes.I2S:
+ case Opcodes.GOTO:
+ case Opcodes.RETURN:
+ break;
+ case Opcodes.ACONST_NULL:
+ push(NULL);
+ break;
+ case Opcodes.ICONST_M1:
+ case Opcodes.ICONST_0:
+ case Opcodes.ICONST_1:
+ case Opcodes.ICONST_2:
+ case Opcodes.ICONST_3:
+ case Opcodes.ICONST_4:
+ case Opcodes.ICONST_5:
+ case Opcodes.BIPUSH:
+ case Opcodes.SIPUSH:
+ case Opcodes.ILOAD:
+ push(INTEGER);
+ break;
+ case Opcodes.LCONST_0:
+ case Opcodes.LCONST_1:
+ case Opcodes.LLOAD:
+ push(LONG);
+ push(TOP);
+ break;
+ case Opcodes.FCONST_0:
+ case Opcodes.FCONST_1:
+ case Opcodes.FCONST_2:
+ case Opcodes.FLOAD:
+ push(FLOAT);
+ break;
+ case Opcodes.DCONST_0:
+ case Opcodes.DCONST_1:
+ case Opcodes.DLOAD:
+ push(DOUBLE);
+ push(TOP);
+ break;
+ case Opcodes.LDC:
+ switch (item.type) {
+ case ClassWriter.INT:
+ push(INTEGER);
+ break;
+ case ClassWriter.LONG:
+ push(LONG);
+ push(TOP);
+ break;
+ case ClassWriter.FLOAT:
+ push(FLOAT);
+ break;
+ case ClassWriter.DOUBLE:
+ push(DOUBLE);
+ push(TOP);
+ break;
+ case ClassWriter.CLASS:
+ push(OBJECT | cw.addType("java/lang/Class"));
+ break;
+ case ClassWriter.STR:
+ push(OBJECT | cw.addType("java/lang/String"));
+ break;
+ case ClassWriter.MTYPE:
+ push(OBJECT | cw.addType("java/lang/invoke/MethodType"));
+ break;
+ // case ClassWriter.HANDLE_BASE + [1..9]:
+ default:
+ push(OBJECT | cw.addType("java/lang/invoke/MethodHandle"));
+ }
+ break;
+ case Opcodes.ALOAD:
+ push(get(arg));
+ break;
+ case Opcodes.IALOAD:
+ case Opcodes.BALOAD:
+ case Opcodes.CALOAD:
+ case Opcodes.SALOAD:
+ pop(2);
+ push(INTEGER);
+ break;
+ case Opcodes.LALOAD:
+ case Opcodes.D2L:
+ pop(2);
+ push(LONG);
+ push(TOP);
+ break;
+ case Opcodes.FALOAD:
+ pop(2);
+ push(FLOAT);
+ break;
+ case Opcodes.DALOAD:
+ case Opcodes.L2D:
+ pop(2);
+ push(DOUBLE);
+ push(TOP);
+ break;
+ case Opcodes.AALOAD:
+ pop(1);
+ t1 = pop();
+ push(ELEMENT_OF + t1);
+ break;
+ case Opcodes.ISTORE:
+ case Opcodes.FSTORE:
+ case Opcodes.ASTORE:
+ t1 = pop();
+ set(arg, t1);
+ if (arg > 0) {
+ t2 = get(arg - 1);
+ // if t2 is of kind STACK or LOCAL we cannot know its size!
+ if (t2 == LONG || t2 == DOUBLE) {
+ set(arg - 1, TOP);
+ } else if ((t2 & KIND) != BASE) {
+ set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE);
+ }
+ }
+ break;
+ case Opcodes.LSTORE:
+ case Opcodes.DSTORE:
+ pop(1);
+ t1 = pop();
+ set(arg, t1);
+ set(arg + 1, TOP);
+ if (arg > 0) {
+ t2 = get(arg - 1);
+ // if t2 is of kind STACK or LOCAL we cannot know its size!
+ if (t2 == LONG || t2 == DOUBLE) {
+ set(arg - 1, TOP);
+ } else if ((t2 & KIND) != BASE) {
+ set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE);
+ }
+ }
+ break;
+ case Opcodes.IASTORE:
+ case Opcodes.BASTORE:
+ case Opcodes.CASTORE:
+ case Opcodes.SASTORE:
+ case Opcodes.FASTORE:
+ case Opcodes.AASTORE:
+ pop(3);
+ break;
+ case Opcodes.LASTORE:
+ case Opcodes.DASTORE:
+ pop(4);
+ break;
+ case Opcodes.POP:
+ case Opcodes.IFEQ:
+ case Opcodes.IFNE:
+ case Opcodes.IFLT:
+ case Opcodes.IFGE:
+ case Opcodes.IFGT:
+ case Opcodes.IFLE:
+ case Opcodes.IRETURN:
+ case Opcodes.FRETURN:
+ case Opcodes.ARETURN:
+ case Opcodes.TABLESWITCH:
+ case Opcodes.LOOKUPSWITCH:
+ case Opcodes.ATHROW:
+ case Opcodes.MONITORENTER:
+ case Opcodes.MONITOREXIT:
+ case Opcodes.IFNULL:
+ case Opcodes.IFNONNULL:
+ pop(1);
+ break;
+ case Opcodes.POP2:
+ case Opcodes.IF_ICMPEQ:
+ case Opcodes.IF_ICMPNE:
+ case Opcodes.IF_ICMPLT:
+ case Opcodes.IF_ICMPGE:
+ case Opcodes.IF_ICMPGT:
+ case Opcodes.IF_ICMPLE:
+ case Opcodes.IF_ACMPEQ:
+ case Opcodes.IF_ACMPNE:
+ case Opcodes.LRETURN:
+ case Opcodes.DRETURN:
+ pop(2);
+ break;
+ case Opcodes.DUP:
+ t1 = pop();
+ push(t1);
+ push(t1);
+ break;
+ case Opcodes.DUP_X1:
+ t1 = pop();
+ t2 = pop();
+ push(t1);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP_X2:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ push(t1);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2:
+ t1 = pop();
+ t2 = pop();
+ push(t2);
+ push(t1);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2_X1:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ push(t2);
+ push(t1);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2_X2:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ t4 = pop();
+ push(t2);
+ push(t1);
+ push(t4);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.SWAP:
+ t1 = pop();
+ t2 = pop();
+ push(t1);
+ push(t2);
+ break;
+ case Opcodes.IADD:
+ case Opcodes.ISUB:
+ case Opcodes.IMUL:
+ case Opcodes.IDIV:
+ case Opcodes.IREM:
+ case Opcodes.IAND:
+ case Opcodes.IOR:
+ case Opcodes.IXOR:
+ case Opcodes.ISHL:
+ case Opcodes.ISHR:
+ case Opcodes.IUSHR:
+ case Opcodes.L2I:
+ case Opcodes.D2I:
+ case Opcodes.FCMPL:
+ case Opcodes.FCMPG:
+ pop(2);
+ push(INTEGER);
+ break;
+ case Opcodes.LADD:
+ case Opcodes.LSUB:
+ case Opcodes.LMUL:
+ case Opcodes.LDIV:
+ case Opcodes.LREM:
+ case Opcodes.LAND:
+ case Opcodes.LOR:
+ case Opcodes.LXOR:
+ pop(4);
+ push(LONG);
+ push(TOP);
+ break;
+ case Opcodes.FADD:
+ case Opcodes.FSUB:
+ case Opcodes.FMUL:
+ case Opcodes.FDIV:
+ case Opcodes.FREM:
+ case Opcodes.L2F:
+ case Opcodes.D2F:
+ pop(2);
+ push(FLOAT);
+ break;
+ case Opcodes.DADD:
+ case Opcodes.DSUB:
+ case Opcodes.DMUL:
+ case Opcodes.DDIV:
+ case Opcodes.DREM:
+ pop(4);
+ push(DOUBLE);
+ push(TOP);
+ break;
+ case Opcodes.LSHL:
+ case Opcodes.LSHR:
+ case Opcodes.LUSHR:
+ pop(3);
+ push(LONG);
+ push(TOP);
+ break;
+ case Opcodes.IINC:
+ set(arg, INTEGER);
+ break;
+ case Opcodes.I2L:
+ case Opcodes.F2L:
+ pop(1);
+ push(LONG);
+ push(TOP);
+ break;
+ case Opcodes.I2F:
+ pop(1);
+ push(FLOAT);
+ break;
+ case Opcodes.I2D:
+ case Opcodes.F2D:
+ pop(1);
+ push(DOUBLE);
+ push(TOP);
+ break;
+ case Opcodes.F2I:
+ case Opcodes.ARRAYLENGTH:
+ case Opcodes.INSTANCEOF:
+ pop(1);
+ push(INTEGER);
+ break;
+ case Opcodes.LCMP:
+ case Opcodes.DCMPL:
+ case Opcodes.DCMPG:
+ pop(4);
+ push(INTEGER);
+ break;
+ case Opcodes.JSR:
+ case Opcodes.RET:
+ throw new RuntimeException("JSR/RET are not supported with computeFrames option");
+ case Opcodes.GETSTATIC:
+ push(cw, item.strVal3);
+ break;
+ case Opcodes.PUTSTATIC:
+ pop(item.strVal3);
+ break;
+ case Opcodes.GETFIELD:
+ pop(1);
+ push(cw, item.strVal3);
+ break;
+ case Opcodes.PUTFIELD:
+ pop(item.strVal3);
+ pop();
+ break;
+ case Opcodes.INVOKEVIRTUAL:
+ case Opcodes.INVOKESPECIAL:
+ case Opcodes.INVOKESTATIC:
+ case Opcodes.INVOKEINTERFACE:
+ pop(item.strVal3);
+ if (opcode != Opcodes.INVOKESTATIC) {
+ t1 = pop();
+ if (opcode == Opcodes.INVOKESPECIAL
+ && item.strVal2.charAt(0) == '<')
+ {
+ init(t1);
+ }
+ }
+ push(cw, item.strVal3);
+ break;
+ case Opcodes.INVOKEDYNAMIC:
+ pop(item.strVal2);
+ push(cw, item.strVal2);
+ break;
+ case Opcodes.NEW:
+ push(UNINITIALIZED | cw.addUninitializedType(item.strVal1, arg));
+ break;
+ case Opcodes.NEWARRAY:
+ pop();
+ switch (arg) {
+ case Opcodes.T_BOOLEAN:
+ push(ARRAY_OF | BOOLEAN);
+ break;
+ case Opcodes.T_CHAR:
+ push(ARRAY_OF | CHAR);
+ break;
+ case Opcodes.T_BYTE:
+ push(ARRAY_OF | BYTE);
+ break;
+ case Opcodes.T_SHORT:
+ push(ARRAY_OF | SHORT);
+ break;
+ case Opcodes.T_INT:
+ push(ARRAY_OF | INTEGER);
+ break;
+ case Opcodes.T_FLOAT:
+ push(ARRAY_OF | FLOAT);
+ break;
+ case Opcodes.T_DOUBLE:
+ push(ARRAY_OF | DOUBLE);
+ break;
+ // case Opcodes.T_LONG:
+ default:
+ push(ARRAY_OF | LONG);
+ break;
+ }
+ break;
+ case Opcodes.ANEWARRAY:
+ String s = item.strVal1;
+ pop();
+ if (s.charAt(0) == '[') {
+ push(cw, '[' + s);
+ } else {
+ push(ARRAY_OF | OBJECT | cw.addType(s));
+ }
+ break;
+ case Opcodes.CHECKCAST:
+ s = item.strVal1;
+ pop();
+ if (s.charAt(0) == '[') {
+ push(cw, s);
+ } else {
+ push(OBJECT | cw.addType(s));
+ }
+ break;
+ // case Opcodes.MULTIANEWARRAY:
+ default:
+ pop(arg);
+ push(cw, item.strVal1);
+ break;
+ }
+ }
+
+ /**
+ * Merges the input frame of the given basic block with the input and output
+ * frames of this basic block. Returns <tt>true</tt> if the input frame of
+ * the given label has been changed by this operation.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param frame the basic block whose input frame must be updated.
+ * @param edge the kind of the {@link Edge} between this label and 'label'.
+ * See {@link Edge#info}.
+ * @return <tt>true</tt> if the input frame of the given label has been
+ * changed by this operation.
+ */
+ boolean merge(final ClassWriter cw, final Frame frame, final int edge) {
+ boolean changed = false;
+ int i, s, dim, kind, t;
+
+ int nLocal = inputLocals.length;
+ int nStack = inputStack.length;
+ if (frame.inputLocals == null) {
+ frame.inputLocals = new int[nLocal];
+ changed = true;
+ }
+
+ for (i = 0; i < nLocal; ++i) {
+ if (outputLocals != null && i < outputLocals.length) {
+ s = outputLocals[i];
+ if (s == 0) {
+ t = inputLocals[i];
+ } else {
+ dim = s & DIM;
+ kind = s & KIND;
+ if (kind == BASE) {
+ t = s;
+ } else {
+ if (kind == LOCAL) {
+ t = dim + inputLocals[s & VALUE];
+ } else {
+ t = dim + inputStack[nStack - (s & VALUE)];
+ }
+ if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 && (t == LONG || t == DOUBLE)) {
+ t = TOP;
+ }
+ }
+ }
+ } else {
+ t = inputLocals[i];
+ }
+ if (initializations != null) {
+ t = init(cw, t);
+ }
+ changed |= merge(cw, t, frame.inputLocals, i);
+ }
+
+ if (edge > 0) {
+ for (i = 0; i < nLocal; ++i) {
+ t = inputLocals[i];
+ changed |= merge(cw, t, frame.inputLocals, i);
+ }
+ if (frame.inputStack == null) {
+ frame.inputStack = new int[1];
+ changed = true;
+ }
+ changed |= merge(cw, edge, frame.inputStack, 0);
+ return changed;
+ }
+
+ int nInputStack = inputStack.length + owner.inputStackTop;
+ if (frame.inputStack == null) {
+ frame.inputStack = new int[nInputStack + outputStackTop];
+ changed = true;
+ }
+
+ for (i = 0; i < nInputStack; ++i) {
+ t = inputStack[i];
+ if (initializations != null) {
+ t = init(cw, t);
+ }
+ changed |= merge(cw, t, frame.inputStack, i);
+ }
+ for (i = 0; i < outputStackTop; ++i) {
+ s = outputStack[i];
+ dim = s & DIM;
+ kind = s & KIND;
+ if (kind == BASE) {
+ t = s;
+ } else {
+ if (kind == LOCAL) {
+ t = dim + inputLocals[s & VALUE];
+ } else {
+ t = dim + inputStack[nStack - (s & VALUE)];
+ }
+ if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 && (t == LONG || t == DOUBLE)) {
+ t = TOP;
+ }
+ }
+ if (initializations != null) {
+ t = init(cw, t);
+ }
+ changed |= merge(cw, t, frame.inputStack, nInputStack + i);
+ }
+ return changed;
+ }
+
+ /**
+ * Merges the type at the given index in the given type array with the given
+ * type. Returns <tt>true</tt> if the type array has been modified by this
+ * operation.
+ *
+ * @param cw the ClassWriter to which this label belongs.
+ * @param t the type with which the type array element must be merged.
+ * @param types an array of types.
+ * @param index the index of the type that must be merged in 'types'.
+ * @return <tt>true</tt> if the type array has been modified by this
+ * operation.
+ */
+ private static boolean merge(
+ final ClassWriter cw,
+ int t,
+ final int[] types,
+ final int index)
+ {
+ int u = types[index];
+ if (u == t) {
+ // if the types are equal, merge(u,t)=u, so there is no change
+ return false;
+ }
+ if ((t & ~DIM) == NULL) {
+ if (u == NULL) {
+ return false;
+ }
+ t = NULL;
+ }
+ if (u == 0) {
+ // if types[index] has never been assigned, merge(u,t)=t
+ types[index] = t;
+ return true;
+ }
+ int v;
+ if ((u & BASE_KIND) == OBJECT || (u & DIM) != 0) {
+ // if u is a reference type of any dimension
+ if (t == NULL) {
+ // if t is the NULL type, merge(u,t)=u, so there is no change
+ return false;
+ } else if ((t & (DIM | BASE_KIND)) == (u & (DIM | BASE_KIND))) {
+ if ((u & BASE_KIND) == OBJECT) {
+ // if t is also a reference type, and if u and t have the
+ // same dimension merge(u,t) = dim(t) | common parent of the
+ // element types of u and t
+ v = (t & DIM) | OBJECT
+ | cw.getMergedType(t & BASE_VALUE, u & BASE_VALUE);
+ } else {
+ // if u and t are array types, but not with the same element
+ // type, merge(u,t)=java/lang/Object
+ v = OBJECT | cw.addType("java/lang/Object");
+ }
+ } else if ((t & BASE_KIND) == OBJECT || (t & DIM) != 0) {
+ // if t is any other reference or array type,
+ // merge(u,t)=java/lang/Object
+ v = OBJECT | cw.addType("java/lang/Object");
+ } else {
+ // if t is any other type, merge(u,t)=TOP
+ v = TOP;
+ }
+ } else if (u == NULL) {
+ // if u is the NULL type, merge(u,t)=t,
+ // or TOP if t is not a reference type
+ v = (t & BASE_KIND) == OBJECT || (t & DIM) != 0 ? t : TOP;
+ } else {
+ // if u is any other type, merge(u,t)=TOP whatever t
+ v = TOP;
+ }
+ if (u != v) {
+ types[index] = v;
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java
new file mode 100644
index 0000000..a70e385
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java
@@ -0,0 +1,188 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A reference to a field or a method.
+ *
+ * @author Remi Forax
+ * @author Eric Bruneton
+ */
+public final class Handle {
+
+ /**
+ * The kind of field or method designated by this Handle. Should be
+ * {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+ * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+ * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC},
+ * {@link Opcodes#H_INVOKESPECIAL}, {@link Opcodes#H_NEWINVOKESPECIAL} or
+ * {@link Opcodes#H_INVOKEINTERFACE}.
+ */
+ final int tag;
+
+ /**
+ * The internal name of the field or method designed by this handle.
+ */
+ final String owner;
+
+ /**
+ * The name of the field or method designated by this handle.
+ */
+ final String name;
+
+ /**
+ * The descriptor of the field or method designated by this handle.
+ */
+ final String desc;
+
+ /**
+ * Constructs a new field or method handle.
+ *
+ * @param tag the kind of field or method designated by this Handle. Must be
+ * {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+ * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+ * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC},
+ * {@link Opcodes#H_INVOKESPECIAL},
+ * {@link Opcodes#H_NEWINVOKESPECIAL} or
+ * {@link Opcodes#H_INVOKEINTERFACE}.
+ * @param owner the internal name of the field or method designed by this
+ * handle.
+ * @param name the name of the field or method designated by this handle.
+ * @param desc the descriptor of the field or method designated by this
+ * handle.
+ */
+ public Handle(int tag, String owner, String name, String desc) {
+ this.tag = tag;
+ this.owner = owner;
+ this.name = name;
+ this.desc = desc;
+ }
+
+ /**
+ * Returns the kind of field or method designated by this handle.
+ *
+ * @return {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
+ * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC},
+ * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC},
+ * {@link Opcodes#H_INVOKESPECIAL},
+ * {@link Opcodes#H_NEWINVOKESPECIAL} or
+ * {@link Opcodes#H_INVOKEINTERFACE}.
+ */
+ public int getTag() {
+ return tag;
+ }
+
+ /**
+ * Returns the internal name of the field or method designed by this
+ * handle.
+ *
+ * @return the internal name of the field or method designed by this
+ * handle.
+ */
+ public String getOwner() {
+ return owner;
+ }
+
+ /**
+ * Returns the name of the field or method designated by this handle.
+ *
+ * @return the name of the field or method designated by this handle.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Returns the descriptor of the field or method designated by this handle.
+ *
+ * @return the descriptor of the field or method designated by this handle.
+ */
+ public String getDesc() {
+ return desc;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Handle)) {
+ return false;
+ }
+ Handle h = (Handle) obj;
+ return tag == h.tag && owner.equals(h.owner)
+ && name.equals(h.name) && desc.equals(h.desc);
+ }
+
+ @Override
+ public int hashCode() {
+ return tag + owner.hashCode() * name.hashCode() * desc.hashCode();
+ }
+
+ /**
+ * Returns the textual representation of this handle. The textual
+ * representation is: <pre>owner '.' name desc ' ' '(' tag ')'</pre>. As
+ * this format is unambiguous, it can be parsed if necessary.
+ */
+ @Override
+ public String toString() {
+ return owner + '.' + name + desc + " (" + tag + ')';
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java
new file mode 100644
index 0000000..72211a3
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java
@@ -0,0 +1,147 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * Information about an exception handler block.
+ *
+ * @author Eric Bruneton
+ */
+class Handler {
+
+ /**
+ * Beginning of the exception handler's scope (inclusive).
+ */
+ Label start;
+
+ /**
+ * End of the exception handler's scope (exclusive).
+ */
+ Label end;
+
+ /**
+ * Beginning of the exception handler's code.
+ */
+ Label handler;
+
+ /**
+ * Internal name of the type of exceptions handled by this handler, or
+ * <tt>null</tt> to catch any exceptions.
+ */
+ String desc;
+
+ /**
+ * Constant pool index of the internal name of the type of exceptions
+ * handled by this handler, or 0 to catch any exceptions.
+ */
+ int type;
+
+ /**
+ * Next exception handler block info.
+ */
+ Handler next;
+
+ /**
+ * Removes the range between start and end from the given exception
+ * handlers.
+ *
+ * @param h an exception handler list.
+ * @param start the start of the range to be removed.
+ * @param end the end of the range to be removed. Maybe null.
+ * @return the exception handler list with the start-end range removed.
+ */
+ static Handler remove(Handler h, Label start, Label end) {
+ if (h == null) {
+ return null;
+ } else {
+ h.next = remove(h.next, start, end);
+ }
+ int hstart = h.start.position;
+ int hend = h.end.position;
+ int s = start.position;
+ int e = end == null ? Integer.MAX_VALUE : end.position;
+ // if [hstart,hend[ and [s,e[ intervals intersect...
+ if (s < hend && e > hstart) {
+ if (s <= hstart) {
+ if (e >= hend) {
+ // [hstart,hend[ fully included in [s,e[, h removed
+ h = h.next;
+ } else {
+ // [hstart,hend[ minus [s,e[ = [e,hend[
+ h.start = end;
+ }
+ } else if (e >= hend) {
+ // [hstart,hend[ minus [s,e[ = [hstart,s[
+ h.end = start;
+ } else {
+ // [hstart,hend[ minus [s,e[ = [hstart,s[ + [e,hend[
+ Handler g = new Handler();
+ g.start = end;
+ g.end = h.end;
+ g.handler = h.handler;
+ g.desc = h.desc;
+ g.type = h.type;
+ g.next = h.next;
+ h.end = start;
+ h.next = g;
+ }
+ }
+ return h;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java
new file mode 100644
index 0000000..97b56f7
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java
@@ -0,0 +1,326 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A constant pool item. Constant pool items can be created with the 'newXXX'
+ * methods in the {@link ClassWriter} class.
+ *
+ * @author Eric Bruneton
+ */
+final class Item {
+
+ /**
+ * Index of this item in the constant pool.
+ */
+ int index;
+
+ /**
+ * Type of this constant pool item. A single class is used to represent all
+ * constant pool item types, in order to minimize the bytecode size of this
+ * package. The value of this field is one of {@link ClassWriter#INT},
+ * {@link ClassWriter#LONG}, {@link ClassWriter#FLOAT},
+ * {@link ClassWriter#DOUBLE}, {@link ClassWriter#UTF8},
+ * {@link ClassWriter#STR}, {@link ClassWriter#CLASS},
+ * {@link ClassWriter#NAME_TYPE}, {@link ClassWriter#FIELD},
+ * {@link ClassWriter#METH}, {@link ClassWriter#IMETH},
+ * {@link ClassWriter#MTYPE}, {@link ClassWriter#INDY}.
+ *
+ * MethodHandle constant 9 variations are stored using a range
+ * of 9 values from {@link ClassWriter#HANDLE_BASE} + 1 to
+ * {@link ClassWriter#HANDLE_BASE} + 9.
+ *
+ * Special Item types are used for Items that are stored in the ClassWriter
+ * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+ * avoid clashes with normal constant pool items in the ClassWriter constant
+ * pool's hash table. These special item types are
+ * {@link ClassWriter#TYPE_NORMAL}, {@link ClassWriter#TYPE_UNINIT} and
+ * {@link ClassWriter#TYPE_MERGED}.
+ */
+ int type;
+
+ /**
+ * Value of this item, for an integer item.
+ */
+ int intVal;
+
+ /**
+ * Value of this item, for a long item.
+ */
+ long longVal;
+
+ /**
+ * First part of the value of this item, for items that do not hold a
+ * primitive value.
+ */
+ String strVal1;
+
+ /**
+ * Second part of the value of this item, for items that do not hold a
+ * primitive value.
+ */
+ String strVal2;
+
+ /**
+ * Third part of the value of this item, for items that do not hold a
+ * primitive value.
+ */
+ String strVal3;
+
+ /**
+ * The hash code value of this constant pool item.
+ */
+ int hashCode;
+
+ /**
+ * Link to another constant pool item, used for collision lists in the
+ * constant pool's hash table.
+ */
+ Item next;
+
+ /**
+ * Constructs an uninitialized {@link Item}.
+ */
+ Item() {
+ }
+
+ /**
+ * Constructs an uninitialized {@link Item} for constant pool element at
+ * given position.
+ *
+ * @param index index of the item to be constructed.
+ */
+ Item(final int index) {
+ this.index = index;
+ }
+
+ /**
+ * Constructs a copy of the given item.
+ *
+ * @param index index of the item to be constructed.
+ * @param i the item that must be copied into the item to be constructed.
+ */
+ Item(final int index, final Item i) {
+ this.index = index;
+ type = i.type;
+ intVal = i.intVal;
+ longVal = i.longVal;
+ strVal1 = i.strVal1;
+ strVal2 = i.strVal2;
+ strVal3 = i.strVal3;
+ hashCode = i.hashCode;
+ }
+
+ /**
+ * Sets this item to an integer item.
+ *
+ * @param intVal the value of this item.
+ */
+ void set(final int intVal) {
+ this.type = ClassWriter.INT;
+ this.intVal = intVal;
+ this.hashCode = 0x7FFFFFFF & (type + intVal);
+ }
+
+ /**
+ * Sets this item to a long item.
+ *
+ * @param longVal the value of this item.
+ */
+ void set(final long longVal) {
+ this.type = ClassWriter.LONG;
+ this.longVal = longVal;
+ this.hashCode = 0x7FFFFFFF & (type + (int) longVal);
+ }
+
+ /**
+ * Sets this item to a float item.
+ *
+ * @param floatVal the value of this item.
+ */
+ void set(final float floatVal) {
+ this.type = ClassWriter.FLOAT;
+ this.intVal = Float.floatToRawIntBits(floatVal);
+ this.hashCode = 0x7FFFFFFF & (type + (int) floatVal);
+ }
+
+ /**
+ * Sets this item to a double item.
+ *
+ * @param doubleVal the value of this item.
+ */
+ void set(final double doubleVal) {
+ this.type = ClassWriter.DOUBLE;
+ this.longVal = Double.doubleToRawLongBits(doubleVal);
+ this.hashCode = 0x7FFFFFFF & (type + (int) doubleVal);
+ }
+
+ /**
+ * Sets this item to an item that do not hold a primitive value.
+ *
+ * @param type the type of this item.
+ * @param strVal1 first part of the value of this item.
+ * @param strVal2 second part of the value of this item.
+ * @param strVal3 third part of the value of this item.
+ */
+ void set(
+ final int type,
+ final String strVal1,
+ final String strVal2,
+ final String strVal3)
+ {
+ this.type = type;
+ this.strVal1 = strVal1;
+ this.strVal2 = strVal2;
+ this.strVal3 = strVal3;
+ switch (type) {
+ case ClassWriter.UTF8:
+ case ClassWriter.STR:
+ case ClassWriter.CLASS:
+ case ClassWriter.MTYPE:
+ case ClassWriter.TYPE_NORMAL:
+ hashCode = 0x7FFFFFFF & (type + strVal1.hashCode());
+ return;
+ case ClassWriter.NAME_TYPE:
+ hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+ * strVal2.hashCode());
+ return;
+ // ClassWriter.FIELD:
+ // ClassWriter.METH:
+ // ClassWriter.IMETH:
+ // ClassWriter.HANDLE_BASE + 1..9
+ default:
+ hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+ * strVal2.hashCode() * strVal3.hashCode());
+ }
+ }
+
+ /**
+ * Sets the item to an InvokeDynamic item.
+ *
+ * @param name invokedynamic's name.
+ * @param desc invokedynamic's desc.
+ * @param bsmIndex zero based index into the class attribute BootrapMethods.
+ */
+ void set(String name, String desc, int bsmIndex) {
+ this.type = ClassWriter.INDY;
+ this.longVal = bsmIndex;
+ this.strVal1 = name;
+ this.strVal2 = desc;
+ this.hashCode = 0x7FFFFFFF & (ClassWriter.INDY + bsmIndex
+ * strVal1.hashCode() * strVal2.hashCode());
+ }
+
+ /**
+ * Sets the item to a BootstrapMethod item.
+ *
+ * @param position position in byte in the class attribute BootrapMethods.
+ * @param hashCode hashcode of the item. This hashcode is processed from
+ * the hashcode of the bootstrap method and the hashcode of
+ * all bootstrap arguments.
+ */
+ void set(int position, int hashCode) {
+ this.type = ClassWriter.BSM;
+ this.intVal = position;
+ this.hashCode = hashCode;
+ }
+
+ /**
+ * Indicates if the given item is equal to this one. <i>This method assumes
+ * that the two items have the same {@link #type}</i>.
+ *
+ * @param i the item to be compared to this one. Both items must have the
+ * same {@link #type}.
+ * @return <tt>true</tt> if the given item if equal to this one,
+ * <tt>false</tt> otherwise.
+ */
+ boolean isEqualTo(final Item i) {
+ switch (type) {
+ case ClassWriter.UTF8:
+ case ClassWriter.STR:
+ case ClassWriter.CLASS:
+ case ClassWriter.MTYPE:
+ case ClassWriter.TYPE_NORMAL:
+ return i.strVal1.equals(strVal1);
+ case ClassWriter.TYPE_MERGED:
+ case ClassWriter.LONG:
+ case ClassWriter.DOUBLE:
+ return i.longVal == longVal;
+ case ClassWriter.INT:
+ case ClassWriter.FLOAT:
+ return i.intVal == intVal;
+ case ClassWriter.TYPE_UNINIT:
+ return i.intVal == intVal && i.strVal1.equals(strVal1);
+ case ClassWriter.NAME_TYPE:
+ return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2);
+ case ClassWriter.INDY:
+ return i.longVal == longVal && i.strVal1.equals(strVal1)
+ && i.strVal2.equals(strVal2);
+
+ // case ClassWriter.FIELD:
+ // case ClassWriter.METH:
+ // case ClassWriter.IMETH:
+ // case ClassWriter.HANDLE_BASE + 1..9
+ default:
+ return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2)
+ && i.strVal3.equals(strVal3);
+ }
+ }
+
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java
new file mode 100644
index 0000000..220a6e3
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java
@@ -0,0 +1,584 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A label represents a position in the bytecode of a method. Labels are used
+ * for jump, goto, and switch instructions, and for try catch blocks. A label
+ * designates the <i>instruction</i> that is just after. Note however that
+ * there can be other elements between a label and the instruction it
+ * designates (such as other labels, stack map frames, line numbers, etc.).
+ *
+ * @author Eric Bruneton
+ */
+public class Label {
+
+ /**
+ * Indicates if this label is only used for debug attributes. Such a label
+ * is not the start of a basic block, the target of a jump instruction, or
+ * an exception handler. It can be safely ignored in control flow graph
+ * analysis algorithms (for optimization purposes).
+ */
+ static final int DEBUG = 1;
+
+ /**
+ * Indicates if the position of this label is known.
+ */
+ static final int RESOLVED = 2;
+
+ /**
+ * Indicates if this label has been updated, after instruction resizing.
+ */
+ static final int RESIZED = 4;
+
+ /**
+ * Indicates if this basic block has been pushed in the basic block stack.
+ * See {@link MethodWriter#visitMaxs visitMaxs}.
+ */
+ static final int PUSHED = 8;
+
+ /**
+ * Indicates if this label is the target of a jump instruction, or the start
+ * of an exception handler.
+ */
+ static final int TARGET = 16;
+
+ /**
+ * Indicates if a stack map frame must be stored for this label.
+ */
+ static final int STORE = 32;
+
+ /**
+ * Indicates if this label corresponds to a reachable basic block.
+ */
+ static final int REACHABLE = 64;
+
+ /**
+ * Indicates if this basic block ends with a JSR instruction.
+ */
+ static final int JSR = 128;
+
+ /**
+ * Indicates if this basic block ends with a RET instruction.
+ */
+ static final int RET = 256;
+
+ /**
+ * Indicates if this basic block is the start of a subroutine.
+ */
+ static final int SUBROUTINE = 512;
+
+ /**
+ * Indicates if this subroutine basic block has been visited by a
+ * visitSubroutine(null, ...) call.
+ */
+ static final int VISITED = 1024;
+
+ /**
+ * Indicates if this subroutine basic block has been visited by a
+ * visitSubroutine(!null, ...) call.
+ */
+ static final int VISITED2 = 2048;
+
+ /**
+ * Field used to associate user information to a label. Warning: this field
+ * is used by the ASM tree package. In order to use it with the ASM tree
+ * package you must override the {@link
+ * jdk.internal.org.objectweb.asm.tree.MethodNode#getLabelNode} method.
+ */
+ public Object info;
+
+ /**
+ * Flags that indicate the status of this label.
+ *
+ * @see #DEBUG
+ * @see #RESOLVED
+ * @see #RESIZED
+ * @see #PUSHED
+ * @see #TARGET
+ * @see #STORE
+ * @see #REACHABLE
+ * @see #JSR
+ * @see #RET
+ */
+ int status;
+
+ /**
+ * The line number corresponding to this label, if known.
+ */
+ int line;
+
+ /**
+ * The position of this label in the code, if known.
+ */
+ int position;
+
+ /**
+ * Number of forward references to this label, times two.
+ */
+ private int referenceCount;
+
+ /**
+ * Informations about forward references. Each forward reference is
+ * described by two consecutive integers in this array: the first one is the
+ * position of the first byte of the bytecode instruction that contains the
+ * forward reference, while the second is the position of the first byte of
+ * the forward reference itself. In fact the sign of the first integer
+ * indicates if this reference uses 2 or 4 bytes, and its absolute value
+ * gives the position of the bytecode instruction. This array is also used
+ * as a bitset to store the subroutines to which a basic block belongs. This
+ * information is needed in {@linked MethodWriter#visitMaxs}, after all
+ * forward references have been resolved. Hence the same array can be used
+ * for both purposes without problems.
+ */
+ private int[] srcAndRefPositions;
+
+ // ------------------------------------------------------------------------
+
+ /*
+ * Fields for the control flow and data flow graph analysis algorithms (used
+ * to compute the maximum stack size or the stack map frames). A control
+ * flow graph contains one node per "basic block", and one edge per "jump"
+ * from one basic block to another. Each node (i.e., each basic block) is
+ * represented by the Label object that corresponds to the first instruction
+ * of this basic block. Each node also stores the list of its successors in
+ * the graph, as a linked list of Edge objects.
+ *
+ * The control flow analysis algorithms used to compute the maximum stack
+ * size or the stack map frames are similar and use two steps. The first
+ * step, during the visit of each instruction, builds information about the
+ * state of the local variables and the operand stack at the end of each
+ * basic block, called the "output frame", <i>relatively</i> to the frame
+ * state at the beginning of the basic block, which is called the "input
+ * frame", and which is <i>unknown</i> during this step. The second step,
+ * in {@link MethodWriter#visitMaxs}, is a fix point algorithm that
+ * computes information about the input frame of each basic block, from the
+ * input state of the first basic block (known from the method signature),
+ * and by the using the previously computed relative output frames.
+ *
+ * The algorithm used to compute the maximum stack size only computes the
+ * relative output and absolute input stack heights, while the algorithm
+ * used to compute stack map frames computes relative output frames and
+ * absolute input frames.
+ */
+
+ /**
+ * Start of the output stack relatively to the input stack. The exact
+ * semantics of this field depends on the algorithm that is used.
+ *
+ * When only the maximum stack size is computed, this field is the number of
+ * elements in the input stack.
+ *
+ * When the stack map frames are completely computed, this field is the
+ * offset of the first output stack element relatively to the top of the
+ * input stack. This offset is always negative or null. A null offset means
+ * that the output stack must be appended to the input stack. A -n offset
+ * means that the first n output stack elements must replace the top n input
+ * stack elements, and that the other elements must be appended to the input
+ * stack.
+ */
+ int inputStackTop;
+
+ /**
+ * Maximum height reached by the output stack, relatively to the top of the
+ * input stack. This maximum is always positive or null.
+ */
+ int outputStackMax;
+
+ /**
+ * Information about the input and output stack map frames of this basic
+ * block. This field is only used when {@link ClassWriter#COMPUTE_FRAMES}
+ * option is used.
+ */
+ Frame frame;
+
+ /**
+ * The successor of this label, in the order they are visited. This linked
+ * list does not include labels used for debug info only. If
+ * {@link ClassWriter#COMPUTE_FRAMES} option is used then, in addition, it
+ * does not contain successive labels that denote the same bytecode position
+ * (in this case only the first label appears in this list).
+ */
+ Label successor;
+
+ /**
+ * The successors of this node in the control flow graph. These successors
+ * are stored in a linked list of {@link Edge Edge} objects, linked to each
+ * other by their {@link Edge#next} field.
+ */
+ Edge successors;
+
+ /**
+ * The next basic block in the basic block stack. This stack is used in the
+ * main loop of the fix point algorithm used in the second step of the
+ * control flow analysis algorithms. It is also used in
+ * {@link #visitSubroutine} to avoid using a recursive method.
+ *
+ * @see MethodWriter#visitMaxs
+ */
+ Label next;
+
+ // ------------------------------------------------------------------------
+ // Constructor
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new label.
+ */
+ public Label() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Methods to compute offsets and to manage forward references
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the offset corresponding to this label. This offset is computed
+ * from the start of the method's bytecode. <i>This method is intended for
+ * {@link Attribute} sub classes, and is normally not needed by class
+ * generators or adapters.</i>
+ *
+ * @return the offset corresponding to this label.
+ * @throws IllegalStateException if this label is not resolved yet.
+ */
+ public int getOffset() {
+ if ((status & RESOLVED) == 0) {
+ throw new IllegalStateException("Label offset position has not been resolved yet");
+ }
+ return position;
+ }
+
+ /**
+ * Puts a reference to this label in the bytecode of a method. If the
+ * position of the label is known, the offset is computed and written
+ * directly. Otherwise, a null offset is written and a new forward reference
+ * is declared for this label.
+ *
+ * @param owner the code writer that calls this method.
+ * @param out the bytecode of the method.
+ * @param source the position of first byte of the bytecode instruction that
+ * contains this label.
+ * @param wideOffset <tt>true</tt> if the reference must be stored in 4
+ * bytes, or <tt>false</tt> if it must be stored with 2 bytes.
+ * @throws IllegalArgumentException if this label has not been created by
+ * the given code writer.
+ */
+ void put(
+ final MethodWriter owner,
+ final ByteVector out,
+ final int source,
+ final boolean wideOffset)
+ {
+ if ((status & RESOLVED) == 0) {
+ if (wideOffset) {
+ addReference(-1 - source, out.length);
+ out.putInt(-1);
+ } else {
+ addReference(source, out.length);
+ out.putShort(-1);
+ }
+ } else {
+ if (wideOffset) {
+ out.putInt(position - source);
+ } else {
+ out.putShort(position - source);
+ }
+ }
+ }
+
+ /**
+ * Adds a forward reference to this label. This method must be called only
+ * for a true forward reference, i.e. only if this label is not resolved
+ * yet. For backward references, the offset of the reference can be, and
+ * must be, computed and stored directly.
+ *
+ * @param sourcePosition the position of the referencing instruction. This
+ * position will be used to compute the offset of this forward
+ * reference.
+ * @param referencePosition the position where the offset for this forward
+ * reference must be stored.
+ */
+ private void addReference(
+ final int sourcePosition,
+ final int referencePosition)
+ {
+ if (srcAndRefPositions == null) {
+ srcAndRefPositions = new int[6];
+ }
+ if (referenceCount >= srcAndRefPositions.length) {
+ int[] a = new int[srcAndRefPositions.length + 6];
+ System.arraycopy(srcAndRefPositions,
+ 0,
+ a,
+ 0,
+ srcAndRefPositions.length);
+ srcAndRefPositions = a;
+ }
+ srcAndRefPositions[referenceCount++] = sourcePosition;
+ srcAndRefPositions[referenceCount++] = referencePosition;
+ }
+
+ /**
+ * Resolves all forward references to this label. This method must be called
+ * when this label is added to the bytecode of the method, i.e. when its
+ * position becomes known. This method fills in the blanks that where left
+ * in the bytecode by each forward reference previously added to this label.
+ *
+ * @param owner the code writer that calls this method.
+ * @param position the position of this label in the bytecode.
+ * @param data the bytecode of the method.
+ * @return <tt>true</tt> if a blank that was left for this label was to
+ * small to store the offset. In such a case the corresponding jump
+ * instruction is replaced with a pseudo instruction (using unused
+ * opcodes) using an unsigned two bytes offset. These pseudo
+ * instructions will need to be replaced with true instructions with
+ * wider offsets (4 bytes instead of 2). This is done in
+ * {@link MethodWriter#resizeInstructions}.
+ * @throws IllegalArgumentException if this label has already been resolved,
+ * or if it has not been created by the given code writer.
+ */
+ boolean resolve(
+ final MethodWriter owner,
+ final int position,
+ final byte[] data)
+ {
+ boolean needUpdate = false;
+ this.status |= RESOLVED;
+ this.position = position;
+ int i = 0;
+ while (i < referenceCount) {
+ int source = srcAndRefPositions[i++];
+ int reference = srcAndRefPositions[i++];
+ int offset;
+ if (source >= 0) {
+ offset = position - source;
+ if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) {
+ /*
+ * changes the opcode of the jump instruction, in order to
+ * be able to find it later (see resizeInstructions in
+ * MethodWriter). These temporary opcodes are similar to
+ * jump instruction opcodes, except that the 2 bytes offset
+ * is unsigned (and can therefore represent values from 0 to
+ * 65535, which is sufficient since the size of a method is
+ * limited to 65535 bytes).
+ */
+ int opcode = data[reference - 1] & 0xFF;
+ if (opcode <= Opcodes.JSR) {
+ // changes IFEQ ... JSR to opcodes 202 to 217
+ data[reference - 1] = (byte) (opcode + 49);
+ } else {
+ // changes IFNULL and IFNONNULL to opcodes 218 and 219
+ data[reference - 1] = (byte) (opcode + 20);
+ }
+ needUpdate = true;
+ }
+ data[reference++] = (byte) (offset >>> 8);
+ data[reference] = (byte) offset;
+ } else {
+ offset = position + source + 1;
+ data[reference++] = (byte) (offset >>> 24);
+ data[reference++] = (byte) (offset >>> 16);
+ data[reference++] = (byte) (offset >>> 8);
+ data[reference] = (byte) offset;
+ }
+ }
+ return needUpdate;
+ }
+
+ /**
+ * Returns the first label of the series to which this label belongs. For an
+ * isolated label or for the first label in a series of successive labels,
+ * this method returns the label itself. For other labels it returns the
+ * first label of the series.
+ *
+ * @return the first label of the series to which this label belongs.
+ */
+ Label getFirst() {
+ return !ClassReader.FRAMES || frame == null ? this : frame.owner;
+ }
+
+ // ------------------------------------------------------------------------
+ // Methods related to subroutines
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns true is this basic block belongs to the given subroutine.
+ *
+ * @param id a subroutine id.
+ * @return true is this basic block belongs to the given subroutine.
+ */
+ boolean inSubroutine(final long id) {
+ if ((status & Label.VISITED) != 0) {
+ return (srcAndRefPositions[(int) (id >>> 32)] & (int) id) != 0;
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if this basic block and the given one belong to a common
+ * subroutine.
+ *
+ * @param block another basic block.
+ * @return true if this basic block and the given one belong to a common
+ * subroutine.
+ */
+ boolean inSameSubroutine(final Label block) {
+ if ((status & VISITED) == 0 || (block.status & VISITED) == 0) {
+ return false;
+ }
+ for (int i = 0; i < srcAndRefPositions.length; ++i) {
+ if ((srcAndRefPositions[i] & block.srcAndRefPositions[i]) != 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Marks this basic block as belonging to the given subroutine.
+ *
+ * @param id a subroutine id.
+ * @param nbSubroutines the total number of subroutines in the method.
+ */
+ void addToSubroutine(final long id, final int nbSubroutines) {
+ if ((status & VISITED) == 0) {
+ status |= VISITED;
+ srcAndRefPositions = new int[(nbSubroutines - 1) / 32 + 1];
+ }
+ srcAndRefPositions[(int) (id >>> 32)] |= (int) id;
+ }
+
+ /**
+ * Finds the basic blocks that belong to a given subroutine, and marks these
+ * blocks as belonging to this subroutine. This method follows the control
+ * flow graph to find all the blocks that are reachable from the current
+ * block WITHOUT following any JSR target.
+ *
+ * @param JSR a JSR block that jumps to this subroutine. If this JSR is not
+ * null it is added to the successor of the RET blocks found in the
+ * subroutine.
+ * @param id the id of this subroutine.
+ * @param nbSubroutines the total number of subroutines in the method.
+ */
+ void visitSubroutine(final Label JSR, final long id, final int nbSubroutines)
+ {
+ // user managed stack of labels, to avoid using a recursive method
+ // (recursivity can lead to stack overflow with very large methods)
+ Label stack = this;
+ while (stack != null) {
+ // removes a label l from the stack
+ Label l = stack;
+ stack = l.next;
+ l.next = null;
+
+ if (JSR != null) {
+ if ((l.status & VISITED2) != 0) {
+ continue;
+ }
+ l.status |= VISITED2;
+ // adds JSR to the successors of l, if it is a RET block
+ if ((l.status & RET) != 0) {
+ if (!l.inSameSubroutine(JSR)) {
+ Edge e = new Edge();
+ e.info = l.inputStackTop;
+ e.successor = JSR.successors.successor;
+ e.next = l.successors;
+ l.successors = e;
+ }
+ }
+ } else {
+ // if the l block already belongs to subroutine 'id', continue
+ if (l.inSubroutine(id)) {
+ continue;
+ }
+ // marks the l block as belonging to subroutine 'id'
+ l.addToSubroutine(id, nbSubroutines);
+ }
+ // pushes each successor of l on the stack, except JSR targets
+ Edge e = l.successors;
+ while (e != null) {
+ // if the l block is a JSR block, then 'l.successors.next' leads
+ // to the JSR target (see {@link #visitJumpInsn}) and must
+ // therefore not be followed
+ if ((l.status & Label.JSR) == 0 || e != l.successors.next) {
+ // pushes e.successor on the stack if it not already added
+ if (e.successor.next == null) {
+ e.successor.next = stack;
+ stack = e.successor;
+ }
+ }
+ e = e.next;
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Overriden Object methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns a string representation of this label.
+ *
+ * @return a string representation of this label.
+ */
+ @Override
+ public String toString() {
+ return "L" + System.identityHashCode(this);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
new file mode 100644
index 0000000..241f4fb
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
@@ -0,0 +1,617 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java method. The methods of this class must be
+ * called in the following order: [ <tt>visitAnnotationDefault</tt> ] (
+ * <tt>visitAnnotation</tt> | <tt>visitParameterAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* [ <tt>visitCode</tt> ( <tt>visitFrame</tt> |
+ * <tt>visit</tt><i>X</i>Insn</tt> | <tt>visitLabel</tt> | <tt>visitTryCatchBlock</tt> |
+ * <tt>visitLocalVariable</tt> | <tt>visitLineNumber</tt> )* <tt>visitMaxs</tt> ]
+ * <tt>visitEnd</tt>. In addition, the <tt>visit</tt><i>X</i>Insn</tt>
+ * and <tt>visitLabel</tt> methods must be called in the sequential order of
+ * the bytecode instructions of the visited code, <tt>visitTryCatchBlock</tt>
+ * must be called <i>before</i> the labels passed as arguments have been
+ * visited, and the <tt>visitLocalVariable</tt> and <tt>visitLineNumber</tt>
+ * methods must be called <i>after</i> the labels passed as arguments have been
+ * visited.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class MethodVisitor {
+
+ /**
+ * The ASM API version implemented by this visitor. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * The method visitor to which this visitor must delegate method calls. May
+ * be null.
+ */
+ protected MethodVisitor mv;
+
+ /**
+ * Constructs a new {@link MethodVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public MethodVisitor(final int api) {
+ this(api, null);
+ }
+
+ /**
+ * Constructs a new {@link MethodVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param mv the method visitor to which this visitor must delegate method
+ * calls. May be null.
+ */
+ public MethodVisitor(final int api, final MethodVisitor mv) {
+ /*if (api != Opcodes.ASM4) {
+ throw new IllegalArgumentException();
+ }*/
+ this.api = api;
+ this.mv = mv;
+ }
+
+ // -------------------------------------------------------------------------
+ // Annotations and non standard attributes
+ // -------------------------------------------------------------------------
+
+ /**
+ * Visits the default value of this annotation interface method.
+ *
+ * @return a visitor to the visit the actual default value of this
+ * annotation interface method, or <tt>null</tt> if this visitor
+ * is not interested in visiting this default value. The 'name'
+ * parameters passed to the methods of this annotation visitor are
+ * ignored. Moreover, exacly one visit method must be called on this
+ * annotation visitor, followed by visitEnd.
+ */
+ public AnnotationVisitor visitAnnotationDefault() {
+ if (mv != null) {
+ return mv.visitAnnotationDefault();
+ }
+ return null;
+ }
+
+ /**
+ * Visits an annotation of this method.
+ *
+ * @param desc the class descriptor of the annotation class.
+ * @param visible <tt>true</tt> if the annotation is visible at runtime.
+ * @return a visitor to visit the annotation values, or <tt>null</tt> if
+ * this visitor is not interested in visiting this annotation.
+ */
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ if (mv != null) {
+ return mv.visitAnnotation(desc, visible);
+ }
+ return null;
+ }
+
+ /**
+ * Visits an annotation of a parameter this method.
+ *
+ * @param parameter the parameter index.
+ * @param desc the class descriptor of the annotation class.
+ * @param visible <tt>true</tt> if the annotation is visible at runtime.
+ * @return a visitor to visit the annotation values, or <tt>null</tt> if
+ * this visitor is not interested in visiting this annotation.
+ */
+ public AnnotationVisitor visitParameterAnnotation(
+ int parameter,
+ String desc,
+ boolean visible)
+ {
+ if (mv != null) {
+ return mv.visitParameterAnnotation(parameter, desc, visible);
+ }
+ return null;
+ }
+
+ /**
+ * Visits a non standard attribute of this method.
+ *
+ * @param attr an attribute.
+ */
+ public void visitAttribute(Attribute attr) {
+ if (mv != null) {
+ mv.visitAttribute(attr);
+ }
+ }
+
+ /**
+ * Starts the visit of the method's code, if any (i.e. non abstract method).
+ */
+ public void visitCode() {
+ if (mv != null) {
+ mv.visitCode();
+ }
+ }
+
+ /**
+ * Visits the current state of the local variables and operand stack
+ * elements. This method must(*) be called <i>just before</i> any
+ * instruction <b>i</b> that follows an unconditional branch instruction
+ * such as GOTO or THROW, that is the target of a jump instruction, or that
+ * starts an exception handler block. The visited types must describe the
+ * values of the local variables and of the operand stack elements <i>just
+ * before</i> <b>i</b> is executed. <br> <br> (*) this is mandatory only
+ * for classes whose version is greater than or equal to
+ * {@link Opcodes#V1_6 V1_6}. <br> <br> Packed frames are basically
+ * "deltas" from the state of the previous frame (very first frame is
+ * implicitly defined by the method's parameters and access flags): <ul>
+ * <li>{@link Opcodes#F_SAME} representing frame with exactly the same
+ * locals as the previous frame and with the empty stack.</li> <li>{@link Opcodes#F_SAME1}
+ * representing frame with exactly the same locals as the previous frame and
+ * with single value on the stack (<code>nStack</code> is 1 and
+ * <code>stack[0]</code> contains value for the type of the stack item).</li>
+ * <li>{@link Opcodes#F_APPEND} representing frame with current locals are
+ * the same as the locals in the previous frame, except that additional
+ * locals are defined (<code>nLocal</code> is 1, 2 or 3 and
+ * <code>local</code> elements contains values representing added types).</li>
+ * <li>{@link Opcodes#F_CHOP} representing frame with current locals are
+ * the same as the locals in the previous frame, except that the last 1-3
+ * locals are absent and with the empty stack (<code>nLocals</code> is 1,
+ * 2 or 3). </li> <li>{@link Opcodes#F_FULL} representing complete frame
+ * data.</li> </li> </ul>
+ *
+ * @param type the type of this stack map frame. Must be
+ * {@link Opcodes#F_NEW} for expanded frames, or
+ * {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND},
+ * {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or
+ * {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for compressed
+ * frames.
+ * @param nLocal the number of local variables in the visited frame.
+ * @param local the local variable types in this frame. This array must not
+ * be modified. Primitive types are represented by
+ * {@link Opcodes#TOP}, {@link Opcodes#INTEGER},
+ * {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+ * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+ * {@link Opcodes#UNINITIALIZED_THIS} (long and double are
+ * represented by a single element). Reference types are represented
+ * by String objects (representing internal names), and uninitialized
+ * types by Label objects (this label designates the NEW instruction
+ * that created this uninitialized value).
+ * @param nStack the number of operand stack elements in the visited frame.
+ * @param stack the operand stack types in this frame. This array must not
+ * be modified. Its content has the same format as the "local" array.
+ * @throws IllegalStateException if a frame is visited just after another
+ * one, without any instruction between the two (unless this frame
+ * is a Opcodes#F_SAME frame, in which case it is silently ignored).
+ */
+ public void visitFrame(
+ int type,
+ int nLocal,
+ Object[] local,
+ int nStack,
+ Object[] stack)
+ {
+ if (mv != null) {
+ mv.visitFrame(type, nLocal, local, nStack, stack);
+ }
+ }
+
+ // -------------------------------------------------------------------------
+ // Normal instructions
+ // -------------------------------------------------------------------------
+
+ /**
+ * Visits a zero operand instruction.
+ *
+ * @param opcode the opcode of the instruction to be visited. This opcode is
+ * either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2,
+ * ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1, FCONST_0,
+ * FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD, LALOAD, FALOAD,
+ * DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IASTORE, LASTORE, FASTORE,
+ * DASTORE, AASTORE, BASTORE, CASTORE, SASTORE, POP, POP2, DUP,
+ * DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP, IADD, LADD, FADD,
+ * DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV, LDIV,
+ * FDIV, DDIV, IREM, LREM, FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL,
+ * LSHL, ISHR, LSHR, IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR,
+ * I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B,
+ * I2C, I2S, LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN,
+ * FRETURN, DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW,
+ * MONITORENTER, or MONITOREXIT.
+ */
+ public void visitInsn(int opcode) {
+ if (mv != null) {
+ mv.visitInsn(opcode);
+ }
+ }
+
+ /**
+ * Visits an instruction with a single int operand.
+ *
+ * @param opcode the opcode of the instruction to be visited. This opcode is
+ * either BIPUSH, SIPUSH or NEWARRAY.
+ * @param operand the operand of the instruction to be visited.<br> When
+ * opcode is BIPUSH, operand value should be between Byte.MIN_VALUE
+ * and Byte.MAX_VALUE.<br> When opcode is SIPUSH, operand value
+ * should be between Short.MIN_VALUE and Short.MAX_VALUE.<br> When
+ * opcode is NEWARRAY, operand value should be one of
+ * {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR},
+ * {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE},
+ * {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT},
+ * {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}.
+ */
+ public void visitIntInsn(int opcode, int operand) {
+ if (mv != null) {
+ mv.visitIntInsn(opcode, operand);
+ }
+ }
+
+ /**
+ * Visits a local variable instruction. A local variable instruction is an
+ * instruction that loads or stores the value of a local variable.
+ *
+ * @param opcode the opcode of the local variable instruction to be visited.
+ * This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE,
+ * LSTORE, FSTORE, DSTORE, ASTORE or RET.
+ * @param var the operand of the instruction to be visited. This operand is
+ * the index of a local variable.
+ */
+ public void visitVarInsn(int opcode, int var) {
+ if (mv != null) {
+ mv.visitVarInsn(opcode, var);
+ }
+ }
+
+ /**
+ * Visits a type instruction. A type instruction is an instruction that
+ * takes the internal name of a class as parameter.
+ *
+ * @param opcode the opcode of the type instruction to be visited. This
+ * opcode is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+ * @param type the operand of the instruction to be visited. This operand
+ * must be the internal name of an object or array class (see {@link
+ * Type#getInternalName() getInternalName}).
+ */
+ public void visitTypeInsn(int opcode, String type) {
+ if (mv != null) {
+ mv.visitTypeInsn(opcode, type);
+ }
+ }
+
+ /**
+ * Visits a field instruction. A field instruction is an instruction that
+ * loads or stores the value of a field of an object.
+ *
+ * @param opcode the opcode of the type instruction to be visited. This
+ * opcode is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+ * @param owner the internal name of the field's owner class (see {@link
+ * Type#getInternalName() getInternalName}).
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link Type Type}).
+ */
+ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
+ if (mv != null) {
+ mv.visitFieldInsn(opcode, owner, name, desc);
+ }
+ }
+
+ /**
+ * Visits a method instruction. A method instruction is an instruction that
+ * invokes a method.
+ *
+ * @param opcode the opcode of the type instruction to be visited. This
+ * opcode is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC
+ * or INVOKEINTERFACE.
+ * @param owner the internal name of the method's owner class (see {@link
+ * Type#getInternalName() getInternalName}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ */
+ public void visitMethodInsn(int opcode, String owner, String name, String desc) {
+ if (mv != null) {
+ mv.visitMethodInsn(opcode, owner, name, desc);
+ }
+ }
+
+ /**
+ * Visits an invokedynamic instruction.
+ *
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param bsm the bootstrap method.
+ * @param bsmArgs the bootstrap method constant arguments. Each argument
+ * must be an {@link Integer}, {@link Float}, {@link Long},
+ * {@link Double}, {@link String}, {@link Type} or {@link Handle}
+ * value. This method is allowed to modify the content of the array
+ * so a caller should expect that this array may change.
+ */
+ public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
+ if (mv != null) {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+ }
+
+ /**
+ * Visits a jump instruction. A jump instruction is an instruction that may
+ * jump to another instruction.
+ *
+ * @param opcode the opcode of the type instruction to be visited. This
+ * opcode is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+ * IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ,
+ * IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+ * @param label the operand of the instruction to be visited. This operand
+ * is a label that designates the instruction to which the jump
+ * instruction may jump.
+ */
+ public void visitJumpInsn(int opcode, Label label) {
+ if (mv != null) {
+ mv.visitJumpInsn(opcode, label);
+ }
+ }
+
+ /**
+ * Visits a label. A label designates the instruction that will be visited
+ * just after it.
+ *
+ * @param label a {@link Label Label} object.
+ */
+ public void visitLabel(Label label) {
+ if (mv != null) {
+ mv.visitLabel(label);
+ }
+ }
+
+ // -------------------------------------------------------------------------
+ // Special instructions
+ // -------------------------------------------------------------------------
+
+ /**
+ * Visits a LDC instruction. Note that new constant types may be added in
+ * future versions of the Java Virtual Machine. To easily detect new
+ * constant types, implementations of this method should check for
+ * unexpected constant types, like this:
+ * <pre>
+ * if (cst instanceof Integer) {
+ * // ...
+ * } else if (cst instanceof Float) {
+ * // ...
+ * } else if (cst instanceof Long) {
+ * // ...
+ * } else if (cst instanceof Double) {
+ * // ...
+ * } else if (cst instanceof String) {
+ * // ...
+ * } else if (cst instanceof Type) {
+ * int sort = ((Type) cst).getSort();
+ * if (sort == Type.OBJECT) {
+ * // ...
+ * } else if (sort == Type.ARRAY) {
+ * // ...
+ * } else if (sort == Type.METHOD) {
+ * // ...
+ * } else {
+ * // throw an exception
+ * }
+ * } else if (cst instanceof Handle) {
+ * // ...
+ * } else {
+ * // throw an exception
+ * }</pre>
+ *
+ * @param cst the constant to be loaded on the stack. This parameter must be
+ * a non null {@link Integer}, a {@link Float}, a {@link Long}, a
+ * {@link Double}, a {@link String}, a {@link Type} of OBJECT or ARRAY
+ * sort for <tt>.class</tt> constants, for classes whose version is
+ * 49.0, a {@link Type} of METHOD sort or a {@link Handle} for
+ * MethodType and MethodHandle constants, for classes whose version
+ * is 51.0.
+ */
+ public void visitLdcInsn(Object cst) {
+ if (mv != null) {
+ mv.visitLdcInsn(cst);
+ }
+ }
+
+ /**
+ * Visits an IINC instruction.
+ *
+ * @param var index of the local variable to be incremented.
+ * @param increment amount to increment the local variable by.
+ */
+ public void visitIincInsn(int var, int increment) {
+ if (mv != null) {
+ mv.visitIincInsn(var, increment);
+ }
+ }
+
+ /**
+ * Visits a TABLESWITCH instruction.
+ *
+ * @param min the minimum key value.
+ * @param max the maximum key value.
+ * @param dflt beginning of the default handler block.
+ * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+ * the beginning of the handler block for the <tt>min + i</tt> key.
+ */
+ public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels) {
+ if (mv != null) {
+ mv.visitTableSwitchInsn(min, max, dflt, labels);
+ }
+ }
+
+ /**
+ * Visits a LOOKUPSWITCH instruction.
+ *
+ * @param dflt beginning of the default handler block.
+ * @param keys the values of the keys.
+ * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+ * the beginning of the handler block for the <tt>keys[i]</tt> key.
+ */
+ public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
+ if (mv != null) {
+ mv.visitLookupSwitchInsn(dflt, keys, labels);
+ }
+ }
+
+ /**
+ * Visits a MULTIANEWARRAY instruction.
+ *
+ * @param desc an array type descriptor (see {@link Type Type}).
+ * @param dims number of dimensions of the array to allocate.
+ */
+ public void visitMultiANewArrayInsn(String desc, int dims) {
+ if (mv != null) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ }
+ }
+
+ // -------------------------------------------------------------------------
+ // Exceptions table entries, debug information, max stack and max locals
+ // -------------------------------------------------------------------------
+
+ /**
+ * Visits a try catch block.
+ *
+ * @param start beginning of the exception handler's scope (inclusive).
+ * @param end end of the exception handler's scope (exclusive).
+ * @param handler beginning of the exception handler's code.
+ * @param type internal name of the type of exceptions handled by the
+ * handler, or <tt>null</tt> to catch any exceptions (for "finally"
+ * blocks).
+ * @throws IllegalArgumentException if one of the labels has already been
+ * visited by this visitor (by the {@link #visitLabel visitLabel}
+ * method).
+ */
+ public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+ if (mv != null) {
+ mv.visitTryCatchBlock(start, end, handler, type);
+ }
+ }
+
+ /**
+ * Visits a local variable declaration.
+ *
+ * @param name the name of a local variable.
+ * @param desc the type descriptor of this local variable.
+ * @param signature the type signature of this local variable. May be
+ * <tt>null</tt> if the local variable type does not use generic
+ * types.
+ * @param start the first instruction corresponding to the scope of this
+ * local variable (inclusive).
+ * @param end the last instruction corresponding to the scope of this local
+ * variable (exclusive).
+ * @param index the local variable's index.
+ * @throws IllegalArgumentException if one of the labels has not already
+ * been visited by this visitor (by the
+ * {@link #visitLabel visitLabel} method).
+ */
+ public void visitLocalVariable(
+ String name,
+ String desc,
+ String signature,
+ Label start,
+ Label end,
+ int index)
+ {
+ if (mv != null) {
+ mv.visitLocalVariable(name, desc, signature, start, end, index);
+ }
+ }
+
+ /**
+ * Visits a line number declaration.
+ *
+ * @param line a line number. This number refers to the source file from
+ * which the class was compiled.
+ * @param start the first instruction corresponding to this line number.
+ * @throws IllegalArgumentException if <tt>start</tt> has not already been
+ * visited by this visitor (by the {@link #visitLabel visitLabel}
+ * method).
+ */
+ public void visitLineNumber(int line, Label start) {
+ if (mv != null) {
+ mv.visitLineNumber(line, start);
+ }
+ }
+
+ /**
+ * Visits the maximum stack size and the maximum number of local variables
+ * of the method.
+ *
+ * @param maxStack maximum stack size of the method.
+ * @param maxLocals maximum number of local variables for the method.
+ */
+ public void visitMaxs(int maxStack, int maxLocals) {
+ if (mv != null) {
+ mv.visitMaxs(maxStack, maxLocals);
+ }
+ }
+
+ /**
+ * Visits the end of the method. This method, which is the last one to be
+ * called, is used to inform the visitor that all the annotations and
+ * attributes of the method have been visited.
+ */
+ public void visitEnd() {
+ if (mv != null) {
+ mv.visitEnd();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
new file mode 100644
index 0000000..e43ecb1
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
@@ -0,0 +1,2695 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * A {@link MethodVisitor} that generates methods in bytecode form. Each visit
+ * method of this class appends the bytecode corresponding to the visited
+ * instruction to a byte vector, in the order these methods are called.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+class MethodWriter extends MethodVisitor {
+
+ /**
+ * Pseudo access flag used to denote constructors.
+ */
+ static final int ACC_CONSTRUCTOR = 262144;
+
+ /**
+ * Frame has exactly the same locals as the previous stack map frame and
+ * number of stack items is zero.
+ */
+ static final int SAME_FRAME = 0; // to 63 (0-3f)
+
+ /**
+ * Frame has exactly the same locals as the previous stack map frame and
+ * number of stack items is 1
+ */
+ static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64; // to 127 (40-7f)
+
+ /**
+ * Reserved for future use
+ */
+ static final int RESERVED = 128;
+
+ /**
+ * Frame has exactly the same locals as the previous stack map frame and
+ * number of stack items is 1. Offset is bigger then 63;
+ */
+ static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247; // f7
+
+ /**
+ * Frame where current locals are the same as the locals in the previous
+ * frame, except that the k last locals are absent. The value of k is given
+ * by the formula 251-frame_type.
+ */
+ static final int CHOP_FRAME = 248; // to 250 (f8-fA)
+
+ /**
+ * Frame has exactly the same locals as the previous stack map frame and
+ * number of stack items is zero. Offset is bigger then 63;
+ */
+ static final int SAME_FRAME_EXTENDED = 251; // fb
+
+ /**
+ * Frame where current locals are the same as the locals in the previous
+ * frame, except that k additional locals are defined. The value of k is
+ * given by the formula frame_type-251.
+ */
+ static final int APPEND_FRAME = 252; // to 254 // fc-fe
+
+ /**
+ * Full frame
+ */
+ static final int FULL_FRAME = 255; // ff
+
+ /**
+ * Indicates that the stack map frames must be recomputed from scratch. In
+ * this case the maximum stack size and number of local variables is also
+ * recomputed from scratch.
+ *
+ * @see #compute
+ */
+ private static final int FRAMES = 0;
+
+ /**
+ * Indicates that the maximum stack size and number of local variables must
+ * be automatically computed.
+ *
+ * @see #compute
+ */
+ private static final int MAXS = 1;
+
+ /**
+ * Indicates that nothing must be automatically computed.
+ *
+ * @see #compute
+ */
+ private static final int NOTHING = 2;
+
+ /**
+ * The class writer to which this method must be added.
+ */
+ final ClassWriter cw;
+
+ /**
+ * Access flags of this method.
+ */
+ private int access;
+
+ /**
+ * The index of the constant pool item that contains the name of this
+ * method.
+ */
+ private final int name;
+
+ /**
+ * The index of the constant pool item that contains the descriptor of this
+ * method.
+ */
+ private final int desc;
+
+ /**
+ * The descriptor of this method.
+ */
+ private final String descriptor;
+
+ /**
+ * The signature of this method.
+ */
+ String signature;
+
+ /**
+ * If not zero, indicates that the code of this method must be copied from
+ * the ClassReader associated to this writer in <code>cw.cr</code>. More
+ * precisely, this field gives the index of the first byte to copied from
+ * <code>cw.cr.b</code>.
+ */
+ int classReaderOffset;
+
+ /**
+ * If not zero, indicates that the code of this method must be copied from
+ * the ClassReader associated to this writer in <code>cw.cr</code>. More
+ * precisely, this field gives the number of bytes to copied from
+ * <code>cw.cr.b</code>.
+ */
+ int classReaderLength;
+
+ /**
+ * Number of exceptions that can be thrown by this method.
+ */
+ int exceptionCount;
+
+ /**
+ * The exceptions that can be thrown by this method. More precisely, this
+ * array contains the indexes of the constant pool items that contain the
+ * internal names of these exception classes.
+ */
+ int[] exceptions;
+
+ /**
+ * The annotation default attribute of this method. May be <tt>null</tt>.
+ */
+ private ByteVector annd;
+
+ /**
+ * The runtime visible annotations of this method. May be <tt>null</tt>.
+ */
+ private AnnotationWriter anns;
+
+ /**
+ * The runtime invisible annotations of this method. May be <tt>null</tt>.
+ */
+ private AnnotationWriter ianns;
+
+ /**
+ * The runtime visible parameter annotations of this method. May be
+ * <tt>null</tt>.
+ */
+ private AnnotationWriter[] panns;
+
+ /**
+ * The runtime invisible parameter annotations of this method. May be
+ * <tt>null</tt>.
+ */
+ private AnnotationWriter[] ipanns;
+
+ /**
+ * The number of synthetic parameters of this method.
+ */
+ private int synthetics;
+
+ /**
+ * The non standard attributes of the method.
+ */
+ private Attribute attrs;
+
+ /**
+ * The bytecode of this method.
+ */
+ private ByteVector code = new ByteVector();
+
+ /**
+ * Maximum stack size of this method.
+ */
+ private int maxStack;
+
+ /**
+ * Maximum number of local variables for this method.
+ */
+ private int maxLocals;
+
+ /**
+ * Number of local variables in the current stack map frame.
+ */
+ private int currentLocals;
+
+ /**
+ * Number of stack map frames in the StackMapTable attribute.
+ */
+ private int frameCount;
+
+ /**
+ * The StackMapTable attribute.
+ */
+ private ByteVector stackMap;
+
+ /**
+ * The offset of the last frame that was written in the StackMapTable
+ * attribute.
+ */
+ private int previousFrameOffset;
+
+ /**
+ * The last frame that was written in the StackMapTable attribute.
+ *
+ * @see #frame
+ */
+ private int[] previousFrame;
+
+ /**
+ * Index of the next element to be added in {@link #frame}.
+ */
+ private int frameIndex;
+
+ /**
+ * The current stack map frame. The first element contains the offset of the
+ * instruction to which the frame corresponds, the second element is the
+ * number of locals and the third one is the number of stack elements. The
+ * local variables start at index 3 and are followed by the operand stack
+ * values. In summary frame[0] = offset, frame[1] = nLocal, frame[2] =
+ * nStack, frame[3] = nLocal. All types are encoded as integers, with the
+ * same format as the one used in {@link Label}, but limited to BASE types.
+ */
+ private int[] frame;
+
+ /**
+ * Number of elements in the exception handler list.
+ */
+ private int handlerCount;
+
+ /**
+ * The first element in the exception handler list.
+ */
+ private Handler firstHandler;
+
+ /**
+ * The last element in the exception handler list.
+ */
+ private Handler lastHandler;
+
+ /**
+ * Number of entries in the LocalVariableTable attribute.
+ */
+ private int localVarCount;
+
+ /**
+ * The LocalVariableTable attribute.
+ */
+ private ByteVector localVar;
+
+ /**
+ * Number of entries in the LocalVariableTypeTable attribute.
+ */
+ private int localVarTypeCount;
+
+ /**
+ * The LocalVariableTypeTable attribute.
+ */
+ private ByteVector localVarType;
+
+ /**
+ * Number of entries in the LineNumberTable attribute.
+ */
+ private int lineNumberCount;
+
+ /**
+ * The LineNumberTable attribute.
+ */
+ private ByteVector lineNumber;
+
+ /**
+ * The non standard attributes of the method's code.
+ */
+ private Attribute cattrs;
+
+ /**
+ * Indicates if some jump instructions are too small and need to be resized.
+ */
+ private boolean resize;
+
+ /**
+ * The number of subroutines in this method.
+ */
+ private int subroutines;
+
+ // ------------------------------------------------------------------------
+
+ /*
+ * Fields for the control flow graph analysis algorithm (used to compute the
+ * maximum stack size). A control flow graph contains one node per "basic
+ * block", and one edge per "jump" from one basic block to another. Each
+ * node (i.e., each basic block) is represented by the Label object that
+ * corresponds to the first instruction of this basic block. Each node also
+ * stores the list of its successors in the graph, as a linked list of Edge
+ * objects.
+ */
+
+ /**
+ * Indicates what must be automatically computed.
+ *
+ * @see #FRAMES
+ * @see #MAXS
+ * @see #NOTHING
+ */
+ private final int compute;
+
+ /**
+ * A list of labels. This list is the list of basic blocks in the method,
+ * i.e. a list of Label objects linked to each other by their
+ * {@link Label#successor} field, in the order they are visited by
+ * {@link MethodVisitor#visitLabel}, and starting with the first basic block.
+ */
+ private Label labels;
+
+ /**
+ * The previous basic block.
+ */
+ private Label previousBlock;
+
+ /**
+ * The current basic block.
+ */
+ private Label currentBlock;
+
+ /**
+ * The (relative) stack size after the last visited instruction. This size
+ * is relative to the beginning of the current basic block, i.e., the true
+ * stack size after the last visited instruction is equal to the
+ * {@link Label#inputStackTop beginStackSize} of the current basic block
+ * plus <tt>stackSize</tt>.
+ */
+ private int stackSize;
+
+ /**
+ * The (relative) maximum stack size after the last visited instruction.
+ * This size is relative to the beginning of the current basic block, i.e.,
+ * the true maximum stack size after the last visited instruction is equal
+ * to the {@link Label#inputStackTop beginStackSize} of the current basic
+ * block plus <tt>stackSize</tt>.
+ */
+ private int maxStackSize;
+
+ // ------------------------------------------------------------------------
+ // Constructor
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a new {@link MethodWriter}.
+ *
+ * @param cw the class writer in which the method must be added.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type}).
+ * @param signature the method's signature. May be <tt>null</tt>.
+ * @param exceptions the internal names of the method's exceptions. May be
+ * <tt>null</tt>.
+ * @param computeMaxs <tt>true</tt> if the maximum stack size and number
+ * of local variables must be automatically computed.
+ * @param computeFrames <tt>true</tt> if the stack map tables must be
+ * recomputed from scratch.
+ */
+ MethodWriter(
+ final ClassWriter cw,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions,
+ final boolean computeMaxs,
+ final boolean computeFrames)
+ {
+ super(Opcodes.ASM4);
+ if (cw.firstMethod == null) {
+ cw.firstMethod = this;
+ } else {
+ cw.lastMethod.mv = this;
+ }
+ cw.lastMethod = this;
+ this.cw = cw;
+ this.access = access;
+ this.name = cw.newUTF8(name);
+ this.desc = cw.newUTF8(desc);
+ this.descriptor = desc;
+ if (ClassReader.SIGNATURES) {
+ this.signature = signature;
+ }
+ if (exceptions != null && exceptions.length > 0) {
+ exceptionCount = exceptions.length;
+ this.exceptions = new int[exceptionCount];
+ for (int i = 0; i < exceptionCount; ++i) {
+ this.exceptions[i] = cw.newClass(exceptions[i]);
+ }
+ }
+ this.compute = computeFrames ? FRAMES : (computeMaxs ? MAXS : NOTHING);
+ if (computeMaxs || computeFrames) {
+ if (computeFrames && "<init>".equals(name)) {
+ this.access |= ACC_CONSTRUCTOR;
+ }
+ // updates maxLocals
+ int size = Type.getArgumentsAndReturnSizes(descriptor) >> 2;
+ if ((access & Opcodes.ACC_STATIC) != 0) {
+ --size;
+ }
+ maxLocals = size;
+ currentLocals = size;
+ // creates and visits the label for the first basic block
+ labels = new Label();
+ labels.status |= Label.PUSHED;
+ visitLabel(labels);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the MethodVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public AnnotationVisitor visitAnnotationDefault() {
+ if (!ClassReader.ANNOTATIONS) {
+ return null;
+ }
+ annd = new ByteVector();
+ return new AnnotationWriter(cw, false, annd, null, 0);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ if (!ClassReader.ANNOTATIONS) {
+ return null;
+ }
+ ByteVector bv = new ByteVector();
+ // write type, and reserve space for values count
+ bv.putShort(cw.newUTF8(desc)).putShort(0);
+ AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+ if (visible) {
+ aw.next = anns;
+ anns = aw;
+ } else {
+ aw.next = ianns;
+ ianns = aw;
+ }
+ return aw;
+ }
+
+ @Override
+ public AnnotationVisitor visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ if (!ClassReader.ANNOTATIONS) {
+ return null;
+ }
+ ByteVector bv = new ByteVector();
+ if ("Ljava/lang/Synthetic;".equals(desc)) {
+ // workaround for a bug in javac with synthetic parameters
+ // see ClassReader.readParameterAnnotations
+ synthetics = Math.max(synthetics, parameter + 1);
+ return new AnnotationWriter(cw, false, bv, null, 0);
+ }
+ // write type, and reserve space for values count
+ bv.putShort(cw.newUTF8(desc)).putShort(0);
+ AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+ if (visible) {
+ if (panns == null) {
+ panns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+ }
+ aw.next = panns[parameter];
+ panns[parameter] = aw;
+ } else {
+ if (ipanns == null) {
+ ipanns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+ }
+ aw.next = ipanns[parameter];
+ ipanns[parameter] = aw;
+ }
+ return aw;
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ if (attr.isCodeAttribute()) {
+ attr.next = cattrs;
+ cattrs = attr;
+ } else {
+ attr.next = attrs;
+ attrs = attr;
+ }
+ }
+
+ @Override
+ public void visitCode() {
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ if (!ClassReader.FRAMES || compute == FRAMES) {
+ return;
+ }
+
+ if (type == Opcodes.F_NEW) {
+ currentLocals = nLocal;
+ startFrame(code.length, nLocal, nStack);
+ for (int i = 0; i < nLocal; ++i) {
+ if (local[i] instanceof String) {
+ frame[frameIndex++] = Frame.OBJECT
+ | cw.addType((String) local[i]);
+ } else if (local[i] instanceof Integer) {
+ frame[frameIndex++] = ((Integer) local[i]).intValue();
+ } else {
+ frame[frameIndex++] = Frame.UNINITIALIZED
+ | cw.addUninitializedType("",
+ ((Label) local[i]).position);
+ }
+ }
+ for (int i = 0; i < nStack; ++i) {
+ if (stack[i] instanceof String) {
+ frame[frameIndex++] = Frame.OBJECT
+ | cw.addType((String) stack[i]);
+ } else if (stack[i] instanceof Integer) {
+ frame[frameIndex++] = ((Integer) stack[i]).intValue();
+ } else {
+ frame[frameIndex++] = Frame.UNINITIALIZED
+ | cw.addUninitializedType("",
+ ((Label) stack[i]).position);
+ }
+ }
+ endFrame();
+ } else {
+ int delta;
+ if (stackMap == null) {
+ stackMap = new ByteVector();
+ delta = code.length;
+ } else {
+ delta = code.length - previousFrameOffset - 1;
+ if (delta < 0) {
+ if (type == Opcodes.F_SAME) {
+ return;
+ } else {
+ throw new IllegalStateException();
+ }
+ }
+ }
+
+ switch (type) {
+ case Opcodes.F_FULL:
+ currentLocals = nLocal;
+ stackMap.putByte(FULL_FRAME)
+ .putShort(delta)
+ .putShort(nLocal);
+ for (int i = 0; i < nLocal; ++i) {
+ writeFrameType(local[i]);
+ }
+ stackMap.putShort(nStack);
+ for (int i = 0; i < nStack; ++i) {
+ writeFrameType(stack[i]);
+ }
+ break;
+ case Opcodes.F_APPEND:
+ currentLocals += nLocal;
+ stackMap.putByte(SAME_FRAME_EXTENDED + nLocal)
+ .putShort(delta);
+ for (int i = 0; i < nLocal; ++i) {
+ writeFrameType(local[i]);
+ }
+ break;
+ case Opcodes.F_CHOP:
+ currentLocals -= nLocal;
+ stackMap.putByte(SAME_FRAME_EXTENDED - nLocal)
+ .putShort(delta);
+ break;
+ case Opcodes.F_SAME:
+ if (delta < 64) {
+ stackMap.putByte(delta);
+ } else {
+ stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+ }
+ break;
+ case Opcodes.F_SAME1:
+ if (delta < 64) {
+ stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+ } else {
+ stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+ .putShort(delta);
+ }
+ writeFrameType(stack[0]);
+ break;
+ }
+
+ previousFrameOffset = code.length;
+ ++frameCount;
+ }
+
+ maxStack = Math.max(maxStack, nStack);
+ maxLocals = Math.max(maxLocals, currentLocals);
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ // adds the instruction to the bytecode of the method
+ code.putByte(opcode);
+ // update currentBlock
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, 0, null, null);
+ } else {
+ // updates current and max stack sizes
+ int size = stackSize + Frame.SIZE[opcode];
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ // if opcode == ATHROW or xRETURN, ends current block (no successor)
+ if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
+ || opcode == Opcodes.ATHROW)
+ {
+ noSuccessor();
+ }
+ }
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, operand, null, null);
+ } else if (opcode != Opcodes.NEWARRAY) {
+ // updates current and max stack sizes only for NEWARRAY
+ // (stack size variation = 0 for BIPUSH or SIPUSH)
+ int size = stackSize + 1;
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ if (opcode == Opcodes.SIPUSH) {
+ code.put12(opcode, operand);
+ } else { // BIPUSH or NEWARRAY
+ code.put11(opcode, operand);
+ }
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, var, null, null);
+ } else {
+ // updates current and max stack sizes
+ if (opcode == Opcodes.RET) {
+ // no stack change, but end of current block (no successor)
+ currentBlock.status |= Label.RET;
+ // save 'stackSize' here for future use
+ // (see {@link #findSubroutineSuccessors})
+ currentBlock.inputStackTop = stackSize;
+ noSuccessor();
+ } else { // xLOAD or xSTORE
+ int size = stackSize + Frame.SIZE[opcode];
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ }
+ if (compute != NOTHING) {
+ // updates max locals
+ int n;
+ if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD
+ || opcode == Opcodes.LSTORE || opcode == Opcodes.DSTORE)
+ {
+ n = var + 2;
+ } else {
+ n = var + 1;
+ }
+ if (n > maxLocals) {
+ maxLocals = n;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ if (var < 4 && opcode != Opcodes.RET) {
+ int opt;
+ if (opcode < Opcodes.ISTORE) {
+ /* ILOAD_0 */
+ opt = 26 + ((opcode - Opcodes.ILOAD) << 2) + var;
+ } else {
+ /* ISTORE_0 */
+ opt = 59 + ((opcode - Opcodes.ISTORE) << 2) + var;
+ }
+ code.putByte(opt);
+ } else if (var >= 256) {
+ code.putByte(196 /* WIDE */).put12(opcode, var);
+ } else {
+ code.put11(opcode, var);
+ }
+ if (opcode >= Opcodes.ISTORE && compute == FRAMES && handlerCount > 0) {
+ visitLabel(new Label());
+ }
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ Item i = cw.newClassItem(type);
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, code.length, cw, i);
+ } else if (opcode == Opcodes.NEW) {
+ // updates current and max stack sizes only if opcode == NEW
+ // (no stack change for ANEWARRAY, CHECKCAST, INSTANCEOF)
+ int size = stackSize + 1;
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ code.put12(opcode, i.index);
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ Item i = cw.newFieldItem(owner, name, desc);
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, 0, cw, i);
+ } else {
+ int size;
+ // computes the stack size variation
+ char c = desc.charAt(0);
+ switch (opcode) {
+ case Opcodes.GETSTATIC:
+ size = stackSize + (c == 'D' || c == 'J' ? 2 : 1);
+ break;
+ case Opcodes.PUTSTATIC:
+ size = stackSize + (c == 'D' || c == 'J' ? -2 : -1);
+ break;
+ case Opcodes.GETFIELD:
+ size = stackSize + (c == 'D' || c == 'J' ? 1 : 0);
+ break;
+ // case Constants.PUTFIELD:
+ default:
+ size = stackSize + (c == 'D' || c == 'J' ? -3 : -2);
+ break;
+ }
+ // updates current and max stack sizes
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ code.put12(opcode, i.index);
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ boolean itf = opcode == Opcodes.INVOKEINTERFACE;
+ Item i = cw.newMethodItem(owner, name, desc, itf);
+ int argSize = i.intVal;
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, 0, cw, i);
+ } else {
+ /*
+ * computes the stack size variation. In order not to recompute
+ * several times this variation for the same Item, we use the
+ * intVal field of this item to store this variation, once it
+ * has been computed. More precisely this intVal field stores
+ * the sizes of the arguments and of the return value
+ * corresponding to desc.
+ */
+ if (argSize == 0) {
+ // the above sizes have not been computed yet,
+ // so we compute them...
+ argSize = Type.getArgumentsAndReturnSizes(desc);
+ // ... and we save them in order
+ // not to recompute them in the future
+ i.intVal = argSize;
+ }
+ int size;
+ if (opcode == Opcodes.INVOKESTATIC) {
+ size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1;
+ } else {
+ size = stackSize - (argSize >> 2) + (argSize & 0x03);
+ }
+ // updates current and max stack sizes
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ if (itf) {
+ if (argSize == 0) {
+ argSize = Type.getArgumentsAndReturnSizes(desc);
+ i.intVal = argSize;
+ }
+ code.put12(Opcodes.INVOKEINTERFACE, i.index).put11(argSize >> 2, 0);
+ } else {
+ code.put12(opcode, i.index);
+ }
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ final String name,
+ final String desc,
+ final Handle bsm,
+ final Object... bsmArgs)
+ {
+ Item i = cw.newInvokeDynamicItem(name, desc, bsm, bsmArgs);
+ int argSize = i.intVal;
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(Opcodes.INVOKEDYNAMIC, 0, cw, i);
+ } else {
+ /*
+ * computes the stack size variation. In order not to recompute
+ * several times this variation for the same Item, we use the
+ * intVal field of this item to store this variation, once it
+ * has been computed. More precisely this intVal field stores
+ * the sizes of the arguments and of the return value
+ * corresponding to desc.
+ */
+ if (argSize == 0) {
+ // the above sizes have not been computed yet,
+ // so we compute them...
+ argSize = Type.getArgumentsAndReturnSizes(desc);
+ // ... and we save them in order
+ // not to recompute them in the future
+ i.intVal = argSize;
+ }
+ int size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1;
+
+ // updates current and max stack sizes
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ code.put12(Opcodes.INVOKEDYNAMIC, i.index);
+ code.putShort(0);
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ Label nextInsn = null;
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(opcode, 0, null, null);
+ // 'label' is the target of a jump instruction
+ label.getFirst().status |= Label.TARGET;
+ // adds 'label' as a successor of this basic block
+ addSuccessor(Edge.NORMAL, label);
+ if (opcode != Opcodes.GOTO) {
+ // creates a Label for the next basic block
+ nextInsn = new Label();
+ }
+ } else {
+ if (opcode == Opcodes.JSR) {
+ if ((label.status & Label.SUBROUTINE) == 0) {
+ label.status |= Label.SUBROUTINE;
+ ++subroutines;
+ }
+ currentBlock.status |= Label.JSR;
+ addSuccessor(stackSize + 1, label);
+ // creates a Label for the next basic block
+ nextInsn = new Label();
+ /*
+ * note that, by construction in this method, a JSR block
+ * has at least two successors in the control flow graph:
+ * the first one leads the next instruction after the JSR,
+ * while the second one leads to the JSR target.
+ */
+ } else {
+ // updates current stack size (max stack size unchanged
+ // because stack size variation always negative in this
+ // case)
+ stackSize += Frame.SIZE[opcode];
+ addSuccessor(stackSize, label);
+ }
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ if ((label.status & Label.RESOLVED) != 0
+ && label.position - code.length < Short.MIN_VALUE)
+ {
+ /*
+ * case of a backward jump with an offset < -32768. In this case we
+ * automatically replace GOTO with GOTO_W, JSR with JSR_W and IFxxx
+ * <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is the
+ * "opposite" opcode of IFxxx (i.e., IFNE for IFEQ) and where <l'>
+ * designates the instruction just after the GOTO_W.
+ */
+ if (opcode == Opcodes.GOTO) {
+ code.putByte(200); // GOTO_W
+ } else if (opcode == Opcodes.JSR) {
+ code.putByte(201); // JSR_W
+ } else {
+ // if the IF instruction is transformed into IFNOT GOTO_W the
+ // next instruction becomes the target of the IFNOT instruction
+ if (nextInsn != null) {
+ nextInsn.status |= Label.TARGET;
+ }
+ code.putByte(opcode <= 166
+ ? ((opcode + 1) ^ 1) - 1
+ : opcode ^ 1);
+ code.putShort(8); // jump offset
+ code.putByte(200); // GOTO_W
+ }
+ label.put(this, code, code.length - 1, true);
+ } else {
+ /*
+ * case of a backward jump with an offset >= -32768, or of a forward
+ * jump with, of course, an unknown offset. In these cases we store
+ * the offset in 2 bytes (which will be increased in
+ * resizeInstructions, if needed).
+ */
+ code.putByte(opcode);
+ label.put(this, code, code.length - 1, false);
+ }
+ if (currentBlock != null) {
+ if (nextInsn != null) {
+ // if the jump instruction is not a GOTO, the next instruction
+ // is also a successor of this instruction. Calling visitLabel
+ // adds the label of this next instruction as a successor of the
+ // current block, and starts a new basic block
+ visitLabel(nextInsn);
+ }
+ if (opcode == Opcodes.GOTO) {
+ noSuccessor();
+ }
+ }
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ // resolves previous forward references to label, if any
+ resize |= label.resolve(this, code.length, code.data);
+ // updates currentBlock
+ if ((label.status & Label.DEBUG) != 0) {
+ return;
+ }
+ if (compute == FRAMES) {
+ if (currentBlock != null) {
+ if (label.position == currentBlock.position) {
+ // successive labels, do not start a new basic block
+ currentBlock.status |= (label.status & Label.TARGET);
+ label.frame = currentBlock.frame;
+ return;
+ }
+ // ends current block (with one new successor)
+ addSuccessor(Edge.NORMAL, label);
+ }
+ // begins a new current block
+ currentBlock = label;
+ if (label.frame == null) {
+ label.frame = new Frame();
+ label.frame.owner = label;
+ }
+ // updates the basic block list
+ if (previousBlock != null) {
+ if (label.position == previousBlock.position) {
+ previousBlock.status |= (label.status & Label.TARGET);
+ label.frame = previousBlock.frame;
+ currentBlock = previousBlock;
+ return;
+ }
+ previousBlock.successor = label;
+ }
+ previousBlock = label;
+ } else if (compute == MAXS) {
+ if (currentBlock != null) {
+ // ends current block (with one new successor)
+ currentBlock.outputStackMax = maxStackSize;
+ addSuccessor(stackSize, label);
+ }
+ // begins a new current block
+ currentBlock = label;
+ // resets the relative current and max stack sizes
+ stackSize = 0;
+ maxStackSize = 0;
+ // updates the basic block list
+ if (previousBlock != null) {
+ previousBlock.successor = label;
+ }
+ previousBlock = label;
+ }
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ Item i = cw.newConstItem(cst);
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(Opcodes.LDC, 0, cw, i);
+ } else {
+ int size;
+ // computes the stack size variation
+ if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE)
+ {
+ size = stackSize + 2;
+ } else {
+ size = stackSize + 1;
+ }
+ // updates current and max stack sizes
+ if (size > maxStackSize) {
+ maxStackSize = size;
+ }
+ stackSize = size;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ int index = i.index;
+ if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) {
+ code.put12(20 /* LDC2_W */, index);
+ } else if (index >= 256) {
+ code.put12(19 /* LDC_W */, index);
+ } else {
+ code.put11(Opcodes.LDC, index);
+ }
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(Opcodes.IINC, var, null, null);
+ }
+ }
+ if (compute != NOTHING) {
+ // updates max locals
+ int n = var + 1;
+ if (n > maxLocals) {
+ maxLocals = n;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ if ((var > 255) || (increment > 127) || (increment < -128)) {
+ code.putByte(196 /* WIDE */)
+ .put12(Opcodes.IINC, var)
+ .putShort(increment);
+ } else {
+ code.putByte(Opcodes.IINC).put11(var, increment);
+ }
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ // adds the instruction to the bytecode of the method
+ int source = code.length;
+ code.putByte(Opcodes.TABLESWITCH);
+ code.putByteArray(null, 0, (4 - code.length % 4) % 4);
+ dflt.put(this, code, source, true);
+ code.putInt(min).putInt(max);
+ for (int i = 0; i < labels.length; ++i) {
+ labels[i].put(this, code, source, true);
+ }
+ // updates currentBlock
+ visitSwitchInsn(dflt, labels);
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ // adds the instruction to the bytecode of the method
+ int source = code.length;
+ code.putByte(Opcodes.LOOKUPSWITCH);
+ code.putByteArray(null, 0, (4 - code.length % 4) % 4);
+ dflt.put(this, code, source, true);
+ code.putInt(labels.length);
+ for (int i = 0; i < labels.length; ++i) {
+ code.putInt(keys[i]);
+ labels[i].put(this, code, source, true);
+ }
+ // updates currentBlock
+ visitSwitchInsn(dflt, labels);
+ }
+
+ private void visitSwitchInsn(final Label dflt, final Label[] labels) {
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(Opcodes.LOOKUPSWITCH, 0, null, null);
+ // adds current block successors
+ addSuccessor(Edge.NORMAL, dflt);
+ dflt.getFirst().status |= Label.TARGET;
+ for (int i = 0; i < labels.length; ++i) {
+ addSuccessor(Edge.NORMAL, labels[i]);
+ labels[i].getFirst().status |= Label.TARGET;
+ }
+ } else {
+ // updates current stack size (max stack size unchanged)
+ --stackSize;
+ // adds current block successors
+ addSuccessor(stackSize, dflt);
+ for (int i = 0; i < labels.length; ++i) {
+ addSuccessor(stackSize, labels[i]);
+ }
+ }
+ // ends current block
+ noSuccessor();
+ }
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ Item i = cw.newClassItem(desc);
+ // Label currentBlock = this.currentBlock;
+ if (currentBlock != null) {
+ if (compute == FRAMES) {
+ currentBlock.frame.execute(Opcodes.MULTIANEWARRAY, dims, cw, i);
+ } else {
+ // updates current stack size (max stack size unchanged because
+ // stack size variation always negative or null)
+ stackSize += 1 - dims;
+ }
+ }
+ // adds the instruction to the bytecode of the method
+ code.put12(Opcodes.MULTIANEWARRAY, i.index).putByte(dims);
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ ++handlerCount;
+ Handler h = new Handler();
+ h.start = start;
+ h.end = end;
+ h.handler = handler;
+ h.desc = type;
+ h.type = type != null ? cw.newClass(type) : 0;
+ if (lastHandler == null) {
+ firstHandler = h;
+ } else {
+ lastHandler.next = h;
+ }
+ lastHandler = h;
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ if (signature != null) {
+ if (localVarType == null) {
+ localVarType = new ByteVector();
+ }
+ ++localVarTypeCount;
+ localVarType.putShort(start.position)
+ .putShort(end.position - start.position)
+ .putShort(cw.newUTF8(name))
+ .putShort(cw.newUTF8(signature))
+ .putShort(index);
+ }
+ if (localVar == null) {
+ localVar = new ByteVector();
+ }
+ ++localVarCount;
+ localVar.putShort(start.position)
+ .putShort(end.position - start.position)
+ .putShort(cw.newUTF8(name))
+ .putShort(cw.newUTF8(desc))
+ .putShort(index);
+ if (compute != NOTHING) {
+ // updates max locals
+ char c = desc.charAt(0);
+ int n = index + (c == 'J' || c == 'D' ? 2 : 1);
+ if (n > maxLocals) {
+ maxLocals = n;
+ }
+ }
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ if (lineNumber == null) {
+ lineNumber = new ByteVector();
+ }
+ ++lineNumberCount;
+ lineNumber.putShort(start.position);
+ lineNumber.putShort(line);
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ if (ClassReader.FRAMES && compute == FRAMES) {
+ // completes the control flow graph with exception handler blocks
+ Handler handler = firstHandler;
+ while (handler != null) {
+ Label l = handler.start.getFirst();
+ Label h = handler.handler.getFirst();
+ Label e = handler.end.getFirst();
+ // computes the kind of the edges to 'h'
+ String t = handler.desc == null
+ ? "java/lang/Throwable"
+ : handler.desc;
+ int kind = Frame.OBJECT | cw.addType(t);
+ // h is an exception handler
+ h.status |= Label.TARGET;
+ // adds 'h' as a successor of labels between 'start' and 'end'
+ while (l != e) {
+ // creates an edge to 'h'
+ Edge b = new Edge();
+ b.info = kind;
+ b.successor = h;
+ // adds it to the successors of 'l'
+ b.next = l.successors;
+ l.successors = b;
+ // goes to the next label
+ l = l.successor;
+ }
+ handler = handler.next;
+ }
+
+ // creates and visits the first (implicit) frame
+ Frame f = labels.frame;
+ Type[] args = Type.getArgumentTypes(descriptor);
+ f.initInputFrame(cw, access, args, this.maxLocals);
+ visitFrame(f);
+
+ /*
+ * fix point algorithm: mark the first basic block as 'changed'
+ * (i.e. put it in the 'changed' list) and, while there are changed
+ * basic blocks, choose one, mark it as unchanged, and update its
+ * successors (which can be changed in the process).
+ */
+ int max = 0;
+ Label changed = labels;
+ while (changed != null) {
+ // removes a basic block from the list of changed basic blocks
+ Label l = changed;
+ changed = changed.next;
+ l.next = null;
+ f = l.frame;
+ // a reachable jump target must be stored in the stack map
+ if ((l.status & Label.TARGET) != 0) {
+ l.status |= Label.STORE;
+ }
+ // all visited labels are reachable, by definition
+ l.status |= Label.REACHABLE;
+ // updates the (absolute) maximum stack size
+ int blockMax = f.inputStack.length + l.outputStackMax;
+ if (blockMax > max) {
+ max = blockMax;
+ }
+ // updates the successors of the current basic block
+ Edge e = l.successors;
+ while (e != null) {
+ Label n = e.successor.getFirst();
+ boolean change = f.merge(cw, n.frame, e.info);
+ if (change && n.next == null) {
+ // if n has changed and is not already in the 'changed'
+ // list, adds it to this list
+ n.next = changed;
+ changed = n;
+ }
+ e = e.next;
+ }
+ }
+
+ // visits all the frames that must be stored in the stack map
+ Label l = labels;
+ while (l != null) {
+ f = l.frame;
+ if ((l.status & Label.STORE) != 0) {
+ visitFrame(f);
+ }
+ if ((l.status & Label.REACHABLE) == 0) {
+ // finds start and end of dead basic block
+ Label k = l.successor;
+ int start = l.position;
+ int end = (k == null ? code.length : k.position) - 1;
+ // if non empty basic block
+ if (end >= start) {
+ max = Math.max(max, 1);
+ // replaces instructions with NOP ... NOP ATHROW
+ for (int i = start; i < end; ++i) {
+ code.data[i] = Opcodes.NOP;
+ }
+ code.data[end] = (byte) Opcodes.ATHROW;
+ // emits a frame for this unreachable block
+ startFrame(start, 0, 1);
+ frame[frameIndex++] = Frame.OBJECT
+ | cw.addType("java/lang/Throwable");
+ endFrame();
+ // removes the start-end range from the exception handlers
+ firstHandler = Handler.remove(firstHandler, l, k);
+ }
+ }
+ l = l.successor;
+ }
+
+ handler = firstHandler;
+ handlerCount = 0;
+ while (handler != null) {
+ handlerCount += 1;
+ handler = handler.next;
+ }
+
+ this.maxStack = max;
+ } else if (compute == MAXS) {
+ // completes the control flow graph with exception handler blocks
+ Handler handler = firstHandler;
+ while (handler != null) {
+ Label l = handler.start;
+ Label h = handler.handler;
+ Label e = handler.end;
+ // adds 'h' as a successor of labels between 'start' and 'end'
+ while (l != e) {
+ // creates an edge to 'h'
+ Edge b = new Edge();
+ b.info = Edge.EXCEPTION;
+ b.successor = h;
+ // adds it to the successors of 'l'
+ if ((l.status & Label.JSR) == 0) {
+ b.next = l.successors;
+ l.successors = b;
+ } else {
+ // if l is a JSR block, adds b after the first two edges
+ // to preserve the hypothesis about JSR block successors
+ // order (see {@link #visitJumpInsn})
+ b.next = l.successors.next.next;
+ l.successors.next.next = b;
+ }
+ // goes to the next label
+ l = l.successor;
+ }
+ handler = handler.next;
+ }
+
+ if (subroutines > 0) {
+ // completes the control flow graph with the RET successors
+ /*
+ * first step: finds the subroutines. This step determines, for
+ * each basic block, to which subroutine(s) it belongs.
+ */
+ // finds the basic blocks that belong to the "main" subroutine
+ int id = 0;
+ labels.visitSubroutine(null, 1, subroutines);
+ // finds the basic blocks that belong to the real subroutines
+ Label l = labels;
+ while (l != null) {
+ if ((l.status & Label.JSR) != 0) {
+ // the subroutine is defined by l's TARGET, not by l
+ Label subroutine = l.successors.next.successor;
+ // if this subroutine has not been visited yet...
+ if ((subroutine.status & Label.VISITED) == 0) {
+ // ...assigns it a new id and finds its basic blocks
+ id += 1;
+ subroutine.visitSubroutine(null, (id / 32L) << 32
+ | (1L << (id % 32)), subroutines);
+ }
+ }
+ l = l.successor;
+ }
+ // second step: finds the successors of RET blocks
+ l = labels;
+ while (l != null) {
+ if ((l.status & Label.JSR) != 0) {
+ Label L = labels;
+ while (L != null) {
+ L.status &= ~Label.VISITED2;
+ L = L.successor;
+ }
+ // the subroutine is defined by l's TARGET, not by l
+ Label subroutine = l.successors.next.successor;
+ subroutine.visitSubroutine(l, 0, subroutines);
+ }
+ l = l.successor;
+ }
+ }
+
+ /*
+ * control flow analysis algorithm: while the block stack is not
+ * empty, pop a block from this stack, update the max stack size,
+ * compute the true (non relative) begin stack size of the
+ * successors of this block, and push these successors onto the
+ * stack (unless they have already been pushed onto the stack).
+ * Note: by hypothesis, the {@link Label#inputStackTop} of the
+ * blocks in the block stack are the true (non relative) beginning
+ * stack sizes of these blocks.
+ */
+ int max = 0;
+ Label stack = labels;
+ while (stack != null) {
+ // pops a block from the stack
+ Label l = stack;
+ stack = stack.next;
+ // computes the true (non relative) max stack size of this block
+ int start = l.inputStackTop;
+ int blockMax = start + l.outputStackMax;
+ // updates the global max stack size
+ if (blockMax > max) {
+ max = blockMax;
+ }
+ // analyzes the successors of the block
+ Edge b = l.successors;
+ if ((l.status & Label.JSR) != 0) {
+ // ignores the first edge of JSR blocks (virtual successor)
+ b = b.next;
+ }
+ while (b != null) {
+ l = b.successor;
+ // if this successor has not already been pushed...
+ if ((l.status & Label.PUSHED) == 0) {
+ // computes its true beginning stack size...
+ l.inputStackTop = b.info == Edge.EXCEPTION ? 1 : start
+ + b.info;
+ // ...and pushes it onto the stack
+ l.status |= Label.PUSHED;
+ l.next = stack;
+ stack = l;
+ }
+ b = b.next;
+ }
+ }
+ this.maxStack = Math.max(maxStack, max);
+ } else {
+ this.maxStack = maxStack;
+ this.maxLocals = maxLocals;
+ }
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: control flow analysis algorithm
+ // ------------------------------------------------------------------------
+
+ /**
+ * Adds a successor to the {@link #currentBlock currentBlock} block.
+ *
+ * @param info information about the control flow edge to be added.
+ * @param successor the successor block to be added to the current block.
+ */
+ private void addSuccessor(final int info, final Label successor) {
+ // creates and initializes an Edge object...
+ Edge b = new Edge();
+ b.info = info;
+ b.successor = successor;
+ // ...and adds it to the successor list of the currentBlock block
+ b.next = currentBlock.successors;
+ currentBlock.successors = b;
+ }
+
+ /**
+ * Ends the current basic block. This method must be used in the case where
+ * the current basic block does not have any successor.
+ */
+ private void noSuccessor() {
+ if (compute == FRAMES) {
+ Label l = new Label();
+ l.frame = new Frame();
+ l.frame.owner = l;
+ l.resolve(this, code.length, code.data);
+ previousBlock.successor = l;
+ previousBlock = l;
+ } else {
+ currentBlock.outputStackMax = maxStackSize;
+ }
+ currentBlock = null;
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: stack map frames
+ // ------------------------------------------------------------------------
+
+ /**
+ * Visits a frame that has been computed from scratch.
+ *
+ * @param f the frame that must be visited.
+ */
+ private void visitFrame(final Frame f) {
+ int i, t;
+ int nTop = 0;
+ int nLocal = 0;
+ int nStack = 0;
+ int[] locals = f.inputLocals;
+ int[] stacks = f.inputStack;
+ // computes the number of locals (ignores TOP types that are just after
+ // a LONG or a DOUBLE, and all trailing TOP types)
+ for (i = 0; i < locals.length; ++i) {
+ t = locals[i];
+ if (t == Frame.TOP) {
+ ++nTop;
+ } else {
+ nLocal += nTop + 1;
+ nTop = 0;
+ }
+ if (t == Frame.LONG || t == Frame.DOUBLE) {
+ ++i;
+ }
+ }
+ // computes the stack size (ignores TOP types that are just after
+ // a LONG or a DOUBLE)
+ for (i = 0; i < stacks.length; ++i) {
+ t = stacks[i];
+ ++nStack;
+ if (t == Frame.LONG || t == Frame.DOUBLE) {
+ ++i;
+ }
+ }
+ // visits the frame and its content
+ startFrame(f.owner.position, nLocal, nStack);
+ for (i = 0; nLocal > 0; ++i, --nLocal) {
+ t = locals[i];
+ frame[frameIndex++] = t;
+ if (t == Frame.LONG || t == Frame.DOUBLE) {
+ ++i;
+ }
+ }
+ for (i = 0; i < stacks.length; ++i) {
+ t = stacks[i];
+ frame[frameIndex++] = t;
+ if (t == Frame.LONG || t == Frame.DOUBLE) {
+ ++i;
+ }
+ }
+ endFrame();
+ }
+
+ /**
+ * Starts the visit of a stack map frame.
+ *
+ * @param offset the offset of the instruction to which the frame
+ * corresponds.
+ * @param nLocal the number of local variables in the frame.
+ * @param nStack the number of stack elements in the frame.
+ */
+ private void startFrame(final int offset, final int nLocal, final int nStack)
+ {
+ int n = 3 + nLocal + nStack;
+ if (frame == null || frame.length < n) {
+ frame = new int[n];
+ }
+ frame[0] = offset;
+ frame[1] = nLocal;
+ frame[2] = nStack;
+ frameIndex = 3;
+ }
+
+ /**
+ * Checks if the visit of the current frame {@link #frame} is finished, and
+ * if yes, write it in the StackMapTable attribute.
+ */
+ private void endFrame() {
+ if (previousFrame != null) { // do not write the first frame
+ if (stackMap == null) {
+ stackMap = new ByteVector();
+ }
+ writeFrame();
+ ++frameCount;
+ }
+ previousFrame = frame;
+ frame = null;
+ }
+
+ /**
+ * Compress and writes the current frame {@link #frame} in the StackMapTable
+ * attribute.
+ */
+ private void writeFrame() {
+ int clocalsSize = frame[1];
+ int cstackSize = frame[2];
+ if ((cw.version & 0xFFFF) < Opcodes.V1_6) {
+ stackMap.putShort(frame[0]).putShort(clocalsSize);
+ writeFrameTypes(3, 3 + clocalsSize);
+ stackMap.putShort(cstackSize);
+ writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+ return;
+ }
+ int localsSize = previousFrame[1];
+ int type = FULL_FRAME;
+ int k = 0;
+ int delta;
+ if (frameCount == 0) {
+ delta = frame[0];
+ } else {
+ delta = frame[0] - previousFrame[0] - 1;
+ }
+ if (cstackSize == 0) {
+ k = clocalsSize - localsSize;
+ switch (k) {
+ case -3:
+ case -2:
+ case -1:
+ type = CHOP_FRAME;
+ localsSize = clocalsSize;
+ break;
+ case 0:
+ type = delta < 64 ? SAME_FRAME : SAME_FRAME_EXTENDED;
+ break;
+ case 1:
+ case 2:
+ case 3:
+ type = APPEND_FRAME;
+ break;
+ }
+ } else if (clocalsSize == localsSize && cstackSize == 1) {
+ type = delta < 63
+ ? SAME_LOCALS_1_STACK_ITEM_FRAME
+ : SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED;
+ }
+ if (type != FULL_FRAME) {
+ // verify if locals are the same
+ int l = 3;
+ for (int j = 0; j < localsSize; j++) {
+ if (frame[l] != previousFrame[l]) {
+ type = FULL_FRAME;
+ break;
+ }
+ l++;
+ }
+ }
+ switch (type) {
+ case SAME_FRAME:
+ stackMap.putByte(delta);
+ break;
+ case SAME_LOCALS_1_STACK_ITEM_FRAME:
+ stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+ writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+ break;
+ case SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED:
+ stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+ .putShort(delta);
+ writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+ break;
+ case SAME_FRAME_EXTENDED:
+ stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+ break;
+ case CHOP_FRAME:
+ stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+ break;
+ case APPEND_FRAME:
+ stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+ writeFrameTypes(3 + localsSize, 3 + clocalsSize);
+ break;
+ // case FULL_FRAME:
+ default:
+ stackMap.putByte(FULL_FRAME)
+ .putShort(delta)
+ .putShort(clocalsSize);
+ writeFrameTypes(3, 3 + clocalsSize);
+ stackMap.putShort(cstackSize);
+ writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+ }
+ }
+
+ /**
+ * Writes some types of the current frame {@link #frame} into the
+ * StackMapTableAttribute. This method converts types from the format used
+ * in {@link Label} to the format used in StackMapTable attributes. In
+ * particular, it converts type table indexes to constant pool indexes.
+ *
+ * @param start index of the first type in {@link #frame} to write.
+ * @param end index of last type in {@link #frame} to write (exclusive).
+ */
+ private void writeFrameTypes(final int start, final int end) {
+ for (int i = start; i < end; ++i) {
+ int t = frame[i];
+ int d = t & Frame.DIM;
+ if (d == 0) {
+ int v = t & Frame.BASE_VALUE;
+ switch (t & Frame.BASE_KIND) {
+ case Frame.OBJECT:
+ stackMap.putByte(7)
+ .putShort(cw.newClass(cw.typeTable[v].strVal1));
+ break;
+ case Frame.UNINITIALIZED:
+ stackMap.putByte(8).putShort(cw.typeTable[v].intVal);
+ break;
+ default:
+ stackMap.putByte(v);
+ }
+ } else {
+ StringBuffer buf = new StringBuffer();
+ d >>= 28;
+ while (d-- > 0) {
+ buf.append('[');
+ }
+ if ((t & Frame.BASE_KIND) == Frame.OBJECT) {
+ buf.append('L');
+ buf.append(cw.typeTable[t & Frame.BASE_VALUE].strVal1);
+ buf.append(';');
+ } else {
+ switch (t & 0xF) {
+ case 1:
+ buf.append('I');
+ break;
+ case 2:
+ buf.append('F');
+ break;
+ case 3:
+ buf.append('D');
+ break;
+ case 9:
+ buf.append('Z');
+ break;
+ case 10:
+ buf.append('B');
+ break;
+ case 11:
+ buf.append('C');
+ break;
+ case 12:
+ buf.append('S');
+ break;
+ default:
+ buf.append('J');
+ }
+ }
+ stackMap.putByte(7).putShort(cw.newClass(buf.toString()));
+ }
+ }
+ }
+
+ private void writeFrameType(final Object type) {
+ if (type instanceof String) {
+ stackMap.putByte(7).putShort(cw.newClass((String) type));
+ } else if (type instanceof Integer) {
+ stackMap.putByte(((Integer) type).intValue());
+ } else {
+ stackMap.putByte(8).putShort(((Label) type).position);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: dump bytecode array
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the size of the bytecode of this method.
+ *
+ * @return the size of the bytecode of this method.
+ */
+ final int getSize() {
+ if (classReaderOffset != 0) {
+ return 6 + classReaderLength;
+ }
+ if (resize) {
+ // replaces the temporary jump opcodes introduced by Label.resolve.
+ if (ClassReader.RESIZE) {
+ resizeInstructions();
+ } else {
+ throw new RuntimeException("Method code too large!");
+ }
+ }
+ int size = 8;
+ if (code.length > 0) {
+ if (code.length > 65536) {
+ throw new RuntimeException("Method code too large!");
+ }
+ cw.newUTF8("Code");
+ size += 18 + code.length + 8 * handlerCount;
+ if (localVar != null) {
+ cw.newUTF8("LocalVariableTable");
+ size += 8 + localVar.length;
+ }
+ if (localVarType != null) {
+ cw.newUTF8("LocalVariableTypeTable");
+ size += 8 + localVarType.length;
+ }
+ if (lineNumber != null) {
+ cw.newUTF8("LineNumberTable");
+ size += 8 + lineNumber.length;
+ }
+ if (stackMap != null) {
+ boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+ cw.newUTF8(zip ? "StackMapTable" : "StackMap");
+ size += 8 + stackMap.length;
+ }
+ if (cattrs != null) {
+ size += cattrs.getSize(cw,
+ code.data,
+ code.length,
+ maxStack,
+ maxLocals);
+ }
+ }
+ if (exceptionCount > 0) {
+ cw.newUTF8("Exceptions");
+ size += 8 + 2 * exceptionCount;
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ cw.newUTF8("Synthetic");
+ size += 6;
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ cw.newUTF8("Deprecated");
+ size += 6;
+ }
+ if (ClassReader.SIGNATURES && signature != null) {
+ cw.newUTF8("Signature");
+ cw.newUTF8(signature);
+ size += 8;
+ }
+ if (ClassReader.ANNOTATIONS && annd != null) {
+ cw.newUTF8("AnnotationDefault");
+ size += 6 + annd.length;
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ cw.newUTF8("RuntimeVisibleAnnotations");
+ size += 8 + anns.getSize();
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ cw.newUTF8("RuntimeInvisibleAnnotations");
+ size += 8 + ianns.getSize();
+ }
+ if (ClassReader.ANNOTATIONS && panns != null) {
+ cw.newUTF8("RuntimeVisibleParameterAnnotations");
+ size += 7 + 2 * (panns.length - synthetics);
+ for (int i = panns.length - 1; i >= synthetics; --i) {
+ size += panns[i] == null ? 0 : panns[i].getSize();
+ }
+ }
+ if (ClassReader.ANNOTATIONS && ipanns != null) {
+ cw.newUTF8("RuntimeInvisibleParameterAnnotations");
+ size += 7 + 2 * (ipanns.length - synthetics);
+ for (int i = ipanns.length - 1; i >= synthetics; --i) {
+ size += ipanns[i] == null ? 0 : ipanns[i].getSize();
+ }
+ }
+ if (attrs != null) {
+ size += attrs.getSize(cw, null, 0, -1, -1);
+ }
+ return size;
+ }
+
+ /**
+ * Puts the bytecode of this method in the given byte vector.
+ *
+ * @param out the byte vector into which the bytecode of this method must be
+ * copied.
+ */
+ final void put(final ByteVector out) {
+ int mask = Opcodes.ACC_DEPRECATED
+ | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / (ClassWriter.ACC_SYNTHETIC_ATTRIBUTE / Opcodes.ACC_SYNTHETIC));
+ out.putShort(access & ~mask).putShort(name).putShort(desc);
+ if (classReaderOffset != 0) {
+ out.putByteArray(cw.cr.b, classReaderOffset, classReaderLength);
+ return;
+ }
+ int attributeCount = 0;
+ if (code.length > 0) {
+ ++attributeCount;
+ }
+ if (exceptionCount > 0) {
+ ++attributeCount;
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ ++attributeCount;
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ ++attributeCount;
+ }
+ if (ClassReader.SIGNATURES && signature != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && annd != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && panns != null) {
+ ++attributeCount;
+ }
+ if (ClassReader.ANNOTATIONS && ipanns != null) {
+ ++attributeCount;
+ }
+ if (attrs != null) {
+ attributeCount += attrs.getCount();
+ }
+ out.putShort(attributeCount);
+ if (code.length > 0) {
+ int size = 12 + code.length + 8 * handlerCount;
+ if (localVar != null) {
+ size += 8 + localVar.length;
+ }
+ if (localVarType != null) {
+ size += 8 + localVarType.length;
+ }
+ if (lineNumber != null) {
+ size += 8 + lineNumber.length;
+ }
+ if (stackMap != null) {
+ size += 8 + stackMap.length;
+ }
+ if (cattrs != null) {
+ size += cattrs.getSize(cw,
+ code.data,
+ code.length,
+ maxStack,
+ maxLocals);
+ }
+ out.putShort(cw.newUTF8("Code")).putInt(size);
+ out.putShort(maxStack).putShort(maxLocals);
+ out.putInt(code.length).putByteArray(code.data, 0, code.length);
+ out.putShort(handlerCount);
+ if (handlerCount > 0) {
+ Handler h = firstHandler;
+ while (h != null) {
+ out.putShort(h.start.position)
+ .putShort(h.end.position)
+ .putShort(h.handler.position)
+ .putShort(h.type);
+ h = h.next;
+ }
+ }
+ attributeCount = 0;
+ if (localVar != null) {
+ ++attributeCount;
+ }
+ if (localVarType != null) {
+ ++attributeCount;
+ }
+ if (lineNumber != null) {
+ ++attributeCount;
+ }
+ if (stackMap != null) {
+ ++attributeCount;
+ }
+ if (cattrs != null) {
+ attributeCount += cattrs.getCount();
+ }
+ out.putShort(attributeCount);
+ if (localVar != null) {
+ out.putShort(cw.newUTF8("LocalVariableTable"));
+ out.putInt(localVar.length + 2).putShort(localVarCount);
+ out.putByteArray(localVar.data, 0, localVar.length);
+ }
+ if (localVarType != null) {
+ out.putShort(cw.newUTF8("LocalVariableTypeTable"));
+ out.putInt(localVarType.length + 2).putShort(localVarTypeCount);
+ out.putByteArray(localVarType.data, 0, localVarType.length);
+ }
+ if (lineNumber != null) {
+ out.putShort(cw.newUTF8("LineNumberTable"));
+ out.putInt(lineNumber.length + 2).putShort(lineNumberCount);
+ out.putByteArray(lineNumber.data, 0, lineNumber.length);
+ }
+ if (stackMap != null) {
+ boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+ out.putShort(cw.newUTF8(zip ? "StackMapTable" : "StackMap"));
+ out.putInt(stackMap.length + 2).putShort(frameCount);
+ out.putByteArray(stackMap.data, 0, stackMap.length);
+ }
+ if (cattrs != null) {
+ cattrs.put(cw, code.data, code.length, maxLocals, maxStack, out);
+ }
+ }
+ if (exceptionCount > 0) {
+ out.putShort(cw.newUTF8("Exceptions"))
+ .putInt(2 * exceptionCount + 2);
+ out.putShort(exceptionCount);
+ for (int i = 0; i < exceptionCount; ++i) {
+ out.putShort(exceptions[i]);
+ }
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0
+ && ((cw.version & 0xFFFF) < Opcodes.V1_5 || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0))
+ {
+ out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+ }
+ if (ClassReader.SIGNATURES && signature != null) {
+ out.putShort(cw.newUTF8("Signature"))
+ .putInt(2)
+ .putShort(cw.newUTF8(signature));
+ }
+ if (ClassReader.ANNOTATIONS && annd != null) {
+ out.putShort(cw.newUTF8("AnnotationDefault"));
+ out.putInt(annd.length);
+ out.putByteArray(annd.data, 0, annd.length);
+ }
+ if (ClassReader.ANNOTATIONS && anns != null) {
+ out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+ anns.put(out);
+ }
+ if (ClassReader.ANNOTATIONS && ianns != null) {
+ out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+ ianns.put(out);
+ }
+ if (ClassReader.ANNOTATIONS && panns != null) {
+ out.putShort(cw.newUTF8("RuntimeVisibleParameterAnnotations"));
+ AnnotationWriter.put(panns, synthetics, out);
+ }
+ if (ClassReader.ANNOTATIONS && ipanns != null) {
+ out.putShort(cw.newUTF8("RuntimeInvisibleParameterAnnotations"));
+ AnnotationWriter.put(ipanns, synthetics, out);
+ }
+ if (attrs != null) {
+ attrs.put(cw, null, 0, -1, -1, out);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods: instruction resizing (used to handle GOTO_W and JSR_W)
+ // ------------------------------------------------------------------------
+
+ /**
+ * Resizes and replaces the temporary instructions inserted by
+ * {@link Label#resolve} for wide forward jumps, while keeping jump offsets
+ * and instruction addresses consistent. This may require to resize other
+ * existing instructions, or even to introduce new instructions: for
+ * example, increasing the size of an instruction by 2 at the middle of a
+ * method can increases the offset of an IFEQ instruction from 32766 to
+ * 32768, in which case IFEQ 32766 must be replaced with IFNEQ 8 GOTO_W
+ * 32765. This, in turn, may require to increase the size of another jump
+ * instruction, and so on... All these operations are handled automatically
+ * by this method. <p> <i>This method must be called after all the method
+ * that is being built has been visited</i>. In particular, the
+ * {@link Label Label} objects used to construct the method are no longer
+ * valid after this method has been called.
+ */
+ private void resizeInstructions() {
+ byte[] b = code.data; // bytecode of the method
+ int u, v, label; // indexes in b
+ int i, j; // loop indexes
+ /*
+ * 1st step: As explained above, resizing an instruction may require to
+ * resize another one, which may require to resize yet another one, and
+ * so on. The first step of the algorithm consists in finding all the
+ * instructions that need to be resized, without modifying the code.
+ * This is done by the following "fix point" algorithm:
+ *
+ * Parse the code to find the jump instructions whose offset will need
+ * more than 2 bytes to be stored (the future offset is computed from
+ * the current offset and from the number of bytes that will be inserted
+ * or removed between the source and target instructions). For each such
+ * instruction, adds an entry in (a copy of) the indexes and sizes
+ * arrays (if this has not already been done in a previous iteration!).
+ *
+ * If at least one entry has been added during the previous step, go
+ * back to the beginning, otherwise stop.
+ *
+ * In fact the real algorithm is complicated by the fact that the size
+ * of TABLESWITCH and LOOKUPSWITCH instructions depends on their
+ * position in the bytecode (because of padding). In order to ensure the
+ * convergence of the algorithm, the number of bytes to be added or
+ * removed from these instructions is over estimated during the previous
+ * loop, and computed exactly only after the loop is finished (this
+ * requires another pass to parse the bytecode of the method).
+ */
+ int[] allIndexes = new int[0]; // copy of indexes
+ int[] allSizes = new int[0]; // copy of sizes
+ boolean[] resize; // instructions to be resized
+ int newOffset; // future offset of a jump instruction
+
+ resize = new boolean[code.length];
+
+ // 3 = loop again, 2 = loop ended, 1 = last pass, 0 = done
+ int state = 3;
+ do {
+ if (state == 3) {
+ state = 2;
+ }
+ u = 0;
+ while (u < b.length) {
+ int opcode = b[u] & 0xFF; // opcode of current instruction
+ int insert = 0; // bytes to be added after this instruction
+
+ switch (ClassWriter.TYPE[opcode]) {
+ case ClassWriter.NOARG_INSN:
+ case ClassWriter.IMPLVAR_INSN:
+ u += 1;
+ break;
+ case ClassWriter.LABEL_INSN:
+ if (opcode > 201) {
+ // converts temporary opcodes 202 to 217, 218 and
+ // 219 to IFEQ ... JSR (inclusive), IFNULL and
+ // IFNONNULL
+ opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+ label = u + readUnsignedShort(b, u + 1);
+ } else {
+ label = u + readShort(b, u + 1);
+ }
+ newOffset = getNewOffset(allIndexes, allSizes, u, label);
+ if (newOffset < Short.MIN_VALUE
+ || newOffset > Short.MAX_VALUE)
+ {
+ if (!resize[u]) {
+ if (opcode == Opcodes.GOTO
+ || opcode == Opcodes.JSR)
+ {
+ // two additional bytes will be required to
+ // replace this GOTO or JSR instruction with
+ // a GOTO_W or a JSR_W
+ insert = 2;
+ } else {
+ // five additional bytes will be required to
+ // replace this IFxxx <l> instruction with
+ // IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx
+ // is the "opposite" opcode of IFxxx (i.e.,
+ // IFNE for IFEQ) and where <l'> designates
+ // the instruction just after the GOTO_W.
+ insert = 5;
+ }
+ resize[u] = true;
+ }
+ }
+ u += 3;
+ break;
+ case ClassWriter.LABELW_INSN:
+ u += 5;
+ break;
+ case ClassWriter.TABL_INSN:
+ if (state == 1) {
+ // true number of bytes to be added (or removed)
+ // from this instruction = (future number of padding
+ // bytes - current number of padding byte) -
+ // previously over estimated variation =
+ // = ((3 - newOffset%4) - (3 - u%4)) - u%4
+ // = (-newOffset%4 + u%4) - u%4
+ // = -(newOffset & 3)
+ newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+ insert = -(newOffset & 3);
+ } else if (!resize[u]) {
+ // over estimation of the number of bytes to be
+ // added to this instruction = 3 - current number
+ // of padding bytes = 3 - (3 - u%4) = u%4 = u & 3
+ insert = u & 3;
+ resize[u] = true;
+ }
+ // skips instruction
+ u = u + 4 - (u & 3);
+ u += 4 * (readInt(b, u + 8) - readInt(b, u + 4) + 1) + 12;
+ break;
+ case ClassWriter.LOOK_INSN:
+ if (state == 1) {
+ // like TABL_INSN
+ newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+ insert = -(newOffset & 3);
+ } else if (!resize[u]) {
+ // like TABL_INSN
+ insert = u & 3;
+ resize[u] = true;
+ }
+ // skips instruction
+ u = u + 4 - (u & 3);
+ u += 8 * readInt(b, u + 4) + 8;
+ break;
+ case ClassWriter.WIDE_INSN:
+ opcode = b[u + 1] & 0xFF;
+ if (opcode == Opcodes.IINC) {
+ u += 6;
+ } else {
+ u += 4;
+ }
+ break;
+ case ClassWriter.VAR_INSN:
+ case ClassWriter.SBYTE_INSN:
+ case ClassWriter.LDC_INSN:
+ u += 2;
+ break;
+ case ClassWriter.SHORT_INSN:
+ case ClassWriter.LDCW_INSN:
+ case ClassWriter.FIELDORMETH_INSN:
+ case ClassWriter.TYPE_INSN:
+ case ClassWriter.IINC_INSN:
+ u += 3;
+ break;
+ case ClassWriter.ITFMETH_INSN:
+ case ClassWriter.INDYMETH_INSN:
+ u += 5;
+ break;
+ // case ClassWriter.MANA_INSN:
+ default:
+ u += 4;
+ break;
+ }
+ if (insert != 0) {
+ // adds a new (u, insert) entry in the allIndexes and
+ // allSizes arrays
+ int[] newIndexes = new int[allIndexes.length + 1];
+ int[] newSizes = new int[allSizes.length + 1];
+ System.arraycopy(allIndexes,
+ 0,
+ newIndexes,
+ 0,
+ allIndexes.length);
+ System.arraycopy(allSizes, 0, newSizes, 0, allSizes.length);
+ newIndexes[allIndexes.length] = u;
+ newSizes[allSizes.length] = insert;
+ allIndexes = newIndexes;
+ allSizes = newSizes;
+ if (insert > 0) {
+ state = 3;
+ }
+ }
+ }
+ if (state < 3) {
+ --state;
+ }
+ } while (state != 0);
+
+ // 2nd step:
+ // copies the bytecode of the method into a new bytevector, updates the
+ // offsets, and inserts (or removes) bytes as requested.
+
+ ByteVector newCode = new ByteVector(code.length);
+
+ u = 0;
+ while (u < code.length) {
+ int opcode = b[u] & 0xFF;
+ switch (ClassWriter.TYPE[opcode]) {
+ case ClassWriter.NOARG_INSN:
+ case ClassWriter.IMPLVAR_INSN:
+ newCode.putByte(opcode);
+ u += 1;
+ break;
+ case ClassWriter.LABEL_INSN:
+ if (opcode > 201) {
+ // changes temporary opcodes 202 to 217 (inclusive), 218
+ // and 219 to IFEQ ... JSR (inclusive), IFNULL and
+ // IFNONNULL
+ opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+ label = u + readUnsignedShort(b, u + 1);
+ } else {
+ label = u + readShort(b, u + 1);
+ }
+ newOffset = getNewOffset(allIndexes, allSizes, u, label);
+ if (resize[u]) {
+ // replaces GOTO with GOTO_W, JSR with JSR_W and IFxxx
+ // <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is
+ // the "opposite" opcode of IFxxx (i.e., IFNE for IFEQ)
+ // and where <l'> designates the instruction just after
+ // the GOTO_W.
+ if (opcode == Opcodes.GOTO) {
+ newCode.putByte(200); // GOTO_W
+ } else if (opcode == Opcodes.JSR) {
+ newCode.putByte(201); // JSR_W
+ } else {
+ newCode.putByte(opcode <= 166
+ ? ((opcode + 1) ^ 1) - 1
+ : opcode ^ 1);
+ newCode.putShort(8); // jump offset
+ newCode.putByte(200); // GOTO_W
+ // newOffset now computed from start of GOTO_W
+ newOffset -= 3;
+ }
+ newCode.putInt(newOffset);
+ } else {
+ newCode.putByte(opcode);
+ newCode.putShort(newOffset);
+ }
+ u += 3;
+ break;
+ case ClassWriter.LABELW_INSN:
+ label = u + readInt(b, u + 1);
+ newOffset = getNewOffset(allIndexes, allSizes, u, label);
+ newCode.putByte(opcode);
+ newCode.putInt(newOffset);
+ u += 5;
+ break;
+ case ClassWriter.TABL_INSN:
+ // skips 0 to 3 padding bytes
+ v = u;
+ u = u + 4 - (v & 3);
+ // reads and copies instruction
+ newCode.putByte(Opcodes.TABLESWITCH);
+ newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4);
+ label = v + readInt(b, u);
+ u += 4;
+ newOffset = getNewOffset(allIndexes, allSizes, v, label);
+ newCode.putInt(newOffset);
+ j = readInt(b, u);
+ u += 4;
+ newCode.putInt(j);
+ j = readInt(b, u) - j + 1;
+ u += 4;
+ newCode.putInt(readInt(b, u - 4));
+ for (; j > 0; --j) {
+ label = v + readInt(b, u);
+ u += 4;
+ newOffset = getNewOffset(allIndexes, allSizes, v, label);
+ newCode.putInt(newOffset);
+ }
+ break;
+ case ClassWriter.LOOK_INSN:
+ // skips 0 to 3 padding bytes
+ v = u;
+ u = u + 4 - (v & 3);
+ // reads and copies instruction
+ newCode.putByte(Opcodes.LOOKUPSWITCH);
+ newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4);
+ label = v + readInt(b, u);
+ u += 4;
+ newOffset = getNewOffset(allIndexes, allSizes, v, label);
+ newCode.putInt(newOffset);
+ j = readInt(b, u);
+ u += 4;
+ newCode.putInt(j);
+ for (; j > 0; --j) {
+ newCode.putInt(readInt(b, u));
+ u += 4;
+ label = v + readInt(b, u);
+ u += 4;
+ newOffset = getNewOffset(allIndexes, allSizes, v, label);
+ newCode.putInt(newOffset);
+ }
+ break;
+ case ClassWriter.WIDE_INSN:
+ opcode = b[u + 1] & 0xFF;
+ if (opcode == Opcodes.IINC) {
+ newCode.putByteArray(b, u, 6);
+ u += 6;
+ } else {
+ newCode.putByteArray(b, u, 4);
+ u += 4;
+ }
+ break;
+ case ClassWriter.VAR_INSN:
+ case ClassWriter.SBYTE_INSN:
+ case ClassWriter.LDC_INSN:
+ newCode.putByteArray(b, u, 2);
+ u += 2;
+ break;
+ case ClassWriter.SHORT_INSN:
+ case ClassWriter.LDCW_INSN:
+ case ClassWriter.FIELDORMETH_INSN:
+ case ClassWriter.TYPE_INSN:
+ case ClassWriter.IINC_INSN:
+ newCode.putByteArray(b, u, 3);
+ u += 3;
+ break;
+ case ClassWriter.ITFMETH_INSN:
+ case ClassWriter.INDYMETH_INSN:
+ newCode.putByteArray(b, u, 5);
+ u += 5;
+ break;
+ // case MANA_INSN:
+ default:
+ newCode.putByteArray(b, u, 4);
+ u += 4;
+ break;
+ }
+ }
+
+ // recomputes the stack map frames
+ if (frameCount > 0) {
+ if (compute == FRAMES) {
+ frameCount = 0;
+ stackMap = null;
+ previousFrame = null;
+ frame = null;
+ Frame f = new Frame();
+ f.owner = labels;
+ Type[] args = Type.getArgumentTypes(descriptor);
+ f.initInputFrame(cw, access, args, maxLocals);
+ visitFrame(f);
+ Label l = labels;
+ while (l != null) {
+ /*
+ * here we need the original label position. getNewOffset
+ * must therefore never have been called for this label.
+ */
+ u = l.position - 3;
+ if ((l.status & Label.STORE) != 0 || (u >= 0 && resize[u]))
+ {
+ getNewOffset(allIndexes, allSizes, l);
+ // TODO update offsets in UNINITIALIZED values
+ visitFrame(l.frame);
+ }
+ l = l.successor;
+ }
+ } else {
+ /*
+ * Resizing an existing stack map frame table is really hard.
+ * Not only the table must be parsed to update the offets, but
+ * new frames may be needed for jump instructions that were
+ * inserted by this method. And updating the offsets or
+ * inserting frames can change the format of the following
+ * frames, in case of packed frames. In practice the whole table
+ * must be recomputed. For this the frames are marked as
+ * potentially invalid. This will cause the whole class to be
+ * reread and rewritten with the COMPUTE_FRAMES option (see the
+ * ClassWriter.toByteArray method). This is not very efficient
+ * but is much easier and requires much less code than any other
+ * method I can think of.
+ */
+ cw.invalidFrames = true;
+ }
+ }
+ // updates the exception handler block labels
+ Handler h = firstHandler;
+ while (h != null) {
+ getNewOffset(allIndexes, allSizes, h.start);
+ getNewOffset(allIndexes, allSizes, h.end);
+ getNewOffset(allIndexes, allSizes, h.handler);
+ h = h.next;
+ }
+ // updates the instructions addresses in the
+ // local var and line number tables
+ for (i = 0; i < 2; ++i) {
+ ByteVector bv = i == 0 ? localVar : localVarType;
+ if (bv != null) {
+ b = bv.data;
+ u = 0;
+ while (u < bv.length) {
+ label = readUnsignedShort(b, u);
+ newOffset = getNewOffset(allIndexes, allSizes, 0, label);
+ writeShort(b, u, newOffset);
+ label += readUnsignedShort(b, u + 2);
+ newOffset = getNewOffset(allIndexes, allSizes, 0, label)
+ - newOffset;
+ writeShort(b, u + 2, newOffset);
+ u += 10;
+ }
+ }
+ }
+ if (lineNumber != null) {
+ b = lineNumber.data;
+ u = 0;
+ while (u < lineNumber.length) {
+ writeShort(b, u, getNewOffset(allIndexes,
+ allSizes,
+ 0,
+ readUnsignedShort(b, u)));
+ u += 4;
+ }
+ }
+ // updates the labels of the other attributes
+ Attribute attr = cattrs;
+ while (attr != null) {
+ Label[] labels = attr.getLabels();
+ if (labels != null) {
+ for (i = labels.length - 1; i >= 0; --i) {
+ getNewOffset(allIndexes, allSizes, labels[i]);
+ }
+ }
+ attr = attr.next;
+ }
+
+ // replaces old bytecodes with new ones
+ code = newCode;
+ }
+
+ /**
+ * Reads an unsigned short value in the given byte array.
+ *
+ * @param b a byte array.
+ * @param index the start index of the value to be read.
+ * @return the read value.
+ */
+ static int readUnsignedShort(final byte[] b, final int index) {
+ return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+ }
+
+ /**
+ * Reads a signed short value in the given byte array.
+ *
+ * @param b a byte array.
+ * @param index the start index of the value to be read.
+ * @return the read value.
+ */
+ static short readShort(final byte[] b, final int index) {
+ return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+ }
+
+ /**
+ * Reads a signed int value in the given byte array.
+ *
+ * @param b a byte array.
+ * @param index the start index of the value to be read.
+ * @return the read value.
+ */
+ static int readInt(final byte[] b, final int index) {
+ return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+ | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+ }
+
+ /**
+ * Writes a short value in the given byte array.
+ *
+ * @param b a byte array.
+ * @param index where the first byte of the short value must be written.
+ * @param s the value to be written in the given byte array.
+ */
+ static void writeShort(final byte[] b, final int index, final int s) {
+ b[index] = (byte) (s >>> 8);
+ b[index + 1] = (byte) s;
+ }
+
+ /**
+ * Computes the future value of a bytecode offset. <p> Note: it is possible
+ * to have several entries for the same instruction in the <tt>indexes</tt>
+ * and <tt>sizes</tt>: two entries (index=a,size=b) and (index=a,size=b')
+ * are equivalent to a single entry (index=a,size=b+b').
+ *
+ * @param indexes current positions of the instructions to be resized. Each
+ * instruction must be designated by the index of its <i>last</i>
+ * byte, plus one (or, in other words, by the index of the <i>first</i>
+ * byte of the <i>next</i> instruction).
+ * @param sizes the number of bytes to be <i>added</i> to the above
+ * instructions. More precisely, for each i < <tt>len</tt>,
+ * <tt>sizes</tt>[i] bytes will be added at the end of the
+ * instruction designated by <tt>indexes</tt>[i] or, if
+ * <tt>sizes</tt>[i] is negative, the <i>last</i> |<tt>sizes[i]</tt>|
+ * bytes of the instruction will be removed (the instruction size
+ * <i>must not</i> become negative or null).
+ * @param begin index of the first byte of the source instruction.
+ * @param end index of the first byte of the target instruction.
+ * @return the future value of the given bytecode offset.
+ */
+ static int getNewOffset(
+ final int[] indexes,
+ final int[] sizes,
+ final int begin,
+ final int end)
+ {
+ int offset = end - begin;
+ for (int i = 0; i < indexes.length; ++i) {
+ if (begin < indexes[i] && indexes[i] <= end) {
+ // forward jump
+ offset += sizes[i];
+ } else if (end < indexes[i] && indexes[i] <= begin) {
+ // backward jump
+ offset -= sizes[i];
+ }
+ }
+ return offset;
+ }
+
+ /**
+ * Updates the offset of the given label.
+ *
+ * @param indexes current positions of the instructions to be resized. Each
+ * instruction must be designated by the index of its <i>last</i>
+ * byte, plus one (or, in other words, by the index of the <i>first</i>
+ * byte of the <i>next</i> instruction).
+ * @param sizes the number of bytes to be <i>added</i> to the above
+ * instructions. More precisely, for each i < <tt>len</tt>,
+ * <tt>sizes</tt>[i] bytes will be added at the end of the
+ * instruction designated by <tt>indexes</tt>[i] or, if
+ * <tt>sizes</tt>[i] is negative, the <i>last</i> |<tt>sizes[i]</tt>|
+ * bytes of the instruction will be removed (the instruction size
+ * <i>must not</i> become negative or null).
+ * @param label the label whose offset must be updated.
+ */
+ static void getNewOffset(
+ final int[] indexes,
+ final int[] sizes,
+ final Label label)
+ {
+ if ((label.status & Label.RESIZED) == 0) {
+ label.position = getNewOffset(indexes, sizes, 0, label.position);
+ label.status |= Label.RESIZED;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
new file mode 100644
index 0000000..df3dcbc
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
@@ -0,0 +1,387 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+/**
+ * Defines the JVM opcodes, access flags and array type codes. This interface
+ * does not define all the JVM opcodes because some opcodes are automatically
+ * handled. For example, the xLOAD and xSTORE opcodes are automatically replaced
+ * by xLOAD_n and xSTORE_n opcodes when possible. The xLOAD_n and xSTORE_n
+ * opcodes are therefore not defined in this interface. Likewise for LDC,
+ * automatically replaced by LDC_W or LDC2_W when necessary, WIDE, GOTO_W and
+ * JSR_W.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public interface Opcodes {
+
+ // ASM API versions
+
+ int ASM4 = 4 << 16 | 0 << 8 | 0;
+
+ // versions
+
+ int V1_1 = 3 << 16 | 45;
+ int V1_2 = 0 << 16 | 46;
+ int V1_3 = 0 << 16 | 47;
+ int V1_4 = 0 << 16 | 48;
+ int V1_5 = 0 << 16 | 49;
+ int V1_6 = 0 << 16 | 50;
+ int V1_7 = 0 << 16 | 51;
+
+ // access flags
+
+ int ACC_PUBLIC = 0x0001; // class, field, method
+ int ACC_PRIVATE = 0x0002; // class, field, method
+ int ACC_PROTECTED = 0x0004; // class, field, method
+ int ACC_STATIC = 0x0008; // field, method
+ int ACC_FINAL = 0x0010; // class, field, method
+ int ACC_SUPER = 0x0020; // class
+ int ACC_SYNCHRONIZED = 0x0020; // method
+ int ACC_VOLATILE = 0x0040; // field
+ int ACC_BRIDGE = 0x0040; // method
+ int ACC_VARARGS = 0x0080; // method
+ int ACC_TRANSIENT = 0x0080; // field
+ int ACC_NATIVE = 0x0100; // method
+ int ACC_INTERFACE = 0x0200; // class
+ int ACC_ABSTRACT = 0x0400; // class, method
+ int ACC_STRICT = 0x0800; // method
+ int ACC_SYNTHETIC = 0x1000; // class, field, method
+ int ACC_ANNOTATION = 0x2000; // class
+ int ACC_ENUM = 0x4000; // class(?) field inner
+
+ // ASM specific pseudo access flags
+
+ int ACC_DEPRECATED = 0x20000; // class, field, method
+
+ // types for NEWARRAY
+
+ int T_BOOLEAN = 4;
+ int T_CHAR = 5;
+ int T_FLOAT = 6;
+ int T_DOUBLE = 7;
+ int T_BYTE = 8;
+ int T_SHORT = 9;
+ int T_INT = 10;
+ int T_LONG = 11;
+
+ // tags for Handle
+
+ int H_GETFIELD = 1;
+ int H_GETSTATIC = 2;
+ int H_PUTFIELD = 3;
+ int H_PUTSTATIC = 4;
+ int H_INVOKEVIRTUAL = 5;
+ int H_INVOKESTATIC = 6;
+ int H_INVOKESPECIAL = 7;
+ int H_NEWINVOKESPECIAL = 8;
+ int H_INVOKEINTERFACE = 9;
+
+ // stack map frame types
+
+ /**
+ * Represents an expanded frame. See {@link ClassReader#EXPAND_FRAMES}.
+ */
+ int F_NEW = -1;
+
+ /**
+ * Represents a compressed frame with complete frame data.
+ */
+ int F_FULL = 0;
+
+ /**
+ * Represents a compressed frame where locals are the same as the locals in
+ * the previous frame, except that additional 1-3 locals are defined, and
+ * with an empty stack.
+ */
+ int F_APPEND = 1;
+
+ /**
+ * Represents a compressed frame where locals are the same as the locals in
+ * the previous frame, except that the last 1-3 locals are absent and with
+ * an empty stack.
+ */
+ int F_CHOP = 2;
+
+ /**
+ * Represents a compressed frame with exactly the same locals as the
+ * previous frame and with an empty stack.
+ */
+ int F_SAME = 3;
+
+ /**
+ * Represents a compressed frame with exactly the same locals as the
+ * previous frame and with a single value on the stack.
+ */
+ int F_SAME1 = 4;
+
+ Integer TOP = new Integer(0);
+ Integer INTEGER = new Integer(1);
+ Integer FLOAT = new Integer(2);
+ Integer DOUBLE = new Integer(3);
+ Integer LONG = new Integer(4);
+ Integer NULL = new Integer(5);
+ Integer UNINITIALIZED_THIS = new Integer(6);
+
+ // opcodes // visit method (- = idem)
+
+ int NOP = 0; // visitInsn
+ int ACONST_NULL = 1; // -
+ int ICONST_M1 = 2; // -
+ int ICONST_0 = 3; // -
+ int ICONST_1 = 4; // -
+ int ICONST_2 = 5; // -
+ int ICONST_3 = 6; // -
+ int ICONST_4 = 7; // -
+ int ICONST_5 = 8; // -
+ int LCONST_0 = 9; // -
+ int LCONST_1 = 10; // -
+ int FCONST_0 = 11; // -
+ int FCONST_1 = 12; // -
+ int FCONST_2 = 13; // -
+ int DCONST_0 = 14; // -
+ int DCONST_1 = 15; // -
+ int BIPUSH = 16; // visitIntInsn
+ int SIPUSH = 17; // -
+ int LDC = 18; // visitLdcInsn
+ // int LDC_W = 19; // -
+ // int LDC2_W = 20; // -
+ int ILOAD = 21; // visitVarInsn
+ int LLOAD = 22; // -
+ int FLOAD = 23; // -
+ int DLOAD = 24; // -
+ int ALOAD = 25; // -
+ // int ILOAD_0 = 26; // -
+ // int ILOAD_1 = 27; // -
+ // int ILOAD_2 = 28; // -
+ // int ILOAD_3 = 29; // -
+ // int LLOAD_0 = 30; // -
+ // int LLOAD_1 = 31; // -
+ // int LLOAD_2 = 32; // -
+ // int LLOAD_3 = 33; // -
+ // int FLOAD_0 = 34; // -
+ // int FLOAD_1 = 35; // -
+ // int FLOAD_2 = 36; // -
+ // int FLOAD_3 = 37; // -
+ // int DLOAD_0 = 38; // -
+ // int DLOAD_1 = 39; // -
+ // int DLOAD_2 = 40; // -
+ // int DLOAD_3 = 41; // -
+ // int ALOAD_0 = 42; // -
+ // int ALOAD_1 = 43; // -
+ // int ALOAD_2 = 44; // -
+ // int ALOAD_3 = 45; // -
+ int IALOAD = 46; // visitInsn
+ int LALOAD = 47; // -
+ int FALOAD = 48; // -
+ int DALOAD = 49; // -
+ int AALOAD = 50; // -
+ int BALOAD = 51; // -
+ int CALOAD = 52; // -
+ int SALOAD = 53; // -
+ int ISTORE = 54; // visitVarInsn
+ int LSTORE = 55; // -
+ int FSTORE = 56; // -
+ int DSTORE = 57; // -
+ int ASTORE = 58; // -
+ // int ISTORE_0 = 59; // -
+ // int ISTORE_1 = 60; // -
+ // int ISTORE_2 = 61; // -
+ // int ISTORE_3 = 62; // -
+ // int LSTORE_0 = 63; // -
+ // int LSTORE_1 = 64; // -
+ // int LSTORE_2 = 65; // -
+ // int LSTORE_3 = 66; // -
+ // int FSTORE_0 = 67; // -
+ // int FSTORE_1 = 68; // -
+ // int FSTORE_2 = 69; // -
+ // int FSTORE_3 = 70; // -
+ // int DSTORE_0 = 71; // -
+ // int DSTORE_1 = 72; // -
+ // int DSTORE_2 = 73; // -
+ // int DSTORE_3 = 74; // -
+ // int ASTORE_0 = 75; // -
+ // int ASTORE_1 = 76; // -
+ // int ASTORE_2 = 77; // -
+ // int ASTORE_3 = 78; // -
+ int IASTORE = 79; // visitInsn
+ int LASTORE = 80; // -
+ int FASTORE = 81; // -
+ int DASTORE = 82; // -
+ int AASTORE = 83; // -
+ int BASTORE = 84; // -
+ int CASTORE = 85; // -
+ int SASTORE = 86; // -
+ int POP = 87; // -
+ int POP2 = 88; // -
+ int DUP = 89; // -
+ int DUP_X1 = 90; // -
+ int DUP_X2 = 91; // -
+ int DUP2 = 92; // -
+ int DUP2_X1 = 93; // -
+ int DUP2_X2 = 94; // -
+ int SWAP = 95; // -
+ int IADD = 96; // -
+ int LADD = 97; // -
+ int FADD = 98; // -
+ int DADD = 99; // -
+ int ISUB = 100; // -
+ int LSUB = 101; // -
+ int FSUB = 102; // -
+ int DSUB = 103; // -
+ int IMUL = 104; // -
+ int LMUL = 105; // -
+ int FMUL = 106; // -
+ int DMUL = 107; // -
+ int IDIV = 108; // -
+ int LDIV = 109; // -
+ int FDIV = 110; // -
+ int DDIV = 111; // -
+ int IREM = 112; // -
+ int LREM = 113; // -
+ int FREM = 114; // -
+ int DREM = 115; // -
+ int INEG = 116; // -
+ int LNEG = 117; // -
+ int FNEG = 118; // -
+ int DNEG = 119; // -
+ int ISHL = 120; // -
+ int LSHL = 121; // -
+ int ISHR = 122; // -
+ int LSHR = 123; // -
+ int IUSHR = 124; // -
+ int LUSHR = 125; // -
+ int IAND = 126; // -
+ int LAND = 127; // -
+ int IOR = 128; // -
+ int LOR = 129; // -
+ int IXOR = 130; // -
+ int LXOR = 131; // -
+ int IINC = 132; // visitIincInsn
+ int I2L = 133; // visitInsn
+ int I2F = 134; // -
+ int I2D = 135; // -
+ int L2I = 136; // -
+ int L2F = 137; // -
+ int L2D = 138; // -
+ int F2I = 139; // -
+ int F2L = 140; // -
+ int F2D = 141; // -
+ int D2I = 142; // -
+ int D2L = 143; // -
+ int D2F = 144; // -
+ int I2B = 145; // -
+ int I2C = 146; // -
+ int I2S = 147; // -
+ int LCMP = 148; // -
+ int FCMPL = 149; // -
+ int FCMPG = 150; // -
+ int DCMPL = 151; // -
+ int DCMPG = 152; // -
+ int IFEQ = 153; // visitJumpInsn
+ int IFNE = 154; // -
+ int IFLT = 155; // -
+ int IFGE = 156; // -
+ int IFGT = 157; // -
+ int IFLE = 158; // -
+ int IF_ICMPEQ = 159; // -
+ int IF_ICMPNE = 160; // -
+ int IF_ICMPLT = 161; // -
+ int IF_ICMPGE = 162; // -
+ int IF_ICMPGT = 163; // -
+ int IF_ICMPLE = 164; // -
+ int IF_ACMPEQ = 165; // -
+ int IF_ACMPNE = 166; // -
+ int GOTO = 167; // -
+ int JSR = 168; // -
+ int RET = 169; // visitVarInsn
+ int TABLESWITCH = 170; // visiTableSwitchInsn
+ int LOOKUPSWITCH = 171; // visitLookupSwitch
+ int IRETURN = 172; // visitInsn
+ int LRETURN = 173; // -
+ int FRETURN = 174; // -
+ int DRETURN = 175; // -
+ int ARETURN = 176; // -
+ int RETURN = 177; // -
+ int GETSTATIC = 178; // visitFieldInsn
+ int PUTSTATIC = 179; // -
+ int GETFIELD = 180; // -
+ int PUTFIELD = 181; // -
+ int INVOKEVIRTUAL = 182; // visitMethodInsn
+ int INVOKESPECIAL = 183; // -
+ int INVOKESTATIC = 184; // -
+ int INVOKEINTERFACE = 185; // -
+ int INVOKEDYNAMIC = 186; // visitInvokeDynamicInsn
+ int NEW = 187; // visitTypeInsn
+ int NEWARRAY = 188; // visitIntInsn
+ int ANEWARRAY = 189; // visitTypeInsn
+ int ARRAYLENGTH = 190; // visitInsn
+ int ATHROW = 191; // -
+ int CHECKCAST = 192; // visitTypeInsn
+ int INSTANCEOF = 193; // -
+ int MONITORENTER = 194; // visitInsn
+ int MONITOREXIT = 195; // -
+ // int WIDE = 196; // NOT VISITED
+ int MULTIANEWARRAY = 197; // visitMultiANewArrayInsn
+ int IFNULL = 198; // visitJumpInsn
+ int IFNONNULL = 199; // -
+ // int GOTO_W = 200; // -
+ // int JSR_W = 201; // -
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java
new file mode 100644
index 0000000..b7c7a7c
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java
@@ -0,0 +1,894 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+/**
+ * A Java field or method type. This class can be used to make it easier to
+ * manipulate type and method descriptors.
+ *
+ * @author Eric Bruneton
+ * @author Chris Nokleberg
+ */
+public class Type {
+
+ /**
+ * The sort of the <tt>void</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int VOID = 0;
+
+ /**
+ * The sort of the <tt>boolean</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int BOOLEAN = 1;
+
+ /**
+ * The sort of the <tt>char</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int CHAR = 2;
+
+ /**
+ * The sort of the <tt>byte</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int BYTE = 3;
+
+ /**
+ * The sort of the <tt>short</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int SHORT = 4;
+
+ /**
+ * The sort of the <tt>int</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int INT = 5;
+
+ /**
+ * The sort of the <tt>float</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int FLOAT = 6;
+
+ /**
+ * The sort of the <tt>long</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int LONG = 7;
+
+ /**
+ * The sort of the <tt>double</tt> type. See {@link #getSort getSort}.
+ */
+ public static final int DOUBLE = 8;
+
+ /**
+ * The sort of array reference types. See {@link #getSort getSort}.
+ */
+ public static final int ARRAY = 9;
+
+ /**
+ * The sort of object reference types. See {@link #getSort getSort}.
+ */
+ public static final int OBJECT = 10;
+
+ /**
+ * The sort of method types. See {@link #getSort getSort}.
+ */
+ public static final int METHOD = 11;
+
+ /**
+ * The <tt>void</tt> type.
+ */
+ public static final Type VOID_TYPE = new Type(VOID, null, ('V' << 24)
+ | (5 << 16) | (0 << 8) | 0, 1);
+
+ /**
+ * The <tt>boolean</tt> type.
+ */
+ public static final Type BOOLEAN_TYPE = new Type(BOOLEAN, null, ('Z' << 24)
+ | (0 << 16) | (5 << 8) | 1, 1);
+
+ /**
+ * The <tt>char</tt> type.
+ */
+ public static final Type CHAR_TYPE = new Type(CHAR, null, ('C' << 24)
+ | (0 << 16) | (6 << 8) | 1, 1);
+
+ /**
+ * The <tt>byte</tt> type.
+ */
+ public static final Type BYTE_TYPE = new Type(BYTE, null, ('B' << 24)
+ | (0 << 16) | (5 << 8) | 1, 1);
+
+ /**
+ * The <tt>short</tt> type.
+ */
+ public static final Type SHORT_TYPE = new Type(SHORT, null, ('S' << 24)
+ | (0 << 16) | (7 << 8) | 1, 1);
+
+ /**
+ * The <tt>int</tt> type.
+ */
+ public static final Type INT_TYPE = new Type(INT, null, ('I' << 24)
+ | (0 << 16) | (0 << 8) | 1, 1);
+
+ /**
+ * The <tt>float</tt> type.
+ */
+ public static final Type FLOAT_TYPE = new Type(FLOAT, null, ('F' << 24)
+ | (2 << 16) | (2 << 8) | 1, 1);
+
+ /**
+ * The <tt>long</tt> type.
+ */
+ public static final Type LONG_TYPE = new Type(LONG, null, ('J' << 24)
+ | (1 << 16) | (1 << 8) | 2, 1);
+
+ /**
+ * The <tt>double</tt> type.
+ */
+ public static final Type DOUBLE_TYPE = new Type(DOUBLE, null, ('D' << 24)
+ | (3 << 16) | (3 << 8) | 2, 1);
+
+ // ------------------------------------------------------------------------
+ // Fields
+ // ------------------------------------------------------------------------
+
+ /**
+ * The sort of this Java type.
+ */
+ private final int sort;
+
+ /**
+ * A buffer containing the internal name of this Java type. This field is
+ * only used for reference types.
+ */
+ private final char[] buf;
+
+ /**
+ * The offset of the internal name of this Java type in {@link #buf buf} or,
+ * for primitive types, the size, descriptor and getOpcode offsets for this
+ * type (byte 0 contains the size, byte 1 the descriptor, byte 2 the offset
+ * for IALOAD or IASTORE, byte 3 the offset for all other instructions).
+ */
+ private final int off;
+
+ /**
+ * The length of the internal name of this Java type.
+ */
+ private final int len;
+
+ // ------------------------------------------------------------------------
+ // Constructors
+ // ------------------------------------------------------------------------
+
+ /**
+ * Constructs a reference type.
+ *
+ * @param sort the sort of the reference type to be constructed.
+ * @param buf a buffer containing the descriptor of the previous type.
+ * @param off the offset of this descriptor in the previous buffer.
+ * @param len the length of this descriptor.
+ */
+ private Type(final int sort, final char[] buf, final int off, final int len)
+ {
+ this.sort = sort;
+ this.buf = buf;
+ this.off = off;
+ this.len = len;
+ }
+
+ /**
+ * Returns the Java type corresponding to the given type descriptor.
+ *
+ * @param typeDescriptor a field or method type descriptor.
+ * @return the Java type corresponding to the given type descriptor.
+ */
+ public static Type getType(final String typeDescriptor) {
+ return getType(typeDescriptor.toCharArray(), 0);
+ }
+
+ /**
+ * Returns the Java type corresponding to the given internal name.
+ *
+ * @param internalName an internal name.
+ * @return the Java type corresponding to the given internal name.
+ */
+ public static Type getObjectType(final String internalName) {
+ char[] buf = internalName.toCharArray();
+ return new Type(buf[0] == '[' ? ARRAY : OBJECT, buf, 0, buf.length);
+ }
+
+ /**
+ * Returns the Java type corresponding to the given method descriptor.
+ * Equivalent to <code>Type.getType(methodDescriptor)</code>.
+ *
+ * @param methodDescriptor a method descriptor.
+ * @return the Java type corresponding to the given method descriptor.
+ */
+ public static Type getMethodType(final String methodDescriptor) {
+ return getType(methodDescriptor.toCharArray(), 0);
+ }
+
+ /**
+ * Returns the Java method type corresponding to the given argument and
+ * return types.
+ *
+ * @param returnType the return type of the method.
+ * @param argumentTypes the argument types of the method.
+ * @return the Java type corresponding to the given argument and return types.
+ */
+ public static Type getMethodType(final Type returnType, final Type... argumentTypes) {
+ return getType(getMethodDescriptor(returnType, argumentTypes));
+ }
+
+ /**
+ * Returns the Java type corresponding to the given class.
+ *
+ * @param c a class.
+ * @return the Java type corresponding to the given class.
+ */
+ public static Type getType(final Class<?> c) {
+ if (c.isPrimitive()) {
+ if (c == Integer.TYPE) {
+ return INT_TYPE;
+ } else if (c == Void.TYPE) {
+ return VOID_TYPE;
+ } else if (c == Boolean.TYPE) {
+ return BOOLEAN_TYPE;
+ } else if (c == Byte.TYPE) {
+ return BYTE_TYPE;
+ } else if (c == Character.TYPE) {
+ return CHAR_TYPE;
+ } else if (c == Short.TYPE) {
+ return SHORT_TYPE;
+ } else if (c == Double.TYPE) {
+ return DOUBLE_TYPE;
+ } else if (c == Float.TYPE) {
+ return FLOAT_TYPE;
+ } else /* if (c == Long.TYPE) */{
+ return LONG_TYPE;
+ }
+ } else {
+ return getType(getDescriptor(c));
+ }
+ }
+
+ /**
+ * Returns the Java method type corresponding to the given constructor.
+ *
+ * @param c a {@link Constructor Constructor} object.
+ * @return the Java method type corresponding to the given constructor.
+ */
+ public static Type getType(final Constructor<?> c) {
+ return getType(getConstructorDescriptor(c));
+ }
+
+ /**
+ * Returns the Java method type corresponding to the given method.
+ *
+ * @param m a {@link Method Method} object.
+ * @return the Java method type corresponding to the given method.
+ */
+ public static Type getType(final Method m) {
+ return getType(getMethodDescriptor(m));
+ }
+
+ /**
+ * Returns the Java types corresponding to the argument types of the given
+ * method descriptor.
+ *
+ * @param methodDescriptor a method descriptor.
+ * @return the Java types corresponding to the argument types of the given
+ * method descriptor.
+ */
+ public static Type[] getArgumentTypes(final String methodDescriptor) {
+ char[] buf = methodDescriptor.toCharArray();
+ int off = 1;
+ int size = 0;
+ while (true) {
+ char car = buf[off++];
+ if (car == ')') {
+ break;
+ } else if (car == 'L') {
+ while (buf[off++] != ';') {
+ }
+ ++size;
+ } else if (car != '[') {
+ ++size;
+ }
+ }
+ Type[] args = new Type[size];
+ off = 1;
+ size = 0;
+ while (buf[off] != ')') {
+ args[size] = getType(buf, off);
+ off += args[size].len + (args[size].sort == OBJECT ? 2 : 0);
+ size += 1;
+ }
+ return args;
+ }
+
+ /**
+ * Returns the Java types corresponding to the argument types of the given
+ * method.
+ *
+ * @param method a method.
+ * @return the Java types corresponding to the argument types of the given
+ * method.
+ */
+ public static Type[] getArgumentTypes(final Method method) {
+ Class<?>[] classes = method.getParameterTypes();
+ Type[] types = new Type[classes.length];
+ for (int i = classes.length - 1; i >= 0; --i) {
+ types[i] = getType(classes[i]);
+ }
+ return types;
+ }
+
+ /**
+ * Returns the Java type corresponding to the return type of the given
+ * method descriptor.
+ *
+ * @param methodDescriptor a method descriptor.
+ * @return the Java type corresponding to the return type of the given
+ * method descriptor.
+ */
+ public static Type getReturnType(final String methodDescriptor) {
+ char[] buf = methodDescriptor.toCharArray();
+ return getType(buf, methodDescriptor.indexOf(')') + 1);
+ }
+
+ /**
+ * Returns the Java type corresponding to the return type of the given
+ * method.
+ *
+ * @param method a method.
+ * @return the Java type corresponding to the return type of the given
+ * method.
+ */
+ public static Type getReturnType(final Method method) {
+ return getType(method.getReturnType());
+ }
+
+ /**
+ * Computes the size of the arguments and of the return value of a method.
+ *
+ * @param desc the descriptor of a method.
+ * @return the size of the arguments of the method (plus one for the
+ * implicit this argument), argSize, and the size of its return
+ * value, retSize, packed into a single int i =
+ * <tt>(argSize << 2) | retSize</tt> (argSize is therefore equal
+ * to <tt>i >> 2</tt>, and retSize to <tt>i & 0x03</tt>).
+ */
+ public static int getArgumentsAndReturnSizes(final String desc) {
+ int n = 1;
+ int c = 1;
+ while (true) {
+ char car = desc.charAt(c++);
+ if (car == ')') {
+ car = desc.charAt(c);
+ return n << 2
+ | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1));
+ } else if (car == 'L') {
+ while (desc.charAt(c++) != ';') {
+ }
+ n += 1;
+ } else if (car == '[') {
+ while ((car = desc.charAt(c)) == '[') {
+ ++c;
+ }
+ if (car == 'D' || car == 'J') {
+ n -= 1;
+ }
+ } else if (car == 'D' || car == 'J') {
+ n += 2;
+ } else {
+ n += 1;
+ }
+ }
+ }
+
+ /**
+ * Returns the Java type corresponding to the given type descriptor. For
+ * method descriptors, buf is supposed to contain nothing more than the
+ * descriptor itself.
+ *
+ * @param buf a buffer containing a type descriptor.
+ * @param off the offset of this descriptor in the previous buffer.
+ * @return the Java type corresponding to the given type descriptor.
+ */
+ private static Type getType(final char[] buf, final int off) {
+ int len;
+ switch (buf[off]) {
+ case 'V':
+ return VOID_TYPE;
+ case 'Z':
+ return BOOLEAN_TYPE;
+ case 'C':
+ return CHAR_TYPE;
+ case 'B':
+ return BYTE_TYPE;
+ case 'S':
+ return SHORT_TYPE;
+ case 'I':
+ return INT_TYPE;
+ case 'F':
+ return FLOAT_TYPE;
+ case 'J':
+ return LONG_TYPE;
+ case 'D':
+ return DOUBLE_TYPE;
+ case '[':
+ len = 1;
+ while (buf[off + len] == '[') {
+ ++len;
+ }
+ if (buf[off + len] == 'L') {
+ ++len;
+ while (buf[off + len] != ';') {
+ ++len;
+ }
+ }
+ return new Type(ARRAY, buf, off, len + 1);
+ case 'L':
+ len = 1;
+ while (buf[off + len] != ';') {
+ ++len;
+ }
+ return new Type(OBJECT, buf, off + 1, len - 1);
+ // case '(':
+ default:
+ return new Type(METHOD, buf, 0, buf.length);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Accessors
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the sort of this Java type.
+ *
+ * @return {@link #VOID VOID}, {@link #BOOLEAN BOOLEAN},
+ * {@link #CHAR CHAR}, {@link #BYTE BYTE}, {@link #SHORT SHORT},
+ * {@link #INT INT}, {@link #FLOAT FLOAT}, {@link #LONG LONG},
+ * {@link #DOUBLE DOUBLE}, {@link #ARRAY ARRAY},
+ * {@link #OBJECT OBJECT} or {@link #METHOD METHOD}.
+ */
+ public int getSort() {
+ return sort;
+ }
+
+ /**
+ * Returns the number of dimensions of this array type. This method should
+ * only be used for an array type.
+ *
+ * @return the number of dimensions of this array type.
+ */
+ public int getDimensions() {
+ int i = 1;
+ while (buf[off + i] == '[') {
+ ++i;
+ }
+ return i;
+ }
+
+ /**
+ * Returns the type of the elements of this array type. This method should
+ * only be used for an array type.
+ *
+ * @return Returns the type of the elements of this array type.
+ */
+ public Type getElementType() {
+ return getType(buf, off + getDimensions());
+ }
+
+ /**
+ * Returns the binary name of the class corresponding to this type. This
+ * method must not be used on method types.
+ *
+ * @return the binary name of the class corresponding to this type.
+ */
+ public String getClassName() {
+ switch (sort) {
+ case VOID:
+ return "void";
+ case BOOLEAN:
+ return "boolean";
+ case CHAR:
+ return "char";
+ case BYTE:
+ return "byte";
+ case SHORT:
+ return "short";
+ case INT:
+ return "int";
+ case FLOAT:
+ return "float";
+ case LONG:
+ return "long";
+ case DOUBLE:
+ return "double";
+ case ARRAY:
+ StringBuffer b = new StringBuffer(getElementType().getClassName());
+ for (int i = getDimensions(); i > 0; --i) {
+ b.append("[]");
+ }
+ return b.toString();
+ case OBJECT:
+ return new String(buf, off, len).replace('/', '.');
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Returns the internal name of the class corresponding to this object or
+ * array type. The internal name of a class is its fully qualified name (as
+ * returned by Class.getName(), where '.' are replaced by '/'. This method
+ * should only be used for an object or array type.
+ *
+ * @return the internal name of the class corresponding to this object type.
+ */
+ public String getInternalName() {
+ return new String(buf, off, len);
+ }
+
+ /**
+ * Returns the argument types of methods of this type. This method should
+ * only be used for method types.
+ *
+ * @return the argument types of methods of this type.
+ */
+ public Type[] getArgumentTypes() {
+ return getArgumentTypes(getDescriptor());
+ }
+
+ /**
+ * Returns the return type of methods of this type. This method should only
+ * be used for method types.
+ *
+ * @return the return type of methods of this type.
+ */
+ public Type getReturnType() {
+ return getReturnType(getDescriptor());
+ }
+
+ /**
+ * Returns the size of the arguments and of the return value of methods of
+ * this type. This method should only be used for method types.
+ *
+ * @return the size of the arguments (plus one for the implicit this
+ * argument), argSize, and the size of the return value, retSize,
+ * packed into a single int i = <tt>(argSize << 2) | retSize</tt>
+ * (argSize is therefore equal to <tt>i >> 2</tt>, and retSize to
+ * <tt>i & 0x03</tt>).
+ */
+ public int getArgumentsAndReturnSizes() {
+ return getArgumentsAndReturnSizes(getDescriptor());
+ }
+
+ // ------------------------------------------------------------------------
+ // Conversion to type descriptors
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the descriptor corresponding to this Java type.
+ *
+ * @return the descriptor corresponding to this Java type.
+ */
+ public String getDescriptor() {
+ StringBuffer buf = new StringBuffer();
+ getDescriptor(buf);
+ return buf.toString();
+ }
+
+ /**
+ * Returns the descriptor corresponding to the given argument and return
+ * types.
+ *
+ * @param returnType the return type of the method.
+ * @param argumentTypes the argument types of the method.
+ * @return the descriptor corresponding to the given argument and return
+ * types.
+ */
+ public static String getMethodDescriptor(
+ final Type returnType,
+ final Type... argumentTypes)
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append('(');
+ for (int i = 0; i < argumentTypes.length; ++i) {
+ argumentTypes[i].getDescriptor(buf);
+ }
+ buf.append(')');
+ returnType.getDescriptor(buf);
+ return buf.toString();
+ }
+
+ /**
+ * Appends the descriptor corresponding to this Java type to the given
+ * string buffer.
+ *
+ * @param buf the string buffer to which the descriptor must be appended.
+ */
+ private void getDescriptor(final StringBuffer buf) {
+ if (this.buf == null) {
+ // descriptor is in byte 3 of 'off' for primitive types (buf == null)
+ buf.append((char) ((off & 0xFF000000) >>> 24));
+ } else if (sort == OBJECT) {
+ buf.append('L');
+ buf.append(this.buf, off, len);
+ buf.append(';');
+ } else { // sort == ARRAY || sort == METHOD
+ buf.append(this.buf, off, len);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Direct conversion from classes to type descriptors,
+ // without intermediate Type objects
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the internal name of the given class. The internal name of a
+ * class is its fully qualified name, as returned by Class.getName(), where
+ * '.' are replaced by '/'.
+ *
+ * @param c an object or array class.
+ * @return the internal name of the given class.
+ */
+ public static String getInternalName(final Class<?> c) {
+ return c.getName().replace('.', '/');
+ }
+
+ /**
+ * Returns the descriptor corresponding to the given Java type.
+ *
+ * @param c an object class, a primitive class or an array class.
+ * @return the descriptor corresponding to the given class.
+ */
+ public static String getDescriptor(final Class<?> c) {
+ StringBuffer buf = new StringBuffer();
+ getDescriptor(buf, c);
+ return buf.toString();
+ }
+
+ /**
+ * Returns the descriptor corresponding to the given constructor.
+ *
+ * @param c a {@link Constructor Constructor} object.
+ * @return the descriptor of the given constructor.
+ */
+ public static String getConstructorDescriptor(final Constructor<?> c) {
+ Class<?>[] parameters = c.getParameterTypes();
+ StringBuffer buf = new StringBuffer();
+ buf.append('(');
+ for (int i = 0; i < parameters.length; ++i) {
+ getDescriptor(buf, parameters[i]);
+ }
+ return buf.append(")V").toString();
+ }
+
+ /**
+ * Returns the descriptor corresponding to the given method.
+ *
+ * @param m a {@link Method Method} object.
+ * @return the descriptor of the given method.
+ */
+ public static String getMethodDescriptor(final Method m) {
+ Class<?>[] parameters = m.getParameterTypes();
+ StringBuffer buf = new StringBuffer();
+ buf.append('(');
+ for (int i = 0; i < parameters.length; ++i) {
+ getDescriptor(buf, parameters[i]);
+ }
+ buf.append(')');
+ getDescriptor(buf, m.getReturnType());
+ return buf.toString();
+ }
+
+ /**
+ * Appends the descriptor of the given class to the given string buffer.
+ *
+ * @param buf the string buffer to which the descriptor must be appended.
+ * @param c the class whose descriptor must be computed.
+ */
+ private static void getDescriptor(final StringBuffer buf, final Class<?> c) {
+ Class<?> d = c;
+ while (true) {
+ if (d.isPrimitive()) {
+ char car;
+ if (d == Integer.TYPE) {
+ car = 'I';
+ } else if (d == Void.TYPE) {
+ car = 'V';
+ } else if (d == Boolean.TYPE) {
+ car = 'Z';
+ } else if (d == Byte.TYPE) {
+ car = 'B';
+ } else if (d == Character.TYPE) {
+ car = 'C';
+ } else if (d == Short.TYPE) {
+ car = 'S';
+ } else if (d == Double.TYPE) {
+ car = 'D';
+ } else if (d == Float.TYPE) {
+ car = 'F';
+ } else /* if (d == Long.TYPE) */{
+ car = 'J';
+ }
+ buf.append(car);
+ return;
+ } else if (d.isArray()) {
+ buf.append('[');
+ d = d.getComponentType();
+ } else {
+ buf.append('L');
+ String name = d.getName();
+ int len = name.length();
+ for (int i = 0; i < len; ++i) {
+ char car = name.charAt(i);
+ buf.append(car == '.' ? '/' : car);
+ }
+ buf.append(';');
+ return;
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Corresponding size and opcodes
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the size of values of this type. This method must not be used for
+ * method types.
+ *
+ * @return the size of values of this type, i.e., 2 for <tt>long</tt> and
+ * <tt>double</tt>, 0 for <tt>void</tt> and 1 otherwise.
+ */
+ public int getSize() {
+ // the size is in byte 0 of 'off' for primitive types (buf == null)
+ return buf == null ? (off & 0xFF) : 1;
+ }
+
+ /**
+ * Returns a JVM instruction opcode adapted to this Java type. This method
+ * must not be used for method types.
+ *
+ * @param opcode a JVM instruction opcode. This opcode must be one of ILOAD,
+ * ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG, ISHL,
+ * ISHR, IUSHR, IAND, IOR, IXOR and IRETURN.
+ * @return an opcode that is similar to the given opcode, but adapted to
+ * this Java type. For example, if this type is <tt>float</tt> and
+ * <tt>opcode</tt> is IRETURN, this method returns FRETURN.
+ */
+ public int getOpcode(final int opcode) {
+ if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) {
+ // the offset for IALOAD or IASTORE is in byte 1 of 'off' for
+ // primitive types (buf == null)
+ return opcode + (buf == null ? (off & 0xFF00) >> 8 : 4);
+ } else {
+ // the offset for other instructions is in byte 2 of 'off' for
+ // primitive types (buf == null)
+ return opcode + (buf == null ? (off & 0xFF0000) >> 16 : 4);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Equals, hashCode and toString
+ // ------------------------------------------------------------------------
+
+ /**
+ * Tests if the given object is equal to this type.
+ *
+ * @param o the object to be compared to this type.
+ * @return <tt>true</tt> if the given object is equal to this type.
+ */
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof Type)) {
+ return false;
+ }
+ Type t = (Type) o;
+ if (sort != t.sort) {
+ return false;
+ }
+ if (sort >= ARRAY) {
+ if (len != t.len) {
+ return false;
+ }
+ for (int i = off, j = t.off, end = i + len; i < end; i++, j++) {
+ if (buf[i] != t.buf[j]) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns a hash code value for this type.
+ *
+ * @return a hash code value for this type.
+ */
+ @Override
+ public int hashCode() {
+ int hc = 13 * sort;
+ if (sort >= ARRAY) {
+ for (int i = off, end = i + len; i < end; i++) {
+ hc = 17 * (hc + buf[i]);
+ }
+ }
+ return hc;
+ }
+
+ /**
+ * Returns a string representation of this type.
+ *
+ * @return the descriptor of this type.
+ */
+ @Override
+ public String toString() {
+ return getDescriptor();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
new file mode 100644
index 0000000..dd6f260
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
@@ -0,0 +1,694 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link jdk.internal.org.objectweb.asm.MethodVisitor} to insert before, after and around
+ * advices in methods and constructors. <p> The behavior for constructors is
+ * like this: <ol>
+ *
+ * <li>as long as the INVOKESPECIAL for the object initialization has not been
+ * reached, every bytecode instruction is dispatched in the ctor code visitor</li>
+ *
+ * <li>when this one is reached, it is only added in the ctor code visitor and
+ * a JP invoke is added</li>
+ *
+ * <li>after that, only the other code visitor receives the instructions</li>
+ *
+ * </ol>
+ *
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
+{
+
+ private static final Object THIS = new Object();
+
+ private static final Object OTHER = new Object();
+
+ protected int methodAccess;
+
+ protected String methodDesc;
+
+ private boolean constructor;
+
+ private boolean superInitialized;
+
+ private List<Object> stackFrame;
+
+ private Map<Label, List<Object>> branches;
+
+ /**
+ * Creates a new {@link AdviceAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param mv the method visitor to which this adapter delegates calls.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ */
+ protected AdviceAdapter(
+ final int api,
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc)
+ {
+ super(api, mv, access, name, desc);
+ methodAccess = access;
+ methodDesc = desc;
+ constructor = "<init>".equals(name);
+ }
+
+ @Override
+ public void visitCode() {
+ mv.visitCode();
+ if (constructor) {
+ stackFrame = new ArrayList<Object>();
+ branches = new HashMap<Label, List<Object>>();
+ } else {
+ superInitialized = true;
+ onMethodEnter();
+ }
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ mv.visitLabel(label);
+ if (constructor && branches != null) {
+ List<Object> frame = branches.get(label);
+ if (frame != null) {
+ stackFrame = frame;
+ branches.remove(label);
+ }
+ }
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ if (constructor) {
+ int s;
+ switch (opcode) {
+ case RETURN: // empty stack
+ onMethodExit(opcode);
+ break;
+
+ case IRETURN: // 1 before n/a after
+ case FRETURN: // 1 before n/a after
+ case ARETURN: // 1 before n/a after
+ case ATHROW: // 1 before n/a after
+ popValue();
+ onMethodExit(opcode);
+ break;
+
+ case LRETURN: // 2 before n/a after
+ case DRETURN: // 2 before n/a after
+ popValue();
+ popValue();
+ onMethodExit(opcode);
+ break;
+
+ case NOP:
+ case LALOAD: // remove 2 add 2
+ case DALOAD: // remove 2 add 2
+ case LNEG:
+ case DNEG:
+ case FNEG:
+ case INEG:
+ case L2D:
+ case D2L:
+ case F2I:
+ case I2B:
+ case I2C:
+ case I2S:
+ case I2F:
+ case ARRAYLENGTH:
+ break;
+
+ case ACONST_NULL:
+ case ICONST_M1:
+ case ICONST_0:
+ case ICONST_1:
+ case ICONST_2:
+ case ICONST_3:
+ case ICONST_4:
+ case ICONST_5:
+ case FCONST_0:
+ case FCONST_1:
+ case FCONST_2:
+ case F2L: // 1 before 2 after
+ case F2D:
+ case I2L:
+ case I2D:
+ pushValue(OTHER);
+ break;
+
+ case LCONST_0:
+ case LCONST_1:
+ case DCONST_0:
+ case DCONST_1:
+ pushValue(OTHER);
+ pushValue(OTHER);
+ break;
+
+ case IALOAD: // remove 2 add 1
+ case FALOAD: // remove 2 add 1
+ case AALOAD: // remove 2 add 1
+ case BALOAD: // remove 2 add 1
+ case CALOAD: // remove 2 add 1
+ case SALOAD: // remove 2 add 1
+ case POP:
+ case IADD:
+ case FADD:
+ case ISUB:
+ case LSHL: // 3 before 2 after
+ case LSHR: // 3 before 2 after
+ case LUSHR: // 3 before 2 after
+ case L2I: // 2 before 1 after
+ case L2F: // 2 before 1 after
+ case D2I: // 2 before 1 after
+ case D2F: // 2 before 1 after
+ case FSUB:
+ case FMUL:
+ case FDIV:
+ case FREM:
+ case FCMPL: // 2 before 1 after
+ case FCMPG: // 2 before 1 after
+ case IMUL:
+ case IDIV:
+ case IREM:
+ case ISHL:
+ case ISHR:
+ case IUSHR:
+ case IAND:
+ case IOR:
+ case IXOR:
+ case MONITORENTER:
+ case MONITOREXIT:
+ popValue();
+ break;
+
+ case POP2:
+ case LSUB:
+ case LMUL:
+ case LDIV:
+ case LREM:
+ case LADD:
+ case LAND:
+ case LOR:
+ case LXOR:
+ case DADD:
+ case DMUL:
+ case DSUB:
+ case DDIV:
+ case DREM:
+ popValue();
+ popValue();
+ break;
+
+ case IASTORE:
+ case FASTORE:
+ case AASTORE:
+ case BASTORE:
+ case CASTORE:
+ case SASTORE:
+ case LCMP: // 4 before 1 after
+ case DCMPL:
+ case DCMPG:
+ popValue();
+ popValue();
+ popValue();
+ break;
+
+ case LASTORE:
+ case DASTORE:
+ popValue();
+ popValue();
+ popValue();
+ popValue();
+ break;
+
+ case DUP:
+ pushValue(peekValue());
+ break;
+
+ case DUP_X1:
+ s = stackFrame.size();
+ stackFrame.add(s - 2, stackFrame.get(s - 1));
+ break;
+
+ case DUP_X2:
+ s = stackFrame.size();
+ stackFrame.add(s - 3, stackFrame.get(s - 1));
+ break;
+
+ case DUP2:
+ s = stackFrame.size();
+ stackFrame.add(s - 2, stackFrame.get(s - 1));
+ stackFrame.add(s - 2, stackFrame.get(s - 1));
+ break;
+
+ case DUP2_X1:
+ s = stackFrame.size();
+ stackFrame.add(s - 3, stackFrame.get(s - 1));
+ stackFrame.add(s - 3, stackFrame.get(s - 1));
+ break;
+
+ case DUP2_X2:
+ s = stackFrame.size();
+ stackFrame.add(s - 4, stackFrame.get(s - 1));
+ stackFrame.add(s - 4, stackFrame.get(s - 1));
+ break;
+
+ case SWAP:
+ s = stackFrame.size();
+ stackFrame.add(s - 2, stackFrame.get(s - 1));
+ stackFrame.remove(s);
+ break;
+ }
+ } else {
+ switch (opcode) {
+ case RETURN:
+ case IRETURN:
+ case FRETURN:
+ case ARETURN:
+ case LRETURN:
+ case DRETURN:
+ case ATHROW:
+ onMethodExit(opcode);
+ break;
+ }
+ }
+ mv.visitInsn(opcode);
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ super.visitVarInsn(opcode, var);
+ if (constructor) {
+ switch (opcode) {
+ case ILOAD:
+ case FLOAD:
+ pushValue(OTHER);
+ break;
+ case LLOAD:
+ case DLOAD:
+ pushValue(OTHER);
+ pushValue(OTHER);
+ break;
+ case ALOAD:
+ pushValue(var == 0 ? THIS : OTHER);
+ break;
+ case ASTORE:
+ case ISTORE:
+ case FSTORE:
+ popValue();
+ break;
+ case LSTORE:
+ case DSTORE:
+ popValue();
+ popValue();
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitFieldInsn(opcode, owner, name, desc);
+ if (constructor) {
+ char c = desc.charAt(0);
+ boolean longOrDouble = c == 'J' || c == 'D';
+ switch (opcode) {
+ case GETSTATIC:
+ pushValue(OTHER);
+ if (longOrDouble) {
+ pushValue(OTHER);
+ }
+ break;
+ case PUTSTATIC:
+ popValue();
+ if (longOrDouble) {
+ popValue();
+ }
+ break;
+ case PUTFIELD:
+ popValue();
+ if (longOrDouble) {
+ popValue();
+ popValue();
+ }
+ break;
+ // case GETFIELD:
+ default:
+ if (longOrDouble) {
+ pushValue(OTHER);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ mv.visitIntInsn(opcode, operand);
+ if (constructor && opcode != NEWARRAY) {
+ pushValue(OTHER);
+ }
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ mv.visitLdcInsn(cst);
+ if (constructor) {
+ pushValue(OTHER);
+ if (cst instanceof Double || cst instanceof Long) {
+ pushValue(OTHER);
+ }
+ }
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ if (constructor) {
+ for (int i = 0; i < dims; i++) {
+ popValue();
+ }
+ pushValue(OTHER);
+ }
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ mv.visitTypeInsn(opcode, type);
+ // ANEWARRAY, CHECKCAST or INSTANCEOF don't change stack
+ if (constructor && opcode == NEW) {
+ pushValue(OTHER);
+ }
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitMethodInsn(opcode, owner, name, desc);
+ if (constructor) {
+ Type[] types = Type.getArgumentTypes(desc);
+ for (int i = 0; i < types.length; i++) {
+ popValue();
+ if (types[i].getSize() == 2) {
+ popValue();
+ }
+ }
+ switch (opcode) {
+ // case INVOKESTATIC:
+ // break;
+
+ case INVOKEINTERFACE:
+ case INVOKEVIRTUAL:
+ popValue(); // objectref
+ break;
+
+ case INVOKESPECIAL:
+ Object type = popValue(); // objectref
+ if (type == THIS && !superInitialized) {
+ onMethodEnter();
+ superInitialized = true;
+ // once super has been initialized it is no longer
+ // necessary to keep track of stack state
+ constructor = false;
+ }
+ break;
+ }
+
+ Type returnType = Type.getReturnType(desc);
+ if (returnType != Type.VOID_TYPE) {
+ pushValue(OTHER);
+ if (returnType.getSize() == 2) {
+ pushValue(OTHER);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ if (constructor) {
+ Type[] types = Type.getArgumentTypes(desc);
+ for (int i = 0; i < types.length; i++) {
+ popValue();
+ if (types[i].getSize() == 2) {
+ popValue();
+ }
+ }
+
+ Type returnType = Type.getReturnType(desc);
+ if (returnType != Type.VOID_TYPE) {
+ pushValue(OTHER);
+ if (returnType.getSize() == 2) {
+ pushValue(OTHER);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ mv.visitJumpInsn(opcode, label);
+ if (constructor) {
+ switch (opcode) {
+ case IFEQ:
+ case IFNE:
+ case IFLT:
+ case IFGE:
+ case IFGT:
+ case IFLE:
+ case IFNULL:
+ case IFNONNULL:
+ popValue();
+ break;
+
+ case IF_ICMPEQ:
+ case IF_ICMPNE:
+ case IF_ICMPLT:
+ case IF_ICMPGE:
+ case IF_ICMPGT:
+ case IF_ICMPLE:
+ case IF_ACMPEQ:
+ case IF_ACMPNE:
+ popValue();
+ popValue();
+ break;
+
+ case JSR:
+ pushValue(OTHER);
+ break;
+ }
+ addBranch(label);
+ }
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ mv.visitLookupSwitchInsn(dflt, keys, labels);
+ if (constructor) {
+ popValue();
+ addBranches(dflt, labels);
+ }
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ mv.visitTableSwitchInsn(min, max, dflt, labels);
+ if (constructor) {
+ popValue();
+ addBranches(dflt, labels);
+ }
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ Label start,
+ Label end,
+ Label handler,
+ String type)
+ {
+ super.visitTryCatchBlock(start, end, handler, type);
+ if (constructor && !branches.containsKey(handler)) {
+ List<Object> stackFrame = new ArrayList<Object>();
+ stackFrame.add(OTHER);
+ branches.put(handler, stackFrame);
+ }
+ }
+
+ private void addBranches(final Label dflt, final Label[] labels) {
+ addBranch(dflt);
+ for (int i = 0; i < labels.length; i++) {
+ addBranch(labels[i]);
+ }
+ }
+
+ private void addBranch(final Label label) {
+ if (branches.containsKey(label)) {
+ return;
+ }
+ branches.put(label, new ArrayList<Object>(stackFrame));
+ }
+
+ private Object popValue() {
+ return stackFrame.remove(stackFrame.size() - 1);
+ }
+
+ private Object peekValue() {
+ return stackFrame.get(stackFrame.size() - 1);
+ }
+
+ private void pushValue(final Object o) {
+ stackFrame.add(o);
+ }
+
+ /**
+ * Called at the beginning of the method or after super class class call in
+ * the constructor. <br><br>
+ *
+ * <i>Custom code can use or change all the local variables, but should not
+ * change state of the stack.</i>
+ */
+ protected void onMethodEnter() {
+ }
+
+ /**
+ * Called before explicit exit from the method using either return or throw.
+ * Top element on the stack contains the return value or exception instance.
+ * For example:
+ *
+ * <pre>
+ * public void onMethodExit(int opcode) {
+ * if(opcode==RETURN) {
+ * visitInsn(ACONST_NULL);
+ * } else if(opcode==ARETURN || opcode==ATHROW) {
+ * dup();
+ * } else {
+ * if(opcode==LRETURN || opcode==DRETURN) {
+ * dup2();
+ * } else {
+ * dup();
+ * }
+ * box(Type.getReturnType(this.methodDesc));
+ * }
+ * visitIntInsn(SIPUSH, opcode);
+ * visitMethodInsn(INVOKESTATIC, owner, "onExit", "(Ljava/lang/Object;I)V");
+ * }
+ *
+ * // an actual call back method
+ * public static void onExit(Object param, int opcode) {
+ * ...
+ * </pre>
+ *
+ * <br><br>
+ *
+ * <i>Custom code can use or change all the local variables, but should not
+ * change state of the stack.</i>
+ *
+ * @param opcode one of the RETURN, IRETURN, FRETURN, ARETURN, LRETURN,
+ * DRETURN or ATHROW
+ *
+ */
+ protected void onMethodExit(int opcode) {
+ }
+
+ // TODO onException, onMethodCall
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
new file mode 100644
index 0000000..c686141
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
@@ -0,0 +1,975 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} that keeps track of stack map frame changes between
+ * {@link #visitFrame(int, int, Object[], int, Object[]) visitFrame} calls. This
+ * adapter must be used with the
+ * {@link jdk.internal.org.objectweb.asm.ClassReader#EXPAND_FRAMES} option. Each visit<i>X</i>
+ * instruction delegates to the next visitor in the chain, if any, and then
+ * simulates the effect of this instruction on the stack map frame, represented
+ * by {@link #locals} and {@link #stack}. The next visitor in the chain can get
+ * the state of the stack map frame <i>before</i> each instruction by reading
+ * the value of these fields in its visit<i>X</i> methods (this requires a
+ * reference to the AnalyzerAdapter that is before it in the chain).
+ * If this adapter is used with a class that does not contain stack map table
+ * attributes (i.e., pre Java 6 classes) then this adapter may not be able to
+ * compute the stack map frame for each instruction. In this case no exception
+ * is thrown but the {@link #locals} and {@link #stack} fields will be null for
+ * these instructions.
+ *
+ * @author Eric Bruneton
+ */
+public class AnalyzerAdapter extends MethodVisitor {
+
+ /**
+ * <code>List</code> of the local variable slots for current execution
+ * frame. Primitive types are represented by {@link Opcodes#TOP},
+ * {@link Opcodes#INTEGER}, {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+ * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+ * {@link Opcodes#UNINITIALIZED_THIS} (long and double are represented by a
+ * two elements, the second one being TOP). Reference types are represented
+ * by String objects (representing internal names), and uninitialized types
+ * by Label objects (this label designates the NEW instruction that created
+ * this uninitialized value). This field is <tt>null</tt> for unreacheable
+ * instructions.
+ */
+ public List<Object> locals;
+
+ /**
+ * <code>List</code> of the operand stack slots for current execution
+ * frame. Primitive types are represented by {@link Opcodes#TOP},
+ * {@link Opcodes#INTEGER}, {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+ * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+ * {@link Opcodes#UNINITIALIZED_THIS} (long and double are represented by a
+ * two elements, the second one being TOP). Reference types are represented
+ * by String objects (representing internal names), and uninitialized types
+ * by Label objects (this label designates the NEW instruction that created
+ * this uninitialized value). This field is <tt>null</tt> for unreacheable
+ * instructions.
+ */
+ public List<Object> stack;
+
+ /**
+ * The labels that designate the next instruction to be visited. May be
+ * <tt>null</tt>.
+ */
+ private List<Label> labels;
+
+ /**
+ * Information about uninitialized types in the current execution frame.
+ * This map associates internal names to Label objects. Each label
+ * designates a NEW instruction that created the currently uninitialized
+ * types, and the associated internal name represents the NEW operand, i.e.
+ * the final, initialized type value.
+ */
+ public Map<Object,Object> uninitializedTypes;
+
+ /**
+ * The maximum stack size of this method.
+ */
+ private int maxStack;
+
+ /**
+ * The maximum number of local variables of this method.
+ */
+ private int maxLocals;
+
+ /**
+ * The owner's class name.
+ */
+ private String owner;
+
+ /**
+ * Creates a new {@link AnalyzerAdapter}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #AnalyzerAdapter(int, String, int, String, String, MethodVisitor)}
+ * version.
+ *
+ * @param owner the owner's class name.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param mv the method visitor to which this adapter delegates calls. May
+ * be <tt>null</tt>.
+ */
+ public AnalyzerAdapter(
+ final String owner,
+ final int access,
+ final String name,
+ final String desc,
+ final MethodVisitor mv)
+ {
+ this(Opcodes.ASM4, owner, access, name, desc, mv);
+ }
+
+ /**
+ * Creates a new {@link AnalyzerAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param owner the owner's class name.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param mv the method visitor to which this adapter delegates calls. May
+ * be <tt>null</tt>.
+ */
+ protected AnalyzerAdapter(
+ final int api,
+ final String owner,
+ final int access,
+ final String name,
+ final String desc,
+ final MethodVisitor mv)
+ {
+ super(api, mv);
+ this.owner = owner;
+ locals = new ArrayList<Object>();
+ stack = new ArrayList<Object>();
+ uninitializedTypes = new HashMap<Object, Object>();
+
+ if ((access & Opcodes.ACC_STATIC) == 0) {
+ if ("<init>".equals(name)) {
+ locals.add(Opcodes.UNINITIALIZED_THIS);
+ } else {
+ locals.add(owner);
+ }
+ }
+ Type[] types = Type.getArgumentTypes(desc);
+ for (int i = 0; i < types.length; ++i) {
+ Type type = types[i];
+ switch (type.getSort()) {
+ case Type.BOOLEAN:
+ case Type.CHAR:
+ case Type.BYTE:
+ case Type.SHORT:
+ case Type.INT:
+ locals.add(Opcodes.INTEGER);
+ break;
+ case Type.FLOAT:
+ locals.add(Opcodes.FLOAT);
+ break;
+ case Type.LONG:
+ locals.add(Opcodes.LONG);
+ locals.add(Opcodes.TOP);
+ break;
+ case Type.DOUBLE:
+ locals.add(Opcodes.DOUBLE);
+ locals.add(Opcodes.TOP);
+ break;
+ case Type.ARRAY:
+ locals.add(types[i].getDescriptor());
+ break;
+ // case Type.OBJECT:
+ default:
+ locals.add(types[i].getInternalName());
+ }
+ }
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ if (type != Opcodes.F_NEW) { // uncompressed frame
+ throw new IllegalStateException("ClassReader.accept() should be called with EXPAND_FRAMES flag");
+ }
+
+ if (mv != null) {
+ mv.visitFrame(type, nLocal, local, nStack, stack);
+ }
+
+ if (this.locals != null) {
+ this.locals.clear();
+ this.stack.clear();
+ } else {
+ this.locals = new ArrayList<Object>();
+ this.stack = new ArrayList<Object>();
+ }
+ visitFrameTypes(nLocal, local, this.locals);
+ visitFrameTypes(nStack, stack, this.stack);
+ maxStack = Math.max(maxStack, this.stack.size());
+ }
+
+ private static void visitFrameTypes(
+ final int n,
+ final Object[] types,
+ final List<Object> result)
+ {
+ for (int i = 0; i < n; ++i) {
+ Object type = types[i];
+ result.add(type);
+ if (type == Opcodes.LONG || type == Opcodes.DOUBLE) {
+ result.add(Opcodes.TOP);
+ }
+ }
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ if (mv != null) {
+ mv.visitInsn(opcode);
+ }
+ execute(opcode, 0, null);
+ if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
+ || opcode == Opcodes.ATHROW)
+ {
+ this.locals = null;
+ this.stack = null;
+ }
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ if (mv != null) {
+ mv.visitIntInsn(opcode, operand);
+ }
+ execute(opcode, operand, null);
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ if (mv != null) {
+ mv.visitVarInsn(opcode, var);
+ }
+ execute(opcode, var, null);
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ if (opcode == Opcodes.NEW) {
+ if (labels == null) {
+ Label l = new Label();
+ labels = new ArrayList<Label>(3);
+ labels.add(l);
+ if (mv != null) {
+ mv.visitLabel(l);
+ }
+ }
+ for (int i = 0; i < labels.size(); ++i) {
+ uninitializedTypes.put(labels.get(i), type);
+ }
+ }
+ if (mv != null) {
+ mv.visitTypeInsn(opcode, type);
+ }
+ execute(opcode, 0, type);
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ if (mv != null) {
+ mv.visitFieldInsn(opcode, owner, name, desc);
+ }
+ execute(opcode, 0, desc);
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ if (mv != null) {
+ mv.visitMethodInsn(opcode, owner, name, desc);
+ }
+ if (this.locals == null) {
+ labels = null;
+ return;
+ }
+ pop(desc);
+ if (opcode != Opcodes.INVOKESTATIC) {
+ Object t = pop();
+ if (opcode == Opcodes.INVOKESPECIAL && name.charAt(0) == '<') {
+ Object u;
+ if (t == Opcodes.UNINITIALIZED_THIS) {
+ u = this.owner;
+ } else {
+ u = uninitializedTypes.get(t);
+ }
+ for (int i = 0; i < locals.size(); ++i) {
+ if (locals.get(i) == t) {
+ locals.set(i, u);
+ }
+ }
+ for (int i = 0; i < stack.size(); ++i) {
+ if (stack.get(i) == t) {
+ stack.set(i, u);
+ }
+ }
+ }
+ }
+ pushDesc(desc);
+ labels = null;
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ if (mv != null) {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+ if (this.locals == null) {
+ labels = null;
+ return;
+ }
+ pop(desc);
+ pushDesc(desc);
+ labels = null;
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ if (mv != null) {
+ mv.visitJumpInsn(opcode, label);
+ }
+ execute(opcode, 0, null);
+ if (opcode == Opcodes.GOTO) {
+ this.locals = null;
+ this.stack = null;
+ }
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ if (mv != null) {
+ mv.visitLabel(label);
+ }
+ if (labels == null) {
+ labels = new ArrayList<Label>(3);
+ }
+ labels.add(label);
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ if (mv != null) {
+ mv.visitLdcInsn(cst);
+ }
+ if (this.locals == null) {
+ labels = null;
+ return;
+ }
+ if (cst instanceof Integer) {
+ push(Opcodes.INTEGER);
+ } else if (cst instanceof Long) {
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ } else if (cst instanceof Float) {
+ push(Opcodes.FLOAT);
+ } else if (cst instanceof Double) {
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ } else if (cst instanceof String) {
+ push("java/lang/String");
+ } else if (cst instanceof Type) {
+ int sort = ((Type) cst).getSort();
+ if (sort == Type.OBJECT || sort == Type.ARRAY) {
+ push("java/lang/Class");
+ } else if (sort == Type.METHOD) {
+ push("java/lang/invoke/MethodType");
+ } else {
+ throw new IllegalArgumentException();
+ }
+ } else if (cst instanceof Handle) {
+ push("java/lang/invoke/MethodHandle");
+ } else {
+ throw new IllegalArgumentException();
+ }
+ labels = null;
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ if (mv != null) {
+ mv.visitIincInsn(var, increment);
+ }
+ execute(Opcodes.IINC, var, null);
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ if (mv != null) {
+ mv.visitTableSwitchInsn(min, max, dflt, labels);
+ }
+ execute(Opcodes.TABLESWITCH, 0, null);
+ this.locals = null;
+ this.stack = null;
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ if (mv != null) {
+ mv.visitLookupSwitchInsn(dflt, keys, labels);
+ }
+ execute(Opcodes.LOOKUPSWITCH, 0, null);
+ this.locals = null;
+ this.stack = null;
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ if (mv != null) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ }
+ execute(Opcodes.MULTIANEWARRAY, dims, desc);
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ if (mv != null) {
+ this.maxStack = Math.max(this.maxStack, maxStack);
+ this.maxLocals = Math.max(this.maxLocals, maxLocals);
+ mv.visitMaxs(this.maxStack, this.maxLocals);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+
+ private Object get(final int local) {
+ maxLocals = Math.max(maxLocals, local);
+ return local < locals.size() ? locals.get(local) : Opcodes.TOP;
+ }
+
+ private void set(final int local, final Object type) {
+ maxLocals = Math.max(maxLocals, local);
+ while (local >= locals.size()) {
+ locals.add(Opcodes.TOP);
+ }
+ locals.set(local, type);
+ }
+
+ private void push(final Object type) {
+ stack.add(type);
+ maxStack = Math.max(maxStack, stack.size());
+ }
+
+ private void pushDesc(final String desc) {
+ int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0;
+ switch (desc.charAt(index)) {
+ case 'V':
+ return;
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ push(Opcodes.INTEGER);
+ return;
+ case 'F':
+ push(Opcodes.FLOAT);
+ return;
+ case 'J':
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ return;
+ case 'D':
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ return;
+ case '[':
+ if (index == 0) {
+ push(desc);
+ } else {
+ push(desc.substring(index, desc.length()));
+ }
+ break;
+ // case 'L':
+ default:
+ if (index == 0) {
+ push(desc.substring(1, desc.length() - 1));
+ } else {
+ push(desc.substring(index + 1, desc.length() - 1));
+ }
+ }
+ }
+
+ private Object pop() {
+ return stack.remove(stack.size() - 1);
+ }
+
+ private void pop(final int n) {
+ int size = stack.size();
+ int end = size - n;
+ for (int i = size - 1; i >= end; --i) {
+ stack.remove(i);
+ }
+ }
+
+ private void pop(final String desc) {
+ char c = desc.charAt(0);
+ if (c == '(') {
+ int n = 0;
+ Type[] types = Type.getArgumentTypes(desc);
+ for (int i = 0; i < types.length; ++i) {
+ n += types[i].getSize();
+ }
+ pop(n);
+ } else if (c == 'J' || c == 'D') {
+ pop(2);
+ } else {
+ pop(1);
+ }
+ }
+
+ private void execute(final int opcode, final int iarg, final String sarg) {
+ if (this.locals == null) {
+ labels = null;
+ return;
+ }
+ Object t1, t2, t3, t4;
+ switch (opcode) {
+ case Opcodes.NOP:
+ case Opcodes.INEG:
+ case Opcodes.LNEG:
+ case Opcodes.FNEG:
+ case Opcodes.DNEG:
+ case Opcodes.I2B:
+ case Opcodes.I2C:
+ case Opcodes.I2S:
+ case Opcodes.GOTO:
+ case Opcodes.RETURN:
+ break;
+ case Opcodes.ACONST_NULL:
+ push(Opcodes.NULL);
+ break;
+ case Opcodes.ICONST_M1:
+ case Opcodes.ICONST_0:
+ case Opcodes.ICONST_1:
+ case Opcodes.ICONST_2:
+ case Opcodes.ICONST_3:
+ case Opcodes.ICONST_4:
+ case Opcodes.ICONST_5:
+ case Opcodes.BIPUSH:
+ case Opcodes.SIPUSH:
+ push(Opcodes.INTEGER);
+ break;
+ case Opcodes.LCONST_0:
+ case Opcodes.LCONST_1:
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.FCONST_0:
+ case Opcodes.FCONST_1:
+ case Opcodes.FCONST_2:
+ push(Opcodes.FLOAT);
+ break;
+ case Opcodes.DCONST_0:
+ case Opcodes.DCONST_1:
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.ILOAD:
+ case Opcodes.FLOAD:
+ case Opcodes.ALOAD:
+ push(get(iarg));
+ break;
+ case Opcodes.LLOAD:
+ case Opcodes.DLOAD:
+ push(get(iarg));
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.IALOAD:
+ case Opcodes.BALOAD:
+ case Opcodes.CALOAD:
+ case Opcodes.SALOAD:
+ pop(2);
+ push(Opcodes.INTEGER);
+ break;
+ case Opcodes.LALOAD:
+ case Opcodes.D2L:
+ pop(2);
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.FALOAD:
+ pop(2);
+ push(Opcodes.FLOAT);
+ break;
+ case Opcodes.DALOAD:
+ case Opcodes.L2D:
+ pop(2);
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.AALOAD:
+ pop(1);
+ t1 = pop();
+ if (t1 instanceof String) {
+ pushDesc(((String) t1).substring(1));
+ } else {
+ push("java/lang/Object");
+ }
+ break;
+ case Opcodes.ISTORE:
+ case Opcodes.FSTORE:
+ case Opcodes.ASTORE:
+ t1 = pop();
+ set(iarg, t1);
+ if (iarg > 0) {
+ t2 = get(iarg - 1);
+ if (t2 == Opcodes.LONG || t2 == Opcodes.DOUBLE) {
+ set(iarg - 1, Opcodes.TOP);
+ }
+ }
+ break;
+ case Opcodes.LSTORE:
+ case Opcodes.DSTORE:
+ pop(1);
+ t1 = pop();
+ set(iarg, t1);
+ set(iarg + 1, Opcodes.TOP);
+ if (iarg > 0) {
+ t2 = get(iarg - 1);
+ if (t2 == Opcodes.LONG || t2 == Opcodes.DOUBLE) {
+ set(iarg - 1, Opcodes.TOP);
+ }
+ }
+ break;
+ case Opcodes.IASTORE:
+ case Opcodes.BASTORE:
+ case Opcodes.CASTORE:
+ case Opcodes.SASTORE:
+ case Opcodes.FASTORE:
+ case Opcodes.AASTORE:
+ pop(3);
+ break;
+ case Opcodes.LASTORE:
+ case Opcodes.DASTORE:
+ pop(4);
+ break;
+ case Opcodes.POP:
+ case Opcodes.IFEQ:
+ case Opcodes.IFNE:
+ case Opcodes.IFLT:
+ case Opcodes.IFGE:
+ case Opcodes.IFGT:
+ case Opcodes.IFLE:
+ case Opcodes.IRETURN:
+ case Opcodes.FRETURN:
+ case Opcodes.ARETURN:
+ case Opcodes.TABLESWITCH:
+ case Opcodes.LOOKUPSWITCH:
+ case Opcodes.ATHROW:
+ case Opcodes.MONITORENTER:
+ case Opcodes.MONITOREXIT:
+ case Opcodes.IFNULL:
+ case Opcodes.IFNONNULL:
+ pop(1);
+ break;
+ case Opcodes.POP2:
+ case Opcodes.IF_ICMPEQ:
+ case Opcodes.IF_ICMPNE:
+ case Opcodes.IF_ICMPLT:
+ case Opcodes.IF_ICMPGE:
+ case Opcodes.IF_ICMPGT:
+ case Opcodes.IF_ICMPLE:
+ case Opcodes.IF_ACMPEQ:
+ case Opcodes.IF_ACMPNE:
+ case Opcodes.LRETURN:
+ case Opcodes.DRETURN:
+ pop(2);
+ break;
+ case Opcodes.DUP:
+ t1 = pop();
+ push(t1);
+ push(t1);
+ break;
+ case Opcodes.DUP_X1:
+ t1 = pop();
+ t2 = pop();
+ push(t1);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP_X2:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ push(t1);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2:
+ t1 = pop();
+ t2 = pop();
+ push(t2);
+ push(t1);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2_X1:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ push(t2);
+ push(t1);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.DUP2_X2:
+ t1 = pop();
+ t2 = pop();
+ t3 = pop();
+ t4 = pop();
+ push(t2);
+ push(t1);
+ push(t4);
+ push(t3);
+ push(t2);
+ push(t1);
+ break;
+ case Opcodes.SWAP:
+ t1 = pop();
+ t2 = pop();
+ push(t1);
+ push(t2);
+ break;
+ case Opcodes.IADD:
+ case Opcodes.ISUB:
+ case Opcodes.IMUL:
+ case Opcodes.IDIV:
+ case Opcodes.IREM:
+ case Opcodes.IAND:
+ case Opcodes.IOR:
+ case Opcodes.IXOR:
+ case Opcodes.ISHL:
+ case Opcodes.ISHR:
+ case Opcodes.IUSHR:
+ case Opcodes.L2I:
+ case Opcodes.D2I:
+ case Opcodes.FCMPL:
+ case Opcodes.FCMPG:
+ pop(2);
+ push(Opcodes.INTEGER);
+ break;
+ case Opcodes.LADD:
+ case Opcodes.LSUB:
+ case Opcodes.LMUL:
+ case Opcodes.LDIV:
+ case Opcodes.LREM:
+ case Opcodes.LAND:
+ case Opcodes.LOR:
+ case Opcodes.LXOR:
+ pop(4);
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.FADD:
+ case Opcodes.FSUB:
+ case Opcodes.FMUL:
+ case Opcodes.FDIV:
+ case Opcodes.FREM:
+ case Opcodes.L2F:
+ case Opcodes.D2F:
+ pop(2);
+ push(Opcodes.FLOAT);
+ break;
+ case Opcodes.DADD:
+ case Opcodes.DSUB:
+ case Opcodes.DMUL:
+ case Opcodes.DDIV:
+ case Opcodes.DREM:
+ pop(4);
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.LSHL:
+ case Opcodes.LSHR:
+ case Opcodes.LUSHR:
+ pop(3);
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.IINC:
+ set(iarg, Opcodes.INTEGER);
+ break;
+ case Opcodes.I2L:
+ case Opcodes.F2L:
+ pop(1);
+ push(Opcodes.LONG);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.I2F:
+ pop(1);
+ push(Opcodes.FLOAT);
+ break;
+ case Opcodes.I2D:
+ case Opcodes.F2D:
+ pop(1);
+ push(Opcodes.DOUBLE);
+ push(Opcodes.TOP);
+ break;
+ case Opcodes.F2I:
+ case Opcodes.ARRAYLENGTH:
+ case Opcodes.INSTANCEOF:
+ pop(1);
+ push(Opcodes.INTEGER);
+ break;
+ case Opcodes.LCMP:
+ case Opcodes.DCMPL:
+ case Opcodes.DCMPG:
+ pop(4);
+ push(Opcodes.INTEGER);
+ break;
+ case Opcodes.JSR:
+ case Opcodes.RET:
+ throw new RuntimeException("JSR/RET are not supported");
+ case Opcodes.GETSTATIC:
+ pushDesc(sarg);
+ break;
+ case Opcodes.PUTSTATIC:
+ pop(sarg);
+ break;
+ case Opcodes.GETFIELD:
+ pop(1);
+ pushDesc(sarg);
+ break;
+ case Opcodes.PUTFIELD:
+ pop(sarg);
+ pop();
+ break;
+ case Opcodes.NEW:
+ push(labels.get(0));
+ break;
+ case Opcodes.NEWARRAY:
+ pop();
+ switch (iarg) {
+ case Opcodes.T_BOOLEAN:
+ pushDesc("[Z");
+ break;
+ case Opcodes.T_CHAR:
+ pushDesc("[C");
+ break;
+ case Opcodes.T_BYTE:
+ pushDesc("[B");
+ break;
+ case Opcodes.T_SHORT:
+ pushDesc("[S");
+ break;
+ case Opcodes.T_INT:
+ pushDesc("[I");
+ break;
+ case Opcodes.T_FLOAT:
+ pushDesc("[F");
+ break;
+ case Opcodes.T_DOUBLE:
+ pushDesc("[D");
+ break;
+ // case Opcodes.T_LONG:
+ default:
+ pushDesc("[J");
+ break;
+ }
+ break;
+ case Opcodes.ANEWARRAY:
+ pop();
+ pushDesc("[" + Type.getObjectType(sarg));
+ break;
+ case Opcodes.CHECKCAST:
+ pop();
+ pushDesc(Type.getObjectType(sarg).getDescriptor());
+ break;
+ // case Opcodes.MULTIANEWARRAY:
+ default:
+ pop(iarg);
+ pushDesc(sarg);
+ break;
+ }
+ labels = null;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
new file mode 100644
index 0000000..23776dd
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
@@ -0,0 +1,265 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link MethodVisitor} that can be used to approximate method size.
+ *
+ * @author Eugene Kuleshov
+ */
+public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
+
+ private int minSize;
+
+ private int maxSize;
+
+ public CodeSizeEvaluator(final MethodVisitor mv) {
+ this(Opcodes.ASM4, mv);
+ }
+
+ protected CodeSizeEvaluator(final int api, final MethodVisitor mv) {
+ super(api, mv);
+ }
+
+ public int getMinSize() {
+ return this.minSize;
+ }
+
+ public int getMaxSize() {
+ return this.maxSize;
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ minSize += 1;
+ maxSize += 1;
+ if (mv != null) {
+ mv.visitInsn(opcode);
+ }
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ if (opcode == SIPUSH) {
+ minSize += 3;
+ maxSize += 3;
+ } else {
+ minSize += 2;
+ maxSize += 2;
+ }
+ if (mv != null) {
+ mv.visitIntInsn(opcode, operand);
+ }
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ if (var < 4 && opcode != RET) {
+ minSize += 1;
+ maxSize += 1;
+ } else if (var >= 256) {
+ minSize += 4;
+ maxSize += 4;
+ } else {
+ minSize += 2;
+ maxSize += 2;
+ }
+ if (mv != null) {
+ mv.visitVarInsn(opcode, var);
+ }
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ minSize += 3;
+ maxSize += 3;
+ if (mv != null) {
+ mv.visitTypeInsn(opcode, type);
+ }
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ minSize += 3;
+ maxSize += 3;
+ if (mv != null) {
+ mv.visitFieldInsn(opcode, owner, name, desc);
+ }
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ if (opcode == INVOKEINTERFACE) {
+ minSize += 5;
+ maxSize += 5;
+ } else {
+ minSize += 3;
+ maxSize += 3;
+ }
+ if (mv != null) {
+ mv.visitMethodInsn(opcode, owner, name, desc);
+ }
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ minSize += 5;
+ maxSize += 5;
+ if (mv != null) {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ minSize += 3;
+ if (opcode == GOTO || opcode == JSR) {
+ maxSize += 5;
+ } else {
+ maxSize += 8;
+ }
+ if (mv != null) {
+ mv.visitJumpInsn(opcode, label);
+ }
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ if (cst instanceof Long || cst instanceof Double) {
+ minSize += 3;
+ maxSize += 3;
+ } else {
+ minSize += 2;
+ maxSize += 3;
+ }
+ if (mv != null) {
+ mv.visitLdcInsn(cst);
+ }
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ if (var > 255 || increment > 127 || increment < -128) {
+ minSize += 6;
+ maxSize += 6;
+ } else {
+ minSize += 3;
+ maxSize += 3;
+ }
+ if (mv != null) {
+ mv.visitIincInsn(var, increment);
+ }
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ minSize += 13 + labels.length * 4;
+ maxSize += 16 + labels.length * 4;
+ if (mv != null) {
+ mv.visitTableSwitchInsn(min, max, dflt, labels);
+ }
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ minSize += 9 + keys.length * 8;
+ maxSize += 12 + keys.length * 8;
+ if (mv != null) {
+ mv.visitLookupSwitchInsn(dflt, keys, labels);
+ }
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ minSize += 4;
+ maxSize += 4;
+ if (mv != null) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
new file mode 100644
index 0000000..d86c198
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -0,0 +1,1578 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link jdk.internal.org.objectweb.asm.MethodVisitor} with convenient methods to generate
+ * code. For example, using this adapter, the class below
+ *
+ * <pre>
+ * public class Example {
+ * public static void main(String[] args) {
+ * System.out.println("Hello world!");
+ * }
+ * }
+ * </pre>
+ *
+ * can be generated as follows:
+ *
+ * <pre>
+ * ClassWriter cw = new ClassWriter(true);
+ * cw.visit(V1_1, ACC_PUBLIC, "Example", null, "java/lang/Object", null);
+ *
+ * Method m = Method.getMethod("void <init> ()");
+ * GeneratorAdapter mg = new GeneratorAdapter(ACC_PUBLIC, m, null, null, cw);
+ * mg.loadThis();
+ * mg.invokeConstructor(Type.getType(Object.class), m);
+ * mg.returnValue();
+ * mg.endMethod();
+ *
+ * m = Method.getMethod("void main (String[])");
+ * mg = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, m, null, null, cw);
+ * mg.getStatic(Type.getType(System.class), "out", Type.getType(PrintStream.class));
+ * mg.push("Hello world!");
+ * mg.invokeVirtual(Type.getType(PrintStream.class), Method.getMethod("void println (String)"));
+ * mg.returnValue();
+ * mg.endMethod();
+ *
+ * cw.visitEnd();
+ * </pre>
+ *
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ * @author Prashant Deva
+ */
+public class GeneratorAdapter extends LocalVariablesSorter {
+
+ private static final String CLDESC = "Ljava/lang/Class;";
+
+ private static final Type BYTE_TYPE = Type.getObjectType("java/lang/Byte");
+
+ private static final Type BOOLEAN_TYPE = Type.getObjectType("java/lang/Boolean");
+
+ private static final Type SHORT_TYPE = Type.getObjectType("java/lang/Short");
+
+ private static final Type CHARACTER_TYPE = Type.getObjectType("java/lang/Character");
+
+ private static final Type INTEGER_TYPE = Type.getObjectType("java/lang/Integer");
+
+ private static final Type FLOAT_TYPE = Type.getObjectType("java/lang/Float");
+
+ private static final Type LONG_TYPE = Type.getObjectType("java/lang/Long");
+
+ private static final Type DOUBLE_TYPE = Type.getObjectType("java/lang/Double");
+
+ private static final Type NUMBER_TYPE = Type.getObjectType("java/lang/Number");
+
+ private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
+
+ private static final Method BOOLEAN_VALUE = Method.getMethod("boolean booleanValue()");
+
+ private static final Method CHAR_VALUE = Method.getMethod("char charValue()");
+
+ private static final Method INT_VALUE = Method.getMethod("int intValue()");
+
+ private static final Method FLOAT_VALUE = Method.getMethod("float floatValue()");
+
+ private static final Method LONG_VALUE = Method.getMethod("long longValue()");
+
+ private static final Method DOUBLE_VALUE = Method.getMethod("double doubleValue()");
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int ADD = Opcodes.IADD;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int SUB = Opcodes.ISUB;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int MUL = Opcodes.IMUL;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int DIV = Opcodes.IDIV;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int REM = Opcodes.IREM;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int NEG = Opcodes.INEG;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int SHL = Opcodes.ISHL;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int SHR = Opcodes.ISHR;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int USHR = Opcodes.IUSHR;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int AND = Opcodes.IAND;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int OR = Opcodes.IOR;
+
+ /**
+ * Constant for the {@link #math math} method.
+ */
+ public static final int XOR = Opcodes.IXOR;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int EQ = Opcodes.IFEQ;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int NE = Opcodes.IFNE;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int LT = Opcodes.IFLT;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int GE = Opcodes.IFGE;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int GT = Opcodes.IFGT;
+
+ /**
+ * Constant for the {@link #ifCmp ifCmp} method.
+ */
+ public static final int LE = Opcodes.IFLE;
+
+ /**
+ * Access flags of the method visited by this adapter.
+ */
+ private final int access;
+
+ /**
+ * Return type of the method visited by this adapter.
+ */
+ private final Type returnType;
+
+ /**
+ * Argument types of the method visited by this adapter.
+ */
+ private final Type[] argumentTypes;
+
+ /**
+ * Types of the local variables of the method visited by this adapter.
+ */
+ private final List<Type> localTypes = new ArrayList<Type>();
+
+ /**
+ * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+ * version.
+ *
+ * @param mv the method visitor to which this adapter delegates calls.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ */
+ public GeneratorAdapter(
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc)
+ {
+ this(Opcodes.ASM4, mv, access, name, desc);
+ }
+
+ /**
+ * Creates a new {@link GeneratorAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param mv the method visitor to which this adapter delegates calls.
+ * @param access the method's access flags (see {@link Opcodes}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ */
+ protected GeneratorAdapter(
+ final int api,
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc)
+ {
+ super(api, access, desc, mv);
+ this.access = access;
+ this.returnType = Type.getReturnType(desc);
+ this.argumentTypes = Type.getArgumentTypes(desc);
+ }
+
+ /**
+ * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+ * version.
+ *
+ * @param access access flags of the adapted method.
+ * @param method the adapted method.
+ * @param mv the method visitor to which this adapter delegates calls.
+ */
+ public GeneratorAdapter(
+ final int access,
+ final Method method,
+ final MethodVisitor mv)
+ {
+ this(mv, access, null, method.getDescriptor());
+ }
+
+ /**
+ * Creates a new {@link GeneratorAdapter}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #GeneratorAdapter(int, MethodVisitor, int, String, String)}
+ * version.
+ *
+ * @param access access flags of the adapted method.
+ * @param method the adapted method.
+ * @param signature the signature of the adapted method (may be
+ * <tt>null</tt>).
+ * @param exceptions the exceptions thrown by the adapted method (may be
+ * <tt>null</tt>).
+ * @param cv the class visitor to which this adapter delegates calls.
+ */
+ public GeneratorAdapter(
+ final int access,
+ final Method method,
+ final String signature,
+ final Type[] exceptions,
+ final ClassVisitor cv)
+ {
+ this(access, method, cv.visitMethod(access,
+ method.getName(),
+ method.getDescriptor(),
+ signature,
+ getInternalNames(exceptions)));
+ }
+
+ /**
+ * Returns the internal names of the given types.
+ *
+ * @param types a set of types.
+ * @return the internal names of the given types.
+ */
+ private static String[] getInternalNames(final Type[] types) {
+ if (types == null) {
+ return null;
+ }
+ String[] names = new String[types.length];
+ for (int i = 0; i < names.length; ++i) {
+ names[i] = types[i].getInternalName();
+ }
+ return names;
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to push constants on the stack
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final boolean value) {
+ push(value ? 1 : 0);
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final int value) {
+ if (value >= -1 && value <= 5) {
+ mv.visitInsn(Opcodes.ICONST_0 + value);
+ } else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.BIPUSH, value);
+ } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.SIPUSH, value);
+ } else {
+ mv.visitLdcInsn(new Integer(value));
+ }
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final long value) {
+ if (value == 0L || value == 1L) {
+ mv.visitInsn(Opcodes.LCONST_0 + (int) value);
+ } else {
+ mv.visitLdcInsn(new Long(value));
+ }
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final float value) {
+ int bits = Float.floatToIntBits(value);
+ if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2
+ mv.visitInsn(Opcodes.FCONST_0 + (int) value);
+ } else {
+ mv.visitLdcInsn(new Float(value));
+ }
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final double value) {
+ long bits = Double.doubleToLongBits(value);
+ if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d
+ mv.visitInsn(Opcodes.DCONST_0 + (int) value);
+ } else {
+ mv.visitLdcInsn(new Double(value));
+ }
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack. May be <tt>null</tt>.
+ */
+ public void push(final String value) {
+ if (value == null) {
+ mv.visitInsn(Opcodes.ACONST_NULL);
+ } else {
+ mv.visitLdcInsn(value);
+ }
+ }
+
+ /**
+ * Generates the instruction to push the given value on the stack.
+ *
+ * @param value the value to be pushed on the stack.
+ */
+ public void push(final Type value) {
+ if (value == null) {
+ mv.visitInsn(Opcodes.ACONST_NULL);
+ } else {
+ switch (value.getSort()) {
+ case Type.BOOLEAN:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Boolean",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.CHAR:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Character",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.BYTE:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Byte",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.SHORT:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Short",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.INT:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Integer",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.FLOAT:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Float",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.LONG:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Long",
+ "TYPE",
+ CLDESC);
+ break;
+ case Type.DOUBLE:
+ mv.visitFieldInsn(Opcodes.GETSTATIC,
+ "java/lang/Double",
+ "TYPE",
+ CLDESC);
+ break;
+ default:
+ mv.visitLdcInsn(value);
+ }
+ }
+ }
+
+ /**
+ * Generates the instruction to push a handle on the stack.
+ *
+ * @param handle the handle to be pushed on the stack.
+ */
+ public void push(final Handle handle) {
+ mv.visitLdcInsn(handle);
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to load and store method arguments
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the index of the given method argument in the frame's local
+ * variables array.
+ *
+ * @param arg the index of a method argument.
+ * @return the index of the given method argument in the frame's local
+ * variables array.
+ */
+ private int getArgIndex(final int arg) {
+ int index = (access & Opcodes.ACC_STATIC) == 0 ? 1 : 0;
+ for (int i = 0; i < arg; i++) {
+ index += argumentTypes[i].getSize();
+ }
+ return index;
+ }
+
+ /**
+ * Generates the instruction to push a local variable on the stack.
+ *
+ * @param type the type of the local variable to be loaded.
+ * @param index an index in the frame's local variables array.
+ */
+ private void loadInsn(final Type type, final int index) {
+ mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), index);
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in a local
+ * variable.
+ *
+ * @param type the type of the local variable to be stored.
+ * @param index an index in the frame's local variables array.
+ */
+ private void storeInsn(final Type type, final int index) {
+ mv.visitVarInsn(type.getOpcode(Opcodes.ISTORE), index);
+ }
+
+ /**
+ * Generates the instruction to load 'this' on the stack.
+ */
+ public void loadThis() {
+ if ((access & Opcodes.ACC_STATIC) != 0) {
+ throw new IllegalStateException("no 'this' pointer within static method");
+ }
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ }
+
+ /**
+ * Generates the instruction to load the given method argument on the stack.
+ *
+ * @param arg the index of a method argument.
+ */
+ public void loadArg(final int arg) {
+ loadInsn(argumentTypes[arg], getArgIndex(arg));
+ }
+
+ /**
+ * Generates the instructions to load the given method arguments on the
+ * stack.
+ *
+ * @param arg the index of the first method argument to be loaded.
+ * @param count the number of method arguments to be loaded.
+ */
+ public void loadArgs(final int arg, final int count) {
+ int index = getArgIndex(arg);
+ for (int i = 0; i < count; ++i) {
+ Type t = argumentTypes[arg + i];
+ loadInsn(t, index);
+ index += t.getSize();
+ }
+ }
+
+ /**
+ * Generates the instructions to load all the method arguments on the stack.
+ */
+ public void loadArgs() {
+ loadArgs(0, argumentTypes.length);
+ }
+
+ /**
+ * Generates the instructions to load all the method arguments on the stack,
+ * as a single object array.
+ */
+ public void loadArgArray() {
+ push(argumentTypes.length);
+ newArray(OBJECT_TYPE);
+ for (int i = 0; i < argumentTypes.length; i++) {
+ dup();
+ push(i);
+ loadArg(i);
+ box(argumentTypes[i]);
+ arrayStore(OBJECT_TYPE);
+ }
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in the given
+ * method argument.
+ *
+ * @param arg the index of a method argument.
+ */
+ public void storeArg(final int arg) {
+ storeInsn(argumentTypes[arg], getArgIndex(arg));
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to load and store local variables
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the type of the given local variable.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ * @return the type of the given local variable.
+ */
+ public Type getLocalType(final int local) {
+ return localTypes.get(local - firstLocal);
+ }
+
+ @Override
+ protected void setLocalType(final int local, final Type type) {
+ int index = local - firstLocal;
+ while (localTypes.size() < index + 1) {
+ localTypes.add(null);
+ }
+ localTypes.set(index, type);
+ }
+
+ /**
+ * Generates the instruction to load the given local variable on the stack.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ */
+ public void loadLocal(final int local) {
+ loadInsn(getLocalType(local), local);
+ }
+
+ /**
+ * Generates the instruction to load the given local variable on the stack.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ * @param type the type of this local variable.
+ */
+ public void loadLocal(final int local, final Type type) {
+ setLocalType(local, type);
+ loadInsn(type, local);
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in the given local
+ * variable.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ */
+ public void storeLocal(final int local) {
+ storeInsn(getLocalType(local), local);
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in the given local
+ * variable.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ * @param type the type of this local variable.
+ */
+ public void storeLocal(final int local, final Type type) {
+ setLocalType(local, type);
+ storeInsn(type, local);
+ }
+
+ /**
+ * Generates the instruction to load an element from an array.
+ *
+ * @param type the type of the array element to be loaded.
+ */
+ public void arrayLoad(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IALOAD));
+ }
+
+ /**
+ * Generates the instruction to store an element in an array.
+ *
+ * @param type the type of the array element to be stored.
+ */
+ public void arrayStore(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IASTORE));
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to manage the stack
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates a POP instruction.
+ */
+ public void pop() {
+ mv.visitInsn(Opcodes.POP);
+ }
+
+ /**
+ * Generates a POP2 instruction.
+ */
+ public void pop2() {
+ mv.visitInsn(Opcodes.POP2);
+ }
+
+ /**
+ * Generates a DUP instruction.
+ */
+ public void dup() {
+ mv.visitInsn(Opcodes.DUP);
+ }
+
+ /**
+ * Generates a DUP2 instruction.
+ */
+ public void dup2() {
+ mv.visitInsn(Opcodes.DUP2);
+ }
+
+ /**
+ * Generates a DUP_X1 instruction.
+ */
+ public void dupX1() {
+ mv.visitInsn(Opcodes.DUP_X1);
+ }
+
+ /**
+ * Generates a DUP_X2 instruction.
+ */
+ public void dupX2() {
+ mv.visitInsn(Opcodes.DUP_X2);
+ }
+
+ /**
+ * Generates a DUP2_X1 instruction.
+ */
+ public void dup2X1() {
+ mv.visitInsn(Opcodes.DUP2_X1);
+ }
+
+ /**
+ * Generates a DUP2_X2 instruction.
+ */
+ public void dup2X2() {
+ mv.visitInsn(Opcodes.DUP2_X2);
+ }
+
+ /**
+ * Generates a SWAP instruction.
+ */
+ public void swap() {
+ mv.visitInsn(Opcodes.SWAP);
+ }
+
+ /**
+ * Generates the instructions to swap the top two stack values.
+ *
+ * @param prev type of the top - 1 stack value.
+ * @param type type of the top stack value.
+ */
+ public void swap(final Type prev, final Type type) {
+ if (type.getSize() == 1) {
+ if (prev.getSize() == 1) {
+ swap(); // same as dupX1(), pop();
+ } else {
+ dupX2();
+ pop();
+ }
+ } else {
+ if (prev.getSize() == 1) {
+ dup2X1();
+ pop2();
+ } else {
+ dup2X2();
+ pop2();
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to do mathematical and logical operations
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates the instruction to do the specified mathematical or logical
+ * operation.
+ *
+ * @param op a mathematical or logical operation. Must be one of ADD, SUB,
+ * MUL, DIV, REM, NEG, SHL, SHR, USHR, AND, OR, XOR.
+ * @param type the type of the operand(s) for this operation.
+ */
+ public void math(final int op, final Type type) {
+ mv.visitInsn(type.getOpcode(op));
+ }
+
+ /**
+ * Generates the instructions to compute the bitwise negation of the top
+ * stack value.
+ */
+ public void not() {
+ mv.visitInsn(Opcodes.ICONST_1);
+ mv.visitInsn(Opcodes.IXOR);
+ }
+
+ /**
+ * Generates the instruction to increment the given local variable.
+ *
+ * @param local the local variable to be incremented.
+ * @param amount the amount by which the local variable must be incremented.
+ */
+ public void iinc(final int local, final int amount) {
+ mv.visitIincInsn(local, amount);
+ }
+
+ /**
+ * Generates the instructions to cast a numerical value from one type to
+ * another.
+ *
+ * @param from the type of the top stack value
+ * @param to the type into which this value must be cast.
+ */
+ public void cast(final Type from, final Type to) {
+ if (from != to) {
+ if (from == Type.DOUBLE_TYPE) {
+ if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.D2F);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.D2L);
+ } else {
+ mv.visitInsn(Opcodes.D2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else if (from == Type.FLOAT_TYPE) {
+ if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.F2D);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.F2L);
+ } else {
+ mv.visitInsn(Opcodes.F2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else if (from == Type.LONG_TYPE) {
+ if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.L2D);
+ } else if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.L2F);
+ } else {
+ mv.visitInsn(Opcodes.L2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else {
+ if (to == Type.BYTE_TYPE) {
+ mv.visitInsn(Opcodes.I2B);
+ } else if (to == Type.CHAR_TYPE) {
+ mv.visitInsn(Opcodes.I2C);
+ } else if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.I2D);
+ } else if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.I2F);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.I2L);
+ } else if (to == Type.SHORT_TYPE) {
+ mv.visitInsn(Opcodes.I2S);
+ }
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to do boxing and unboxing operations
+ // ------------------------------------------------------------------------
+
+ private static Type getBoxedType(final Type type) {
+ switch (type.getSort()) {
+ case Type.BYTE:
+ return BYTE_TYPE;
+ case Type.BOOLEAN:
+ return BOOLEAN_TYPE;
+ case Type.SHORT:
+ return SHORT_TYPE;
+ case Type.CHAR:
+ return CHARACTER_TYPE;
+ case Type.INT:
+ return INTEGER_TYPE;
+ case Type.FLOAT:
+ return FLOAT_TYPE;
+ case Type.LONG:
+ return LONG_TYPE;
+ case Type.DOUBLE:
+ return DOUBLE_TYPE;
+ }
+ return type;
+ }
+
+ /**
+ * Generates the instructions to box the top stack value. This value is
+ * replaced by its boxed equivalent on top of the stack.
+ *
+ * @param type the type of the top stack value.
+ */
+ public void box(final Type type) {
+ if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+ return;
+ }
+ if (type == Type.VOID_TYPE) {
+ push((String) null);
+ } else {
+ Type boxed = getBoxedType(type);
+ newInstance(boxed);
+ if (type.getSize() == 2) {
+ // Pp -> Ppo -> oPpo -> ooPpo -> ooPp -> o
+ dupX2();
+ dupX2();
+ pop();
+ } else {
+ // p -> po -> opo -> oop -> o
+ dupX1();
+ swap();
+ }
+ invokeConstructor(boxed, new Method("<init>",
+ Type.VOID_TYPE,
+ new Type[] { type }));
+ }
+ }
+
+ /**
+ * Generates the instructions to box the top stack value using Java 5's
+ * valueOf() method. This value is replaced by its boxed equivalent on top
+ * of the stack.
+ *
+ * @param type the type of the top stack value.
+ */
+ public void valueOf(final Type type) {
+ if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+ return;
+ }
+ if (type == Type.VOID_TYPE) {
+ push((String) null);
+ } else {
+ Type boxed = getBoxedType(type);
+ invokeStatic(boxed, new Method("valueOf",
+ boxed,
+ new Type[] { type }));
+ }
+ }
+
+ /**
+ * Generates the instructions to unbox the top stack value. This value is
+ * replaced by its unboxed equivalent on top of the stack.
+ *
+ * @param type the type of the top stack value.
+ */
+ public void unbox(final Type type) {
+ Type t = NUMBER_TYPE;
+ Method sig = null;
+ switch (type.getSort()) {
+ case Type.VOID:
+ return;
+ case Type.CHAR:
+ t = CHARACTER_TYPE;
+ sig = CHAR_VALUE;
+ break;
+ case Type.BOOLEAN:
+ t = BOOLEAN_TYPE;
+ sig = BOOLEAN_VALUE;
+ break;
+ case Type.DOUBLE:
+ sig = DOUBLE_VALUE;
+ break;
+ case Type.FLOAT:
+ sig = FLOAT_VALUE;
+ break;
+ case Type.LONG:
+ sig = LONG_VALUE;
+ break;
+ case Type.INT:
+ case Type.SHORT:
+ case Type.BYTE:
+ sig = INT_VALUE;
+ }
+ if (sig == null) {
+ checkCast(type);
+ } else {
+ checkCast(t);
+ invokeVirtual(t, sig);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to jump to other instructions
+ // ------------------------------------------------------------------------
+
+ /**
+ * Creates a new {@link Label}.
+ *
+ * @return a new {@link Label}.
+ */
+ public Label newLabel() {
+ return new Label();
+ }
+
+ /**
+ * Marks the current code position with the given label.
+ *
+ * @param label a label.
+ */
+ public void mark(final Label label) {
+ mv.visitLabel(label);
+ }
+
+ /**
+ * Marks the current code position with a new label.
+ *
+ * @return the label that was created to mark the current code position.
+ */
+ public Label mark() {
+ Label label = new Label();
+ mv.visitLabel(label);
+ return label;
+ }
+
+ /**
+ * Generates the instructions to jump to a label based on the comparison of
+ * the top two stack values.
+ *
+ * @param type the type of the top two stack values.
+ * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
+ * LE.
+ * @param label where to jump if the comparison result is <tt>true</tt>.
+ */
+ public void ifCmp(final Type type, final int mode, final Label label) {
+ switch (type.getSort()) {
+ case Type.LONG:
+ mv.visitInsn(Opcodes.LCMP);
+ break;
+ case Type.DOUBLE:
+ mv.visitInsn(mode == GE || mode == GT ? Opcodes.DCMPG : Opcodes.DCMPL);
+ break;
+ case Type.FLOAT:
+ mv.visitInsn(mode == GE || mode == GT ? Opcodes.FCMPG : Opcodes.FCMPL);
+ break;
+ case Type.ARRAY:
+ case Type.OBJECT:
+ switch (mode) {
+ case EQ:
+ mv.visitJumpInsn(Opcodes.IF_ACMPEQ, label);
+ return;
+ case NE:
+ mv.visitJumpInsn(Opcodes.IF_ACMPNE, label);
+ return;
+ }
+ throw new IllegalArgumentException("Bad comparison for type "
+ + type);
+ default:
+ int intOp = -1;
+ switch (mode) {
+ case EQ:
+ intOp = Opcodes.IF_ICMPEQ;
+ break;
+ case NE:
+ intOp = Opcodes.IF_ICMPNE;
+ break;
+ case GE:
+ intOp = Opcodes.IF_ICMPGE;
+ break;
+ case LT:
+ intOp = Opcodes.IF_ICMPLT;
+ break;
+ case LE:
+ intOp = Opcodes.IF_ICMPLE;
+ break;
+ case GT:
+ intOp = Opcodes.IF_ICMPGT;
+ break;
+ }
+ mv.visitJumpInsn(intOp, label);
+ return;
+ }
+ mv.visitJumpInsn(mode, label);
+ }
+
+ /**
+ * Generates the instructions to jump to a label based on the comparison of
+ * the top two integer stack values.
+ *
+ * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
+ * LE.
+ * @param label where to jump if the comparison result is <tt>true</tt>.
+ */
+ public void ifICmp(final int mode, final Label label) {
+ ifCmp(Type.INT_TYPE, mode, label);
+ }
+
+ /**
+ * Generates the instructions to jump to a label based on the comparison of
+ * the top integer stack value with zero.
+ *
+ * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
+ * LE.
+ * @param label where to jump if the comparison result is <tt>true</tt>.
+ */
+ public void ifZCmp(final int mode, final Label label) {
+ mv.visitJumpInsn(mode, label);
+ }
+
+ /**
+ * Generates the instruction to jump to the given label if the top stack
+ * value is null.
+ *
+ * @param label where to jump if the condition is <tt>true</tt>.
+ */
+ public void ifNull(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFNULL, label);
+ }
+
+ /**
+ * Generates the instruction to jump to the given label if the top stack
+ * value is not null.
+ *
+ * @param label where to jump if the condition is <tt>true</tt>.
+ */
+ public void ifNonNull(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFNONNULL, label);
+ }
+
+ /**
+ * Generates the instruction to jump to the given label.
+ *
+ * @param label where to jump if the condition is <tt>true</tt>.
+ */
+ public void goTo(final Label label) {
+ mv.visitJumpInsn(Opcodes.GOTO, label);
+ }
+
+ /**
+ * Generates a RET instruction.
+ *
+ * @param local a local variable identifier, as returned by
+ * {@link LocalVariablesSorter#newLocal(Type) newLocal()}.
+ */
+ public void ret(final int local) {
+ mv.visitVarInsn(Opcodes.RET, local);
+ }
+
+ /**
+ * Generates the instructions for a switch statement.
+ *
+ * @param keys the switch case keys.
+ * @param generator a generator to generate the code for the switch cases.
+ */
+ public void tableSwitch(
+ final int[] keys,
+ final TableSwitchGenerator generator)
+ {
+ float density;
+ if (keys.length == 0) {
+ density = 0;
+ } else {
+ density = (float) keys.length
+ / (keys[keys.length - 1] - keys[0] + 1);
+ }
+ tableSwitch(keys, generator, density >= 0.5f);
+ }
+
+ /**
+ * Generates the instructions for a switch statement.
+ *
+ * @param keys the switch case keys.
+ * @param generator a generator to generate the code for the switch cases.
+ * @param useTable <tt>true</tt> to use a TABLESWITCH instruction, or
+ * <tt>false</tt> to use a LOOKUPSWITCH instruction.
+ */
+ public void tableSwitch(
+ final int[] keys,
+ final TableSwitchGenerator generator,
+ final boolean useTable)
+ {
+ for (int i = 1; i < keys.length; ++i) {
+ if (keys[i] < keys[i - 1]) {
+ throw new IllegalArgumentException("keys must be sorted ascending");
+ }
+ }
+ Label def = newLabel();
+ Label end = newLabel();
+ if (keys.length > 0) {
+ int len = keys.length;
+ int min = keys[0];
+ int max = keys[len - 1];
+ int range = max - min + 1;
+ if (useTable) {
+ Label[] labels = new Label[range];
+ Arrays.fill(labels, def);
+ for (int i = 0; i < len; ++i) {
+ labels[keys[i] - min] = newLabel();
+ }
+ mv.visitTableSwitchInsn(min, max, def, labels);
+ for (int i = 0; i < range; ++i) {
+ Label label = labels[i];
+ if (label != def) {
+ mark(label);
+ generator.generateCase(i + min, end);
+ }
+ }
+ } else {
+ Label[] labels = new Label[len];
+ for (int i = 0; i < len; ++i) {
+ labels[i] = newLabel();
+ }
+ mv.visitLookupSwitchInsn(def, keys, labels);
+ for (int i = 0; i < len; ++i) {
+ mark(labels[i]);
+ generator.generateCase(keys[i], end);
+ }
+ }
+ }
+ mark(def);
+ generator.generateDefault();
+ mark(end);
+ }
+
+ /**
+ * Generates the instruction to return the top stack value to the caller.
+ */
+ public void returnValue() {
+ mv.visitInsn(returnType.getOpcode(Opcodes.IRETURN));
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to load and store fields
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates a get field or set field instruction.
+ *
+ * @param opcode the instruction's opcode.
+ * @param ownerType the class in which the field is defined.
+ * @param name the name of the field.
+ * @param fieldType the type of the field.
+ */
+ private void fieldInsn(
+ final int opcode,
+ final Type ownerType,
+ final String name,
+ final Type fieldType)
+ {
+ mv.visitFieldInsn(opcode,
+ ownerType.getInternalName(),
+ name,
+ fieldType.getDescriptor());
+ }
+
+ /**
+ * Generates the instruction to push the value of a static field on the
+ * stack.
+ *
+ * @param owner the class in which the field is defined.
+ * @param name the name of the field.
+ * @param type the type of the field.
+ */
+ public void getStatic(final Type owner, final String name, final Type type)
+ {
+ fieldInsn(Opcodes.GETSTATIC, owner, name, type);
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in a static field.
+ *
+ * @param owner the class in which the field is defined.
+ * @param name the name of the field.
+ * @param type the type of the field.
+ */
+ public void putStatic(final Type owner, final String name, final Type type)
+ {
+ fieldInsn(Opcodes.PUTSTATIC, owner, name, type);
+ }
+
+ /**
+ * Generates the instruction to push the value of a non static field on the
+ * stack.
+ *
+ * @param owner the class in which the field is defined.
+ * @param name the name of the field.
+ * @param type the type of the field.
+ */
+ public void getField(final Type owner, final String name, final Type type) {
+ fieldInsn(Opcodes.GETFIELD, owner, name, type);
+ }
+
+ /**
+ * Generates the instruction to store the top stack value in a non static
+ * field.
+ *
+ * @param owner the class in which the field is defined.
+ * @param name the name of the field.
+ * @param type the type of the field.
+ */
+ public void putField(final Type owner, final String name, final Type type) {
+ fieldInsn(Opcodes.PUTFIELD, owner, name, type);
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to invoke methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates an invoke method instruction.
+ *
+ * @param opcode the instruction's opcode.
+ * @param type the class in which the method is defined.
+ * @param method the method to be invoked.
+ */
+ private void invokeInsn(
+ final int opcode,
+ final Type type,
+ final Method method)
+ {
+ String owner = type.getSort() == Type.ARRAY
+ ? type.getDescriptor()
+ : type.getInternalName();
+ mv.visitMethodInsn(opcode,
+ owner,
+ method.getName(),
+ method.getDescriptor());
+ }
+
+ /**
+ * Generates the instruction to invoke a normal method.
+ *
+ * @param owner the class in which the method is defined.
+ * @param method the method to be invoked.
+ */
+ public void invokeVirtual(final Type owner, final Method method) {
+ invokeInsn(Opcodes.INVOKEVIRTUAL, owner, method);
+ }
+
+ /**
+ * Generates the instruction to invoke a constructor.
+ *
+ * @param type the class in which the constructor is defined.
+ * @param method the constructor to be invoked.
+ */
+ public void invokeConstructor(final Type type, final Method method) {
+ invokeInsn(Opcodes.INVOKESPECIAL, type, method);
+ }
+
+ /**
+ * Generates the instruction to invoke a static method.
+ *
+ * @param owner the class in which the method is defined.
+ * @param method the method to be invoked.
+ */
+ public void invokeStatic(final Type owner, final Method method) {
+ invokeInsn(Opcodes.INVOKESTATIC, owner, method);
+ }
+
+ /**
+ * Generates the instruction to invoke an interface method.
+ *
+ * @param owner the class in which the method is defined.
+ * @param method the method to be invoked.
+ */
+ public void invokeInterface(final Type owner, final Method method) {
+ invokeInsn(Opcodes.INVOKEINTERFACE, owner, method);
+ }
+
+ /**
+ * Generates an invokedynamic instruction.
+ *
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param bsm the bootstrap method.
+ * @param bsmArgs the bootstrap method constant arguments. Each argument
+ * must be an {@link Integer}, {@link Float}, {@link Long},
+ * {@link Double}, {@link String}, {@link Type} or {@link Handle}
+ * value. This method is allowed to modify the content of the array
+ * so a caller should expect that this array may change.
+ */
+ public void invokeDynamic(String name, String desc, Handle bsm, Object... bsmArgs) {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+
+ // ------------------------------------------------------------------------
+ // Instructions to create objects and arrays
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates a type dependent instruction.
+ *
+ * @param opcode the instruction's opcode.
+ * @param type the instruction's operand.
+ */
+ private void typeInsn(final int opcode, final Type type) {
+ mv.visitTypeInsn(opcode, type.getInternalName());
+ }
+
+ /**
+ * Generates the instruction to create a new object.
+ *
+ * @param type the class of the object to be created.
+ */
+ public void newInstance(final Type type) {
+ typeInsn(Opcodes.NEW, type);
+ }
+
+ /**
+ * Generates the instruction to create a new array.
+ *
+ * @param type the type of the array elements.
+ */
+ public void newArray(final Type type) {
+ int typ;
+ switch (type.getSort()) {
+ case Type.BOOLEAN:
+ typ = Opcodes.T_BOOLEAN;
+ break;
+ case Type.CHAR:
+ typ = Opcodes.T_CHAR;
+ break;
+ case Type.BYTE:
+ typ = Opcodes.T_BYTE;
+ break;
+ case Type.SHORT:
+ typ = Opcodes.T_SHORT;
+ break;
+ case Type.INT:
+ typ = Opcodes.T_INT;
+ break;
+ case Type.FLOAT:
+ typ = Opcodes.T_FLOAT;
+ break;
+ case Type.LONG:
+ typ = Opcodes.T_LONG;
+ break;
+ case Type.DOUBLE:
+ typ = Opcodes.T_DOUBLE;
+ break;
+ default:
+ typeInsn(Opcodes.ANEWARRAY, type);
+ return;
+ }
+ mv.visitIntInsn(Opcodes.NEWARRAY, typ);
+ }
+
+ // ------------------------------------------------------------------------
+ // Miscelaneous instructions
+ // ------------------------------------------------------------------------
+
+ /**
+ * Generates the instruction to compute the length of an array.
+ */
+ public void arrayLength() {
+ mv.visitInsn(Opcodes.ARRAYLENGTH);
+ }
+
+ /**
+ * Generates the instruction to throw an exception.
+ */
+ public void throwException() {
+ mv.visitInsn(Opcodes.ATHROW);
+ }
+
+ /**
+ * Generates the instructions to create and throw an exception. The
+ * exception class must have a constructor with a single String argument.
+ *
+ * @param type the class of the exception to be thrown.
+ * @param msg the detailed message of the exception.
+ */
+ public void throwException(final Type type, final String msg) {
+ newInstance(type);
+ dup();
+ push(msg);
+ invokeConstructor(type, Method.getMethod("void <init> (String)"));
+ throwException();
+ }
+
+ /**
+ * Generates the instruction to check that the top stack value is of the
+ * given type.
+ *
+ * @param type a class or interface type.
+ */
+ public void checkCast(final Type type) {
+ if (!type.equals(OBJECT_TYPE)) {
+ typeInsn(Opcodes.CHECKCAST, type);
+ }
+ }
+
+ /**
+ * Generates the instruction to test if the top stack value is of the given
+ * type.
+ *
+ * @param type a class or interface type.
+ */
+ public void instanceOf(final Type type) {
+ typeInsn(Opcodes.INSTANCEOF, type);
+ }
+
+ /**
+ * Generates the instruction to get the monitor of the top stack value.
+ */
+ public void monitorEnter() {
+ mv.visitInsn(Opcodes.MONITORENTER);
+ }
+
+ /**
+ * Generates the instruction to release the monitor of the top stack value.
+ */
+ public void monitorExit() {
+ mv.visitInsn(Opcodes.MONITOREXIT);
+ }
+
+ // ------------------------------------------------------------------------
+ // Non instructions
+ // ------------------------------------------------------------------------
+
+ /**
+ * Marks the end of the visited method.
+ */
+ public void endMethod() {
+ if ((access & Opcodes.ACC_ABSTRACT) == 0) {
+ mv.visitMaxs(0, 0);
+ }
+ mv.visitEnd();
+ }
+
+ /**
+ * Marks the start of an exception handler.
+ *
+ * @param start beginning of the exception handler's scope (inclusive).
+ * @param end end of the exception handler's scope (exclusive).
+ * @param exception internal name of the type of exceptions handled by the
+ * handler.
+ */
+ public void catchException(
+ final Label start,
+ final Label end,
+ final Type exception)
+ {
+ if (exception == null) {
+ mv.visitTryCatchBlock(start, end, mark(), null);
+ } else {
+ mv.visitTryCatchBlock(start, end, mark(), exception.getInternalName());
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
new file mode 100644
index 0000000..e563b23
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
@@ -0,0 +1,1170 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} providing a more detailed API to generate and
+ * transform instructions.
+ *
+ * @author Eric Bruneton
+ */
+public class InstructionAdapter extends MethodVisitor {
+
+ public final static Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
+
+ /**
+ * Creates a new {@link InstructionAdapter}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #InstructionAdapter(int, MethodVisitor)} version.
+ *
+ * @param mv the method visitor to which this adapter delegates calls.
+ */
+ public InstructionAdapter(final MethodVisitor mv) {
+ this(Opcodes.ASM4, mv);
+ }
+
+ /**
+ * Creates a new {@link InstructionAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param mv the method visitor to which this adapter delegates calls.
+ */
+ protected InstructionAdapter(final int api, final MethodVisitor mv) {
+ super(api, mv);
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ switch (opcode) {
+ case Opcodes.NOP:
+ nop();
+ break;
+ case Opcodes.ACONST_NULL:
+ aconst(null);
+ break;
+ case Opcodes.ICONST_M1:
+ case Opcodes.ICONST_0:
+ case Opcodes.ICONST_1:
+ case Opcodes.ICONST_2:
+ case Opcodes.ICONST_3:
+ case Opcodes.ICONST_4:
+ case Opcodes.ICONST_5:
+ iconst(opcode - Opcodes.ICONST_0);
+ break;
+ case Opcodes.LCONST_0:
+ case Opcodes.LCONST_1:
+ lconst(opcode - Opcodes.LCONST_0);
+ break;
+ case Opcodes.FCONST_0:
+ case Opcodes.FCONST_1:
+ case Opcodes.FCONST_2:
+ fconst(opcode - Opcodes.FCONST_0);
+ break;
+ case Opcodes.DCONST_0:
+ case Opcodes.DCONST_1:
+ dconst(opcode - Opcodes.DCONST_0);
+ break;
+ case Opcodes.IALOAD:
+ aload(Type.INT_TYPE);
+ break;
+ case Opcodes.LALOAD:
+ aload(Type.LONG_TYPE);
+ break;
+ case Opcodes.FALOAD:
+ aload(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DALOAD:
+ aload(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.AALOAD:
+ aload(OBJECT_TYPE);
+ break;
+ case Opcodes.BALOAD:
+ aload(Type.BYTE_TYPE);
+ break;
+ case Opcodes.CALOAD:
+ aload(Type.CHAR_TYPE);
+ break;
+ case Opcodes.SALOAD:
+ aload(Type.SHORT_TYPE);
+ break;
+ case Opcodes.IASTORE:
+ astore(Type.INT_TYPE);
+ break;
+ case Opcodes.LASTORE:
+ astore(Type.LONG_TYPE);
+ break;
+ case Opcodes.FASTORE:
+ astore(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DASTORE:
+ astore(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.AASTORE:
+ astore(OBJECT_TYPE);
+ break;
+ case Opcodes.BASTORE:
+ astore(Type.BYTE_TYPE);
+ break;
+ case Opcodes.CASTORE:
+ astore(Type.CHAR_TYPE);
+ break;
+ case Opcodes.SASTORE:
+ astore(Type.SHORT_TYPE);
+ break;
+ case Opcodes.POP:
+ pop();
+ break;
+ case Opcodes.POP2:
+ pop2();
+ break;
+ case Opcodes.DUP:
+ dup();
+ break;
+ case Opcodes.DUP_X1:
+ dupX1();
+ break;
+ case Opcodes.DUP_X2:
+ dupX2();
+ break;
+ case Opcodes.DUP2:
+ dup2();
+ break;
+ case Opcodes.DUP2_X1:
+ dup2X1();
+ break;
+ case Opcodes.DUP2_X2:
+ dup2X2();
+ break;
+ case Opcodes.SWAP:
+ swap();
+ break;
+ case Opcodes.IADD:
+ add(Type.INT_TYPE);
+ break;
+ case Opcodes.LADD:
+ add(Type.LONG_TYPE);
+ break;
+ case Opcodes.FADD:
+ add(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DADD:
+ add(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.ISUB:
+ sub(Type.INT_TYPE);
+ break;
+ case Opcodes.LSUB:
+ sub(Type.LONG_TYPE);
+ break;
+ case Opcodes.FSUB:
+ sub(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DSUB:
+ sub(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.IMUL:
+ mul(Type.INT_TYPE);
+ break;
+ case Opcodes.LMUL:
+ mul(Type.LONG_TYPE);
+ break;
+ case Opcodes.FMUL:
+ mul(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DMUL:
+ mul(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.IDIV:
+ div(Type.INT_TYPE);
+ break;
+ case Opcodes.LDIV:
+ div(Type.LONG_TYPE);
+ break;
+ case Opcodes.FDIV:
+ div(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DDIV:
+ div(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.IREM:
+ rem(Type.INT_TYPE);
+ break;
+ case Opcodes.LREM:
+ rem(Type.LONG_TYPE);
+ break;
+ case Opcodes.FREM:
+ rem(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DREM:
+ rem(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.INEG:
+ neg(Type.INT_TYPE);
+ break;
+ case Opcodes.LNEG:
+ neg(Type.LONG_TYPE);
+ break;
+ case Opcodes.FNEG:
+ neg(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DNEG:
+ neg(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.ISHL:
+ shl(Type.INT_TYPE);
+ break;
+ case Opcodes.LSHL:
+ shl(Type.LONG_TYPE);
+ break;
+ case Opcodes.ISHR:
+ shr(Type.INT_TYPE);
+ break;
+ case Opcodes.LSHR:
+ shr(Type.LONG_TYPE);
+ break;
+ case Opcodes.IUSHR:
+ ushr(Type.INT_TYPE);
+ break;
+ case Opcodes.LUSHR:
+ ushr(Type.LONG_TYPE);
+ break;
+ case Opcodes.IAND:
+ and(Type.INT_TYPE);
+ break;
+ case Opcodes.LAND:
+ and(Type.LONG_TYPE);
+ break;
+ case Opcodes.IOR:
+ or(Type.INT_TYPE);
+ break;
+ case Opcodes.LOR:
+ or(Type.LONG_TYPE);
+ break;
+ case Opcodes.IXOR:
+ xor(Type.INT_TYPE);
+ break;
+ case Opcodes.LXOR:
+ xor(Type.LONG_TYPE);
+ break;
+ case Opcodes.I2L:
+ cast(Type.INT_TYPE, Type.LONG_TYPE);
+ break;
+ case Opcodes.I2F:
+ cast(Type.INT_TYPE, Type.FLOAT_TYPE);
+ break;
+ case Opcodes.I2D:
+ cast(Type.INT_TYPE, Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.L2I:
+ cast(Type.LONG_TYPE, Type.INT_TYPE);
+ break;
+ case Opcodes.L2F:
+ cast(Type.LONG_TYPE, Type.FLOAT_TYPE);
+ break;
+ case Opcodes.L2D:
+ cast(Type.LONG_TYPE, Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.F2I:
+ cast(Type.FLOAT_TYPE, Type.INT_TYPE);
+ break;
+ case Opcodes.F2L:
+ cast(Type.FLOAT_TYPE, Type.LONG_TYPE);
+ break;
+ case Opcodes.F2D:
+ cast(Type.FLOAT_TYPE, Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.D2I:
+ cast(Type.DOUBLE_TYPE, Type.INT_TYPE);
+ break;
+ case Opcodes.D2L:
+ cast(Type.DOUBLE_TYPE, Type.LONG_TYPE);
+ break;
+ case Opcodes.D2F:
+ cast(Type.DOUBLE_TYPE, Type.FLOAT_TYPE);
+ break;
+ case Opcodes.I2B:
+ cast(Type.INT_TYPE, Type.BYTE_TYPE);
+ break;
+ case Opcodes.I2C:
+ cast(Type.INT_TYPE, Type.CHAR_TYPE);
+ break;
+ case Opcodes.I2S:
+ cast(Type.INT_TYPE, Type.SHORT_TYPE);
+ break;
+ case Opcodes.LCMP:
+ lcmp();
+ break;
+ case Opcodes.FCMPL:
+ cmpl(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.FCMPG:
+ cmpg(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DCMPL:
+ cmpl(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.DCMPG:
+ cmpg(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.IRETURN:
+ areturn(Type.INT_TYPE);
+ break;
+ case Opcodes.LRETURN:
+ areturn(Type.LONG_TYPE);
+ break;
+ case Opcodes.FRETURN:
+ areturn(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DRETURN:
+ areturn(Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.ARETURN:
+ areturn(OBJECT_TYPE);
+ break;
+ case Opcodes.RETURN:
+ areturn(Type.VOID_TYPE);
+ break;
+ case Opcodes.ARRAYLENGTH:
+ arraylength();
+ break;
+ case Opcodes.ATHROW:
+ athrow();
+ break;
+ case Opcodes.MONITORENTER:
+ monitorenter();
+ break;
+ case Opcodes.MONITOREXIT:
+ monitorexit();
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ switch (opcode) {
+ case Opcodes.BIPUSH:
+ iconst(operand);
+ break;
+ case Opcodes.SIPUSH:
+ iconst(operand);
+ break;
+ case Opcodes.NEWARRAY:
+ switch (operand) {
+ case Opcodes.T_BOOLEAN:
+ newarray(Type.BOOLEAN_TYPE);
+ break;
+ case Opcodes.T_CHAR:
+ newarray(Type.CHAR_TYPE);
+ break;
+ case Opcodes.T_BYTE:
+ newarray(Type.BYTE_TYPE);
+ break;
+ case Opcodes.T_SHORT:
+ newarray(Type.SHORT_TYPE);
+ break;
+ case Opcodes.T_INT:
+ newarray(Type.INT_TYPE);
+ break;
+ case Opcodes.T_FLOAT:
+ newarray(Type.FLOAT_TYPE);
+ break;
+ case Opcodes.T_LONG:
+ newarray(Type.LONG_TYPE);
+ break;
+ case Opcodes.T_DOUBLE:
+ newarray(Type.DOUBLE_TYPE);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ switch (opcode) {
+ case Opcodes.ILOAD:
+ load(var, Type.INT_TYPE);
+ break;
+ case Opcodes.LLOAD:
+ load(var, Type.LONG_TYPE);
+ break;
+ case Opcodes.FLOAD:
+ load(var, Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DLOAD:
+ load(var, Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.ALOAD:
+ load(var, OBJECT_TYPE);
+ break;
+ case Opcodes.ISTORE:
+ store(var, Type.INT_TYPE);
+ break;
+ case Opcodes.LSTORE:
+ store(var, Type.LONG_TYPE);
+ break;
+ case Opcodes.FSTORE:
+ store(var, Type.FLOAT_TYPE);
+ break;
+ case Opcodes.DSTORE:
+ store(var, Type.DOUBLE_TYPE);
+ break;
+ case Opcodes.ASTORE:
+ store(var, OBJECT_TYPE);
+ break;
+ case Opcodes.RET:
+ ret(var);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ Type t = Type.getObjectType(type);
+ switch (opcode) {
+ case Opcodes.NEW:
+ anew(t);
+ break;
+ case Opcodes.ANEWARRAY:
+ newarray(t);
+ break;
+ case Opcodes.CHECKCAST:
+ checkcast(t);
+ break;
+ case Opcodes.INSTANCEOF:
+ instanceOf(t);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ switch (opcode) {
+ case Opcodes.GETSTATIC:
+ getstatic(owner, name, desc);
+ break;
+ case Opcodes.PUTSTATIC:
+ putstatic(owner, name, desc);
+ break;
+ case Opcodes.GETFIELD:
+ getfield(owner, name, desc);
+ break;
+ case Opcodes.PUTFIELD:
+ putfield(owner, name, desc);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ switch (opcode) {
+ case Opcodes.INVOKESPECIAL:
+ invokespecial(owner, name, desc);
+ break;
+ case Opcodes.INVOKEVIRTUAL:
+ invokevirtual(owner, name, desc);
+ break;
+ case Opcodes.INVOKESTATIC:
+ invokestatic(owner, name, desc);
+ break;
+ case Opcodes.INVOKEINTERFACE:
+ invokeinterface(owner, name, desc);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ invokedynamic(name, desc, bsm, bsmArgs);
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ switch (opcode) {
+ case Opcodes.IFEQ:
+ ifeq(label);
+ break;
+ case Opcodes.IFNE:
+ ifne(label);
+ break;
+ case Opcodes.IFLT:
+ iflt(label);
+ break;
+ case Opcodes.IFGE:
+ ifge(label);
+ break;
+ case Opcodes.IFGT:
+ ifgt(label);
+ break;
+ case Opcodes.IFLE:
+ ifle(label);
+ break;
+ case Opcodes.IF_ICMPEQ:
+ ificmpeq(label);
+ break;
+ case Opcodes.IF_ICMPNE:
+ ificmpne(label);
+ break;
+ case Opcodes.IF_ICMPLT:
+ ificmplt(label);
+ break;
+ case Opcodes.IF_ICMPGE:
+ ificmpge(label);
+ break;
+ case Opcodes.IF_ICMPGT:
+ ificmpgt(label);
+ break;
+ case Opcodes.IF_ICMPLE:
+ ificmple(label);
+ break;
+ case Opcodes.IF_ACMPEQ:
+ ifacmpeq(label);
+ break;
+ case Opcodes.IF_ACMPNE:
+ ifacmpne(label);
+ break;
+ case Opcodes.GOTO:
+ goTo(label);
+ break;
+ case Opcodes.JSR:
+ jsr(label);
+ break;
+ case Opcodes.IFNULL:
+ ifnull(label);
+ break;
+ case Opcodes.IFNONNULL:
+ ifnonnull(label);
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ mark(label);
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ if (cst instanceof Integer) {
+ int val = ((Integer) cst).intValue();
+ iconst(val);
+ } else if (cst instanceof Byte) {
+ int val = ((Byte) cst).intValue();
+ iconst(val);
+ } else if (cst instanceof Character) {
+ int val = ((Character) cst).charValue();
+ iconst(val);
+ } else if (cst instanceof Short) {
+ int val = ((Short) cst).intValue();
+ iconst(val);
+ } else if (cst instanceof Boolean) {
+ int val = ((Boolean) cst).booleanValue() ? 1 : 0;
+ iconst(val);
+ } else if (cst instanceof Float) {
+ float val = ((Float) cst).floatValue();
+ fconst(val);
+ } else if (cst instanceof Long) {
+ long val = ((Long) cst).longValue();
+ lconst(val);
+ } else if (cst instanceof Double) {
+ double val = ((Double) cst).doubleValue();
+ dconst(val);
+ } else if (cst instanceof String) {
+ aconst(cst);
+ } else if (cst instanceof Type) {
+ tconst((Type) cst);
+ } else if (cst instanceof Handle) {
+ hconst((Handle) cst);
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ iinc(var, increment);
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ tableswitch(min, max, dflt, labels);
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ lookupswitch(dflt, keys, labels);
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ multianewarray(desc, dims);
+ }
+
+ // -----------------------------------------------------------------------
+
+ public void nop() {
+ mv.visitInsn(Opcodes.NOP);
+ }
+
+ public void aconst(final Object cst) {
+ if (cst == null) {
+ mv.visitInsn(Opcodes.ACONST_NULL);
+ } else {
+ mv.visitLdcInsn(cst);
+ }
+ }
+
+ public void iconst(final int cst) {
+ if (cst >= -1 && cst <= 5) {
+ mv.visitInsn(Opcodes.ICONST_0 + cst);
+ } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.BIPUSH, cst);
+ } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.SIPUSH, cst);
+ } else {
+ mv.visitLdcInsn(new Integer(cst));
+ }
+ }
+
+ public void lconst(final long cst) {
+ if (cst == 0L || cst == 1L) {
+ mv.visitInsn(Opcodes.LCONST_0 + (int) cst);
+ } else {
+ mv.visitLdcInsn(new Long(cst));
+ }
+ }
+
+ public void fconst(final float cst) {
+ int bits = Float.floatToIntBits(cst);
+ if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2
+ mv.visitInsn(Opcodes.FCONST_0 + (int) cst);
+ } else {
+ mv.visitLdcInsn(new Float(cst));
+ }
+ }
+
+ public void dconst(final double cst) {
+ long bits = Double.doubleToLongBits(cst);
+ if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d
+ mv.visitInsn(Opcodes.DCONST_0 + (int) cst);
+ } else {
+ mv.visitLdcInsn(new Double(cst));
+ }
+ }
+
+ public void tconst(final Type type) {
+ mv.visitLdcInsn(type);
+ }
+
+ public void hconst(final Handle handle) {
+ mv.visitLdcInsn(handle);
+ }
+
+ public void load(final int var, final Type type) {
+ mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), var);
+ }
+
+ public void aload(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IALOAD));
+ }
+
+ public void store(final int var, final Type type) {
+ mv.visitVarInsn(type.getOpcode(Opcodes.ISTORE), var);
+ }
+
+ public void astore(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IASTORE));
+ }
+
+ public void pop() {
+ mv.visitInsn(Opcodes.POP);
+ }
+
+ public void pop2() {
+ mv.visitInsn(Opcodes.POP2);
+ }
+
+ public void dup() {
+ mv.visitInsn(Opcodes.DUP);
+ }
+
+ public void dup2() {
+ mv.visitInsn(Opcodes.DUP2);
+ }
+
+ public void dupX1() {
+ mv.visitInsn(Opcodes.DUP_X1);
+ }
+
+ public void dupX2() {
+ mv.visitInsn(Opcodes.DUP_X2);
+ }
+
+ public void dup2X1() {
+ mv.visitInsn(Opcodes.DUP2_X1);
+ }
+
+ public void dup2X2() {
+ mv.visitInsn(Opcodes.DUP2_X2);
+ }
+
+ public void swap() {
+ mv.visitInsn(Opcodes.SWAP);
+ }
+
+ public void add(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IADD));
+ }
+
+ public void sub(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.ISUB));
+ }
+
+ public void mul(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IMUL));
+ }
+
+ public void div(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IDIV));
+ }
+
+ public void rem(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IREM));
+ }
+
+ public void neg(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.INEG));
+ }
+
+ public void shl(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.ISHL));
+ }
+
+ public void shr(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.ISHR));
+ }
+
+ public void ushr(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IUSHR));
+ }
+
+ public void and(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IAND));
+ }
+
+ public void or(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IOR));
+ }
+
+ public void xor(final Type type) {
+ mv.visitInsn(type.getOpcode(Opcodes.IXOR));
+ }
+
+ public void iinc(final int var, final int increment) {
+ mv.visitIincInsn(var, increment);
+ }
+
+ public void cast(final Type from, final Type to) {
+ if (from != to) {
+ if (from == Type.DOUBLE_TYPE) {
+ if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.D2F);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.D2L);
+ } else {
+ mv.visitInsn(Opcodes.D2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else if (from == Type.FLOAT_TYPE) {
+ if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.F2D);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.F2L);
+ } else {
+ mv.visitInsn(Opcodes.F2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else if (from == Type.LONG_TYPE) {
+ if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.L2D);
+ } else if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.L2F);
+ } else {
+ mv.visitInsn(Opcodes.L2I);
+ cast(Type.INT_TYPE, to);
+ }
+ } else {
+ if (to == Type.BYTE_TYPE) {
+ mv.visitInsn(Opcodes.I2B);
+ } else if (to == Type.CHAR_TYPE) {
+ mv.visitInsn(Opcodes.I2C);
+ } else if (to == Type.DOUBLE_TYPE) {
+ mv.visitInsn(Opcodes.I2D);
+ } else if (to == Type.FLOAT_TYPE) {
+ mv.visitInsn(Opcodes.I2F);
+ } else if (to == Type.LONG_TYPE) {
+ mv.visitInsn(Opcodes.I2L);
+ } else if (to == Type.SHORT_TYPE) {
+ mv.visitInsn(Opcodes.I2S);
+ }
+ }
+ }
+ }
+
+ public void lcmp() {
+ mv.visitInsn(Opcodes.LCMP);
+ }
+
+ public void cmpl(final Type type) {
+ mv.visitInsn(type == Type.FLOAT_TYPE ? Opcodes.FCMPL : Opcodes.DCMPL);
+ }
+
+ public void cmpg(final Type type) {
+ mv.visitInsn(type == Type.FLOAT_TYPE ? Opcodes.FCMPG : Opcodes.DCMPG);
+ }
+
+ public void ifeq(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFEQ, label);
+ }
+
+ public void ifne(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFNE, label);
+ }
+
+ public void iflt(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFLT, label);
+ }
+
+ public void ifge(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFGE, label);
+ }
+
+ public void ifgt(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFGT, label);
+ }
+
+ public void ifle(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFLE, label);
+ }
+
+ public void ificmpeq(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPEQ, label);
+ }
+
+ public void ificmpne(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPNE, label);
+ }
+
+ public void ificmplt(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPLT, label);
+ }
+
+ public void ificmpge(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPGE, label);
+ }
+
+ public void ificmpgt(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPGT, label);
+ }
+
+ public void ificmple(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ICMPLE, label);
+ }
+
+ public void ifacmpeq(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ACMPEQ, label);
+ }
+
+ public void ifacmpne(final Label label) {
+ mv.visitJumpInsn(Opcodes.IF_ACMPNE, label);
+ }
+
+ public void goTo(final Label label) {
+ mv.visitJumpInsn(Opcodes.GOTO, label);
+ }
+
+ public void jsr(final Label label) {
+ mv.visitJumpInsn(Opcodes.JSR, label);
+ }
+
+ public void ret(final int var) {
+ mv.visitVarInsn(Opcodes.RET, var);
+ }
+
+ public void tableswitch(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ mv.visitTableSwitchInsn(min, max, dflt, labels);
+ }
+
+ public void lookupswitch(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ mv.visitLookupSwitchInsn(dflt, keys, labels);
+ }
+
+ public void areturn(final Type t) {
+ mv.visitInsn(t.getOpcode(Opcodes.IRETURN));
+ }
+
+ public void getstatic(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitFieldInsn(Opcodes.GETSTATIC, owner, name, desc);
+ }
+
+ public void putstatic(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitFieldInsn(Opcodes.PUTSTATIC, owner, name, desc);
+ }
+
+ public void getfield(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitFieldInsn(Opcodes.GETFIELD, owner, name, desc);
+ }
+
+ public void putfield(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitFieldInsn(Opcodes.PUTFIELD, owner, name, desc);
+ }
+
+ public void invokevirtual(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, owner, name, desc);
+ }
+
+ public void invokespecial(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, owner, name, desc);
+ }
+
+ public void invokestatic(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, desc);
+ }
+
+ public void invokeinterface(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, owner, name, desc);
+ }
+
+ public void invokedynamic(
+ String name,
+ String desc,
+ Handle bsm,
+ Object[] bsmArgs)
+ {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+
+ public void anew(final Type type) {
+ mv.visitTypeInsn(Opcodes.NEW, type.getInternalName());
+ }
+
+ public void newarray(final Type type) {
+ int typ;
+ switch (type.getSort()) {
+ case Type.BOOLEAN:
+ typ = Opcodes.T_BOOLEAN;
+ break;
+ case Type.CHAR:
+ typ = Opcodes.T_CHAR;
+ break;
+ case Type.BYTE:
+ typ = Opcodes.T_BYTE;
+ break;
+ case Type.SHORT:
+ typ = Opcodes.T_SHORT;
+ break;
+ case Type.INT:
+ typ = Opcodes.T_INT;
+ break;
+ case Type.FLOAT:
+ typ = Opcodes.T_FLOAT;
+ break;
+ case Type.LONG:
+ typ = Opcodes.T_LONG;
+ break;
+ case Type.DOUBLE:
+ typ = Opcodes.T_DOUBLE;
+ break;
+ default:
+ mv.visitTypeInsn(Opcodes.ANEWARRAY, type.getInternalName());
+ return;
+ }
+ mv.visitIntInsn(Opcodes.NEWARRAY, typ);
+ }
+
+ public void arraylength() {
+ mv.visitInsn(Opcodes.ARRAYLENGTH);
+ }
+
+ public void athrow() {
+ mv.visitInsn(Opcodes.ATHROW);
+ }
+
+ public void checkcast(final Type type) {
+ mv.visitTypeInsn(Opcodes.CHECKCAST, type.getInternalName());
+ }
+
+ public void instanceOf(final Type type) {
+ mv.visitTypeInsn(Opcodes.INSTANCEOF, type.getInternalName());
+ }
+
+ public void monitorenter() {
+ mv.visitInsn(Opcodes.MONITORENTER);
+ }
+
+ public void monitorexit() {
+ mv.visitInsn(Opcodes.MONITOREXIT);
+ }
+
+ public void multianewarray(final String desc, final int dims) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ }
+
+ public void ifnull(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFNULL, label);
+ }
+
+ public void ifnonnull(final Label label) {
+ mv.visitJumpInsn(Opcodes.IFNONNULL, label);
+ }
+
+ public void mark(final Label label) {
+ mv.visitLabel(label);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
new file mode 100644
index 0000000..b8da61d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
@@ -0,0 +1,770 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InsnList;
+import jdk.internal.org.objectweb.asm.tree.InsnNode;
+import jdk.internal.org.objectweb.asm.tree.JumpInsnNode;
+import jdk.internal.org.objectweb.asm.tree.LabelNode;
+import jdk.internal.org.objectweb.asm.tree.LocalVariableNode;
+import jdk.internal.org.objectweb.asm.tree.LookupSwitchInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodNode;
+import jdk.internal.org.objectweb.asm.tree.TableSwitchInsnNode;
+import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
+
+/**
+ * A {@link jdk.internal.org.objectweb.asm.MethodVisitor} that removes JSR instructions and
+ * inlines the referenced subroutines.
+ *
+ * <b>Explanation of how it works</b> TODO
+ *
+ * @author Niko Matsakis
+ */
+public class JSRInlinerAdapter extends MethodNode implements Opcodes {
+
+ private static final boolean LOGGING = false;
+
+ /**
+ * For each label that is jumped to by a JSR, we create a BitSet
+ * instance.
+ */
+ private final Map<LabelNode,BitSet> subroutineHeads = new HashMap<LabelNode,BitSet>();
+
+ /**
+ * This subroutine instance denotes the line of execution that is not
+ * contained within any subroutine; i.e., the "subroutine" that is executing
+ * when a method first begins.
+ */
+ private final BitSet mainSubroutine = new BitSet();
+
+ /**
+ * This BitSet contains the index of every instruction that belongs to more
+ * than one subroutine. This should not happen often.
+ */
+ final BitSet dualCitizens = new BitSet();
+
+ /**
+ * Creates a new JSRInliner. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #JSRInlinerAdapter(int, MethodVisitor, int, String, String, String, String[])}
+ * version.
+ *
+ * @param mv the <code>MethodVisitor</code> to send the resulting inlined
+ * method code to (use <code>null</code> for none).
+ * @param access the method's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the method is synthetic and/or
+ * deprecated.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type}).
+ * @param signature the method's signature. May be <tt>null</tt>.
+ * @param exceptions the internal names of the method's exception classes
+ * (see {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ */
+ public JSRInlinerAdapter(
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ this(Opcodes.ASM4, mv, access, name, desc, signature, exceptions);
+ }
+
+ /**
+ * Creates a new JSRInliner.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param mv the <code>MethodVisitor</code> to send the resulting inlined
+ * method code to (use <code>null</code> for none).
+ * @param access the method's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the method is synthetic and/or
+ * deprecated.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type}).
+ * @param signature the method's signature. May be <tt>null</tt>.
+ * @param exceptions the internal names of the method's exception classes
+ * (see {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ */
+ protected JSRInlinerAdapter(
+ final int api,
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ super(api, access, name, desc, signature, exceptions);
+ this.mv = mv;
+ }
+
+ /**
+ * Detects a JSR instruction and sets a flag to indicate we will need to do
+ * inlining.
+ */
+ @Override
+ public void visitJumpInsn(final int opcode, final Label lbl) {
+ super.visitJumpInsn(opcode, lbl);
+ LabelNode ln = ((JumpInsnNode) instructions.getLast()).label;
+ if (opcode == JSR && !subroutineHeads.containsKey(ln)) {
+ subroutineHeads.put(ln, new BitSet());
+ }
+ }
+
+ /**
+ * If any JSRs were seen, triggers the inlining process. Otherwise, forwards
+ * the byte codes untouched.
+ */
+ @Override
+ public void visitEnd() {
+ if (!subroutineHeads.isEmpty()) {
+ markSubroutines();
+ if (LOGGING) {
+ log(mainSubroutine.toString());
+ Iterator<BitSet> it = subroutineHeads.values().iterator();
+ while (it.hasNext()) {
+ BitSet sub = it.next();
+ log(sub.toString());
+ }
+ }
+ emitCode();
+ }
+
+ // Forward the translate opcodes on if appropriate:
+ if (mv != null) {
+ accept(mv);
+ }
+ }
+
+ /**
+ * Walks the method and determines which internal subroutine(s), if any,
+ * each instruction is a method of.
+ */
+ private void markSubroutines() {
+ BitSet anyvisited = new BitSet();
+
+ // First walk the main subroutine and find all those instructions which
+ // can be reached without invoking any JSR at all
+ markSubroutineWalk(mainSubroutine, 0, anyvisited);
+
+ // Go through the head of each subroutine and find any nodes reachable
+ // to that subroutine without following any JSR links.
+ for (Iterator<Map.Entry<LabelNode,BitSet>> it = subroutineHeads.entrySet().iterator(); it.hasNext();)
+ {
+ Map.Entry<LabelNode,BitSet> entry = it.next();
+ LabelNode lab = entry.getKey();
+ BitSet sub = entry.getValue();
+ int index = instructions.indexOf(lab);
+ markSubroutineWalk(sub, index, anyvisited);
+ }
+ }
+
+ /**
+ * Performs a depth first search walking the normal byte code path starting
+ * at <code>index</code>, and adding each instruction encountered into
+ * the subroutine <code>sub</code>. After this walk is complete, iterates
+ * over the exception handlers to ensure that we also include those byte
+ * codes which are reachable through an exception that may be thrown during
+ * the execution of the subroutine. Invoked from
+ * <code>markSubroutines()</code>.
+ *
+ * @param sub the subroutine whose instructions must be computed.
+ * @param index an instruction of this subroutine.
+ * @param anyvisited indexes of the already visited instructions, i.e.
+ * marked as part of this subroutine or any previously computed
+ * subroutine.
+ */
+ private void markSubroutineWalk(
+ final BitSet sub,
+ final int index,
+ final BitSet anyvisited)
+ {
+ if (LOGGING) {
+ log("markSubroutineWalk: sub=" + sub + " index=" + index);
+ }
+
+ // First find those instructions reachable via normal execution
+ markSubroutineWalkDFS(sub, index, anyvisited);
+
+ // Now, make sure we also include any applicable exception handlers
+ boolean loop = true;
+ while (loop) {
+ loop = false;
+ for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it.hasNext();) {
+ TryCatchBlockNode trycatch = it.next();
+
+ if (LOGGING) {
+ // TODO use of default toString().
+ log("Scanning try/catch " + trycatch);
+ }
+
+ // If the handler has already been processed, skip it.
+ int handlerindex = instructions.indexOf(trycatch.handler);
+ if (sub.get(handlerindex)) {
+ continue;
+ }
+
+ int startindex = instructions.indexOf(trycatch.start);
+ int endindex = instructions.indexOf(trycatch.end);
+ int nextbit = sub.nextSetBit(startindex);
+ if (nextbit != -1 && nextbit < endindex) {
+ if (LOGGING) {
+ log("Adding exception handler: " + startindex + '-'
+ + endindex + " due to " + nextbit + " handler "
+ + handlerindex);
+ }
+ markSubroutineWalkDFS(sub, handlerindex, anyvisited);
+ loop = true;
+ }
+ }
+ }
+ }
+
+ /**
+ * Performs a simple DFS of the instructions, assigning each to the
+ * subroutine <code>sub</code>. Starts from <code>index</code>.
+ * Invoked only by <code>markSubroutineWalk()</code>.
+ *
+ * @param sub the subroutine whose instructions must be computed.
+ * @param index an instruction of this subroutine.
+ * @param anyvisited indexes of the already visited instructions, i.e.
+ * marked as part of this subroutine or any previously computed
+ * subroutine.
+ */
+ private void markSubroutineWalkDFS(
+ final BitSet sub,
+ int index,
+ final BitSet anyvisited)
+ {
+ while (true) {
+ AbstractInsnNode node = instructions.get(index);
+
+ // don't visit a node twice
+ if (sub.get(index)) {
+ return;
+ }
+ sub.set(index);
+
+ // check for those nodes already visited by another subroutine
+ if (anyvisited.get(index)) {
+ dualCitizens.set(index);
+ if (LOGGING) {
+ log("Instruction #" + index + " is dual citizen.");
+ }
+ }
+ anyvisited.set(index);
+
+ if (node.getType() == AbstractInsnNode.JUMP_INSN
+ && node.getOpcode() != JSR)
+ {
+ // we do not follow recursively called subroutines here; but any
+ // other sort of branch we do follow
+ JumpInsnNode jnode = (JumpInsnNode) node;
+ int destidx = instructions.indexOf(jnode.label);
+ markSubroutineWalkDFS(sub, destidx, anyvisited);
+ }
+ if (node.getType() == AbstractInsnNode.TABLESWITCH_INSN) {
+ TableSwitchInsnNode tsnode = (TableSwitchInsnNode) node;
+ int destidx = instructions.indexOf(tsnode.dflt);
+ markSubroutineWalkDFS(sub, destidx, anyvisited);
+ for (int i = tsnode.labels.size() - 1; i >= 0; --i) {
+ LabelNode l = tsnode.labels.get(i);
+ destidx = instructions.indexOf(l);
+ markSubroutineWalkDFS(sub, destidx, anyvisited);
+ }
+ }
+ if (node.getType() == AbstractInsnNode.LOOKUPSWITCH_INSN) {
+ LookupSwitchInsnNode lsnode = (LookupSwitchInsnNode) node;
+ int destidx = instructions.indexOf(lsnode.dflt);
+ markSubroutineWalkDFS(sub, destidx, anyvisited);
+ for (int i = lsnode.labels.size() - 1; i >= 0; --i) {
+ LabelNode l = lsnode.labels.get(i);
+ destidx = instructions.indexOf(l);
+ markSubroutineWalkDFS(sub, destidx, anyvisited);
+ }
+ }
+
+ // check to see if this opcode falls through to the next instruction
+ // or not; if not, return.
+ switch (instructions.get(index).getOpcode()) {
+ case GOTO:
+ case RET:
+ case TABLESWITCH:
+ case LOOKUPSWITCH:
+ case IRETURN:
+ case LRETURN:
+ case FRETURN:
+ case DRETURN:
+ case ARETURN:
+ case RETURN:
+ case ATHROW:
+ /*
+ * note: this either returns from this subroutine, or a
+ * parent subroutine which invoked it
+ */
+ return;
+ }
+
+ // Use tail recursion here in the form of an outer while loop to
+ // avoid our stack growing needlessly:
+ index++;
+ }
+ }
+
+ /**
+ * Creates the new instructions, inlining each instantiation of each
+ * subroutine until the code is fully elaborated.
+ */
+ private void emitCode() {
+ LinkedList<Instantiation> worklist = new LinkedList<Instantiation>();
+ // Create an instantiation of the "root" subroutine, which is just the
+ // main routine
+ worklist.add(new Instantiation(null, mainSubroutine));
+
+ // Emit instantiations of each subroutine we encounter, including the
+ // main subroutine
+ InsnList newInstructions = new InsnList();
+ List<TryCatchBlockNode> newTryCatchBlocks = new ArrayList<TryCatchBlockNode>();
+ List<LocalVariableNode> newLocalVariables = new ArrayList<LocalVariableNode>();
+ while (!worklist.isEmpty()) {
+ Instantiation inst = worklist.removeFirst();
+ emitSubroutine(inst,
+ worklist,
+ newInstructions,
+ newTryCatchBlocks,
+ newLocalVariables);
+ }
+ instructions = newInstructions;
+ tryCatchBlocks = newTryCatchBlocks;
+ localVariables = newLocalVariables;
+ }
+
+ /**
+ * Emits one instantiation of one subroutine, specified by
+ * <code>instant</code>. May add new instantiations that are invoked by
+ * this one to the <code>worklist</code> parameter, and new try/catch
+ * blocks to <code>newTryCatchBlocks</code>.
+ *
+ * @param instant the instantiation that must be performed.
+ * @param worklist list of the instantiations that remain to be done.
+ * @param newInstructions the instruction list to which the instantiated
+ * code must be appended.
+ * @param newTryCatchBlocks the exception handler list to which the
+ * instantiated handlers must be appended.
+ */
+ private void emitSubroutine(
+ final Instantiation instant,
+ final List<Instantiation> worklist,
+ final InsnList newInstructions,
+ final List<TryCatchBlockNode> newTryCatchBlocks,
+ final List<LocalVariableNode> newLocalVariables)
+ {
+ LabelNode duplbl = null;
+
+ if (LOGGING) {
+ log("--------------------------------------------------------");
+ log("Emitting instantiation of subroutine " + instant.subroutine);
+ }
+
+ // Emit the relevant instructions for this instantiation, translating
+ // labels and jump targets as we go:
+ for (int i = 0, c = instructions.size(); i < c; i++) {
+ AbstractInsnNode insn = instructions.get(i);
+ Instantiation owner = instant.findOwner(i);
+
+ // Always remap labels:
+ if (insn.getType() == AbstractInsnNode.LABEL) {
+ // Translate labels into their renamed equivalents.
+ // Avoid adding the same label more than once. Note
+ // that because we own this instruction the gotoTable
+ // and the rangeTable will always agree.
+ LabelNode ilbl = (LabelNode) insn;
+ LabelNode remap = instant.rangeLabel(ilbl);
+ if (LOGGING) {
+ // TODO use of default toString().
+ log("Translating lbl #" + i + ':' + ilbl + " to " + remap);
+ }
+ if (remap != duplbl) {
+ newInstructions.add(remap);
+ duplbl = remap;
+ }
+ continue;
+ }
+
+ // We don't want to emit instructions that were already
+ // emitted by a subroutine higher on the stack. Note that
+ // it is still possible for a given instruction to be
+ // emitted twice because it may belong to two subroutines
+ // that do not invoke each other.
+ if (owner != instant) {
+ continue;
+ }
+
+ if (LOGGING) {
+ log("Emitting inst #" + i);
+ }
+
+ if (insn.getOpcode() == RET) {
+ // Translate RET instruction(s) to a jump to the return label
+ // for the appropriate instantiation. The problem is that the
+ // subroutine may "fall through" to the ret of a parent
+ // subroutine; therefore, to find the appropriate ret label we
+ // find the lowest subroutine on the stack that claims to own
+ // this instruction. See the class javadoc comment for an
+ // explanation on why this technique is safe (note: it is only
+ // safe if the input is verifiable).
+ LabelNode retlabel = null;
+ for (Instantiation p = instant; p != null; p = p.previous) {
+ if (p.subroutine.get(i)) {
+ retlabel = p.returnLabel;
+ }
+ }
+ if (retlabel == null) {
+ // This is only possible if the mainSubroutine owns a RET
+ // instruction, which should never happen for verifiable
+ // code.
+ throw new RuntimeException("Instruction #" + i
+ + " is a RET not owned by any subroutine");
+ }
+ newInstructions.add(new JumpInsnNode(GOTO, retlabel));
+ } else if (insn.getOpcode() == JSR) {
+ LabelNode lbl = ((JumpInsnNode) insn).label;
+ BitSet sub = subroutineHeads.get(lbl);
+ Instantiation newinst = new Instantiation(instant, sub);
+ LabelNode startlbl = newinst.gotoLabel(lbl);
+
+ if (LOGGING) {
+ log(" Creating instantiation of subr " + sub);
+ }
+
+ // Rather than JSRing, we will jump to the inline version and
+ // push NULL for what was once the return value. This hack
+ // allows us to avoid doing any sort of data flow analysis to
+ // figure out which instructions manipulate the old return value
+ // pointer which is now known to be unneeded.
+ newInstructions.add(new InsnNode(ACONST_NULL));
+ newInstructions.add(new JumpInsnNode(GOTO, startlbl));
+ newInstructions.add(newinst.returnLabel);
+
+ // Insert this new instantiation into the queue to be emitted
+ // later.
+ worklist.add(newinst);
+ } else {
+ newInstructions.add(insn.clone(instant));
+ }
+ }
+
+ // Emit try/catch blocks that are relevant to this method.
+ for (Iterator<TryCatchBlockNode> it = tryCatchBlocks.iterator(); it.hasNext();) {
+ TryCatchBlockNode trycatch = it.next();
+
+ if (LOGGING) {
+ // TODO use of default toString().
+ log("try catch block original labels=" + trycatch.start + '-'
+ + trycatch.end + "->" + trycatch.handler);
+ }
+
+ final LabelNode start = instant.rangeLabel(trycatch.start);
+ final LabelNode end = instant.rangeLabel(trycatch.end);
+
+ // Ignore empty try/catch regions
+ if (start == end) {
+ if (LOGGING) {
+ log(" try catch block empty in this subroutine");
+ }
+ continue;
+ }
+
+ final LabelNode handler = instant.gotoLabel(trycatch.handler);
+
+ if (LOGGING) {
+ // TODO use of default toString().
+ log(" try catch block new labels=" + start + '-' + end + "->"
+ + handler);
+ }
+
+ if (start == null || end == null || handler == null) {
+ throw new RuntimeException("Internal error!");
+ }
+
+ newTryCatchBlocks.add(new TryCatchBlockNode(start,
+ end,
+ handler,
+ trycatch.type));
+ }
+
+ for (Iterator<LocalVariableNode> it = localVariables.iterator(); it.hasNext();) {
+ LocalVariableNode lvnode = it.next();
+ if (LOGGING) {
+ log("local var " + lvnode.name);
+ }
+ final LabelNode start = instant.rangeLabel(lvnode.start);
+ final LabelNode end = instant.rangeLabel(lvnode.end);
+ if (start == end) {
+ if (LOGGING) {
+ log(" local variable empty in this sub");
+ }
+ continue;
+ }
+ newLocalVariables.add(new LocalVariableNode(lvnode.name,
+ lvnode.desc,
+ lvnode.signature,
+ start,
+ end,
+ lvnode.index));
+ }
+ }
+
+ private static void log(final String str) {
+ System.err.println(str);
+ }
+
+ /**
+ * A class that represents an instantiation of a subroutine. Each
+ * instantiation has an associate "stack" --- which is a listing of those
+ * instantiations that were active when this particular instance of this
+ * subroutine was invoked. Each instantiation also has a map from the
+ * original labels of the program to the labels appropriate for this
+ * instantiation, and finally a label to return to.
+ */
+ private class Instantiation extends AbstractMap<LabelNode, LabelNode> {
+
+ /**
+ * Previous instantiations; the stack must be statically predictable to
+ * be inlinable.
+ */
+ final Instantiation previous;
+
+ /**
+ * The subroutine this is an instantiation of.
+ */
+ public final BitSet subroutine;
+
+ /**
+ * This table maps Labels from the original source to Labels pointing at
+ * code specific to this instantiation, for use in remapping try/catch
+ * blocks,as well as gotos.
+ *
+ * Note that in the presence of dual citizens instructions, that is,
+ * instructions which belong to more than one subroutine due to the
+ * merging of control flow without a RET instruction, we will map the
+ * target label of a GOTO to the label used by the instantiation lowest
+ * on the stack. This avoids code duplication during inlining in most
+ * cases.
+ *
+ * @see #findOwner(int)
+ */
+ public final Map<LabelNode, LabelNode> rangeTable = new HashMap<LabelNode, LabelNode>();
+
+ /**
+ * All returns for this instantiation will be mapped to this label
+ */
+ public final LabelNode returnLabel;
+
+ Instantiation(final Instantiation prev, final BitSet sub) {
+ previous = prev;
+ subroutine = sub;
+ for (Instantiation p = prev; p != null; p = p.previous) {
+ if (p.subroutine == sub) {
+ throw new RuntimeException("Recursive invocation of " + sub);
+ }
+ }
+
+ // Determine the label to return to when this subroutine terminates
+ // via RET: note that the main subroutine never terminates via RET.
+ if (prev != null) {
+ returnLabel = new LabelNode();
+ } else {
+ returnLabel = null;
+ }
+
+ // Each instantiation will remap the labels from the code above to
+ // refer to its particular copy of its own instructions. Note that
+ // we collapse labels which point at the same instruction into one:
+ // this is fairly common as we are often ignoring large chunks of
+ // instructions, so what were previously distinct labels become
+ // duplicates.
+ LabelNode duplbl = null;
+ for (int i = 0, c = instructions.size(); i < c; i++) {
+ AbstractInsnNode insn = instructions.get(i);
+
+ if (insn.getType() == AbstractInsnNode.LABEL) {
+ LabelNode ilbl = (LabelNode) insn;
+
+ if (duplbl == null) {
+ // if we already have a label pointing at this spot,
+ // don't recreate it.
+ duplbl = new LabelNode();
+ }
+
+ // Add an entry in the rangeTable for every label
+ // in the original code which points at the next
+ // instruction of our own to be emitted.
+ rangeTable.put(ilbl, duplbl);
+ } else if (findOwner(i) == this) {
+ // We will emit this instruction, so clear the 'duplbl' flag
+ // since the next Label will refer to a distinct
+ // instruction.
+ duplbl = null;
+ }
+ }
+ }
+
+ /**
+ * Returns the "owner" of a particular instruction relative to this
+ * instantiation: the owner referes to the Instantiation which will emit
+ * the version of this instruction that we will execute.
+ *
+ * Typically, the return value is either <code>this</code> or
+ * <code>null</code>. <code>this</code> indicates that this
+ * instantiation will generate the version of this instruction that we
+ * will execute, and <code>null</code> indicates that this
+ * instantiation never executes the given instruction.
+ *
+ * Sometimes, however, an instruction can belong to multiple
+ * subroutines; this is called a "dual citizen" instruction (though it
+ * may belong to more than 2 subroutines), and occurs when multiple
+ * subroutines branch to common points of control. In this case, the
+ * owner is the subroutine that appears lowest on the stack, and which
+ * also owns the instruction in question.
+ *
+ * @param i the index of the instruction in the original code
+ * @return the "owner" of a particular instruction relative to this
+ * instantiation.
+ */
+ public Instantiation findOwner(final int i) {
+ if (!subroutine.get(i)) {
+ return null;
+ }
+ if (!dualCitizens.get(i)) {
+ return this;
+ }
+ Instantiation own = this;
+ for (Instantiation p = previous; p != null; p = p.previous) {
+ if (p.subroutine.get(i)) {
+ own = p;
+ }
+ }
+ return own;
+ }
+
+ /**
+ * Looks up the label <code>l</code> in the <code>gotoTable</code>,
+ * thus translating it from a Label in the original code, to a Label in
+ * the inlined code that is appropriate for use by an instruction that
+ * branched to the original label.
+ *
+ * @param l The label we will be translating
+ * @return a label for use by a branch instruction in the inlined code
+ * @see #rangeLabel
+ */
+ public LabelNode gotoLabel(final LabelNode l) {
+ // owner should never be null, because owner is only null
+ // if an instruction cannot be reached from this subroutine
+ Instantiation owner = findOwner(instructions.indexOf(l));
+ return owner.rangeTable.get(l);
+ }
+
+ /**
+ * Looks up the label <code>l</code> in the <code>rangeTable</code>,
+ * thus translating it from a Label in the original code, to a Label in
+ * the inlined code that is appropriate for use by an try/catch or
+ * variable use annotation.
+ *
+ * @param l The label we will be translating
+ * @return a label for use by a try/catch or variable annotation in the
+ * original code
+ * @see #rangeTable
+ */
+ public LabelNode rangeLabel(final LabelNode l) {
+ return rangeTable.get(l);
+ }
+
+ // AbstractMap implementation
+
+ @Override
+ public Set<Map.Entry<LabelNode, LabelNode>> entrySet() {
+ return null;
+ }
+
+ @Override
+ public LabelNode get(final Object o) {
+ return gotoLabel((LabelNode) o);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
new file mode 100644
index 0000000..54d67a8
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
@@ -0,0 +1,371 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link MethodVisitor} that renumbers local variables in their order of
+ * appearance. This adapter allows one to easily add new local variables to a
+ * method. It may be used by inheriting from this class, but the preferred way
+ * of using it is via delegation: the next visitor in the chain can indeed add
+ * new locals when needed by calling {@link #newLocal} on this adapter (this
+ * requires a reference back to this {@link LocalVariablesSorter}).
+ *
+ * @author Chris Nokleberg
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public class LocalVariablesSorter extends MethodVisitor {
+
+ private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
+
+ /**
+ * Mapping from old to new local variable indexes. A local variable at index
+ * i of size 1 is remapped to 'mapping[2*i]', while a local variable at
+ * index i of size 2 is remapped to 'mapping[2*i+1]'.
+ */
+ private int[] mapping = new int[40];
+
+ /**
+ * Array used to store stack map local variable types after remapping.
+ */
+ private Object[] newLocals = new Object[20];
+
+ /**
+ * Index of the first local variable, after formal parameters.
+ */
+ protected final int firstLocal;
+
+ /**
+ * Index of the next local variable to be created by {@link #newLocal}.
+ */
+ protected int nextLocal;
+
+ /**
+ * Indicates if at least one local variable has moved due to remapping.
+ */
+ private boolean changed;
+
+ /**
+ * Creates a new {@link LocalVariablesSorter}. <i>Subclasses must not use
+ * this constructor</i>. Instead, they must use the
+ * {@link #LocalVariablesSorter(int, int, String, MethodVisitor)} version.
+ *
+ * @param access access flags of the adapted method.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param mv the method visitor to which this adapter delegates calls.
+ */
+ public LocalVariablesSorter(
+ final int access,
+ final String desc,
+ final MethodVisitor mv)
+ {
+ this(Opcodes.ASM4, access, desc, mv);
+ }
+
+ /**
+ * Creates a new {@link LocalVariablesSorter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param access access flags of the adapted method.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param mv the method visitor to which this adapter delegates calls.
+ */
+ protected LocalVariablesSorter(
+ final int api,
+ final int access,
+ final String desc,
+ final MethodVisitor mv)
+ {
+ super(api, mv);
+ Type[] args = Type.getArgumentTypes(desc);
+ nextLocal = (Opcodes.ACC_STATIC & access) == 0 ? 1 : 0;
+ for (int i = 0; i < args.length; i++) {
+ nextLocal += args[i].getSize();
+ }
+ firstLocal = nextLocal;
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ Type type;
+ switch (opcode) {
+ case Opcodes.LLOAD:
+ case Opcodes.LSTORE:
+ type = Type.LONG_TYPE;
+ break;
+
+ case Opcodes.DLOAD:
+ case Opcodes.DSTORE:
+ type = Type.DOUBLE_TYPE;
+ break;
+
+ case Opcodes.FLOAD:
+ case Opcodes.FSTORE:
+ type = Type.FLOAT_TYPE;
+ break;
+
+ case Opcodes.ILOAD:
+ case Opcodes.ISTORE:
+ type = Type.INT_TYPE;
+ break;
+
+ default:
+ // case Opcodes.ALOAD:
+ // case Opcodes.ASTORE:
+ // case RET:
+ type = OBJECT_TYPE;
+ break;
+ }
+ mv.visitVarInsn(opcode, remap(var, type));
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ mv.visitIincInsn(remap(var, Type.INT_TYPE), increment);
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ mv.visitMaxs(maxStack, nextLocal);
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ int newIndex = remap(index, Type.getType(desc));
+ mv.visitLocalVariable(name, desc, signature, start, end, newIndex);
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ if (type != Opcodes.F_NEW) { // uncompressed frame
+ throw new IllegalStateException("ClassReader.accept() should be called with EXPAND_FRAMES flag");
+ }
+
+ if (!changed) { // optimization for the case where mapping = identity
+ mv.visitFrame(type, nLocal, local, nStack, stack);
+ return;
+ }
+
+ // creates a copy of newLocals
+ Object[] oldLocals = new Object[newLocals.length];
+ System.arraycopy(newLocals, 0, oldLocals, 0, oldLocals.length);
+
+ // copies types from 'local' to 'newLocals'
+ // 'newLocals' already contains the variables added with 'newLocal'
+
+ int index = 0; // old local variable index
+ int number = 0; // old local variable number
+ for (; number < nLocal; ++number) {
+ Object t = local[number];
+ int size = t == Opcodes.LONG || t == Opcodes.DOUBLE ? 2 : 1;
+ if (t != Opcodes.TOP) {
+ Type typ = OBJECT_TYPE;
+ if (t == Opcodes.INTEGER) {
+ typ = Type.INT_TYPE;
+ } else if (t == Opcodes.FLOAT) {
+ typ = Type.FLOAT_TYPE;
+ } else if (t == Opcodes.LONG) {
+ typ = Type.LONG_TYPE;
+ } else if (t == Opcodes.DOUBLE) {
+ typ = Type.DOUBLE_TYPE;
+ } else if (t instanceof String) {
+ typ = Type.getObjectType((String) t);
+ }
+ setFrameLocal(remap(index, typ), t);
+ }
+ index += size;
+ }
+
+ // removes TOP after long and double types as well as trailing TOPs
+
+ index = 0;
+ number = 0;
+ for (int i = 0; index < newLocals.length; ++i) {
+ Object t = newLocals[index++];
+ if (t != null && t != Opcodes.TOP) {
+ newLocals[i] = t;
+ number = i + 1;
+ if (t == Opcodes.LONG || t == Opcodes.DOUBLE) {
+ index += 1;
+ }
+ } else {
+ newLocals[i] = Opcodes.TOP;
+ }
+ }
+
+ // visits remapped frame
+ mv.visitFrame(type, number, newLocals, nStack, stack);
+
+ // restores original value of 'newLocals'
+ newLocals = oldLocals;
+ }
+
+ // -------------
+
+ /**
+ * Creates a new local variable of the given type.
+ *
+ * @param type the type of the local variable to be created.
+ * @return the identifier of the newly created local variable.
+ */
+ public int newLocal(final Type type) {
+ Object t;
+ switch (type.getSort()) {
+ case Type.BOOLEAN:
+ case Type.CHAR:
+ case Type.BYTE:
+ case Type.SHORT:
+ case Type.INT:
+ t = Opcodes.INTEGER;
+ break;
+ case Type.FLOAT:
+ t = Opcodes.FLOAT;
+ break;
+ case Type.LONG:
+ t = Opcodes.LONG;
+ break;
+ case Type.DOUBLE:
+ t = Opcodes.DOUBLE;
+ break;
+ case Type.ARRAY:
+ t = type.getDescriptor();
+ break;
+ // case Type.OBJECT:
+ default:
+ t = type.getInternalName();
+ break;
+ }
+ int local = nextLocal;
+ nextLocal += type.getSize();
+ setLocalType(local, type);
+ setFrameLocal(local, t);
+ return local;
+ }
+
+ /**
+ * Sets the current type of the given local variable. The default
+ * implementation of this method does nothing.
+ *
+ * @param local a local variable identifier, as returned by {@link #newLocal
+ * newLocal()}.
+ * @param type the type of the value being stored in the local variable
+ */
+ protected void setLocalType(final int local, final Type type) {
+ }
+
+ private void setFrameLocal(final int local, final Object type) {
+ int l = newLocals.length;
+ if (local >= l) {
+ Object[] a = new Object[Math.max(2 * l, local + 1)];
+ System.arraycopy(newLocals, 0, a, 0, l);
+ newLocals = a;
+ }
+ newLocals[local] = type;
+ }
+
+ private int remap(final int var, final Type type) {
+ if (var + type.getSize() <= firstLocal) {
+ return var;
+ }
+ int key = 2 * var + type.getSize() - 1;
+ int size = mapping.length;
+ if (key >= size) {
+ int[] newMapping = new int[Math.max(2 * size, key + 1)];
+ System.arraycopy(mapping, 0, newMapping, 0, size);
+ mapping = newMapping;
+ }
+ int value = mapping[key];
+ if (value == 0) {
+ value = newLocalMapping(type);
+ setLocalType(value, type);
+ mapping[key] = value + 1;
+ } else {
+ value--;
+ }
+ if (value != var) {
+ changed = true;
+ }
+ return value;
+ }
+
+ protected int newLocalMapping(final Type type) {
+ int local = nextLocal;
+ nextLocal += type.getSize();
+ return local;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
new file mode 100644
index 0000000..f13f97b
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
@@ -0,0 +1,307 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A named method descriptor.
+ *
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ */
+public class Method {
+
+ /**
+ * The method name.
+ */
+ private final String name;
+
+ /**
+ * The method descriptor.
+ */
+ private final String desc;
+
+ /**
+ * Maps primitive Java type names to their descriptors.
+ */
+ private static final Map<String, String> DESCRIPTORS;
+
+ static {
+ DESCRIPTORS = new HashMap<String, String>();
+ DESCRIPTORS.put("void", "V");
+ DESCRIPTORS.put("byte", "B");
+ DESCRIPTORS.put("char", "C");
+ DESCRIPTORS.put("double", "D");
+ DESCRIPTORS.put("float", "F");
+ DESCRIPTORS.put("int", "I");
+ DESCRIPTORS.put("long", "J");
+ DESCRIPTORS.put("short", "S");
+ DESCRIPTORS.put("boolean", "Z");
+ }
+
+ /**
+ * Creates a new {@link Method}.
+ *
+ * @param name the method's name.
+ * @param desc the method's descriptor.
+ */
+ public Method(final String name, final String desc) {
+ this.name = name;
+ this.desc = desc;
+ }
+
+ /**
+ * Creates a new {@link Method}.
+ *
+ * @param name the method's name.
+ * @param returnType the method's return type.
+ * @param argumentTypes the method's argument types.
+ */
+ public Method(
+ final String name,
+ final Type returnType,
+ final Type[] argumentTypes)
+ {
+ this(name, Type.getMethodDescriptor(returnType, argumentTypes));
+ }
+
+ /**
+ * Creates a new {@link Method}.
+ *
+ * @param m a java.lang.reflect method descriptor
+ * @return a {@link Method} corresponding to the given Java method
+ * declaration.
+ */
+ public static Method getMethod(java.lang.reflect.Method m) {
+ return new Method(m.getName(), Type.getMethodDescriptor(m));
+ }
+
+ /**
+ * Creates a new {@link Method}.
+ *
+ * @param c a java.lang.reflect constructor descriptor
+ * @return a {@link Method} corresponding to the given Java constructor
+ * declaration.
+ */
+ public static Method getMethod(java.lang.reflect.Constructor<?> c) {
+ return new Method("<init>", Type.getConstructorDescriptor(c));
+ }
+
+ /**
+ * Returns a {@link Method} corresponding to the given Java method
+ * declaration.
+ *
+ * @param method a Java method declaration, without argument names, of the
+ * form "returnType name (argumentType1, ... argumentTypeN)", where
+ * the types are in plain Java (e.g. "int", "float",
+ * "java.util.List", ...). Classes of the java.lang package can be
+ * specified by their unqualified name; all other classes names must
+ * be fully qualified.
+ * @return a {@link Method} corresponding to the given Java method
+ * declaration.
+ * @throws IllegalArgumentException if <code>method</code> could not get
+ * parsed.
+ */
+ public static Method getMethod(final String method)
+ throws IllegalArgumentException
+ {
+ return getMethod(method, false);
+ }
+
+ /**
+ * Returns a {@link Method} corresponding to the given Java method
+ * declaration.
+ *
+ * @param method a Java method declaration, without argument names, of the
+ * form "returnType name (argumentType1, ... argumentTypeN)", where
+ * the types are in plain Java (e.g. "int", "float",
+ * "java.util.List", ...). Classes of the java.lang package may be
+ * specified by their unqualified name, depending on the
+ * defaultPackage argument; all other classes names must be fully
+ * qualified.
+ * @param defaultPackage true if unqualified class names belong to the
+ * default package, or false if they correspond to java.lang classes.
+ * For instance "Object" means "Object" if this option is true, or
+ * "java.lang.Object" otherwise.
+ * @return a {@link Method} corresponding to the given Java method
+ * declaration.
+ * @throws IllegalArgumentException if <code>method</code> could not get
+ * parsed.
+ */
+ public static Method getMethod(
+ final String method,
+ final boolean defaultPackage) throws IllegalArgumentException
+ {
+ int space = method.indexOf(' ');
+ int start = method.indexOf('(', space) + 1;
+ int end = method.indexOf(')', start);
+ if (space == -1 || start == -1 || end == -1) {
+ throw new IllegalArgumentException();
+ }
+ String returnType = method.substring(0, space);
+ String methodName = method.substring(space + 1, start - 1).trim();
+ StringBuffer sb = new StringBuffer();
+ sb.append('(');
+ int p;
+ do {
+ String s;
+ p = method.indexOf(',', start);
+ if (p == -1) {
+ s = map(method.substring(start, end).trim(), defaultPackage);
+ } else {
+ s = map(method.substring(start, p).trim(), defaultPackage);
+ start = p + 1;
+ }
+ sb.append(s);
+ } while (p != -1);
+ sb.append(')');
+ sb.append(map(returnType, defaultPackage));
+ return new Method(methodName, sb.toString());
+ }
+
+ private static String map(final String type, final boolean defaultPackage) {
+ if ("".equals(type)) {
+ return type;
+ }
+
+ StringBuffer sb = new StringBuffer();
+ int index = 0;
+ while ((index = type.indexOf("[]", index) + 1) > 0) {
+ sb.append('[');
+ }
+
+ String t = type.substring(0, type.length() - sb.length() * 2);
+ String desc = DESCRIPTORS.get(t);
+ if (desc != null) {
+ sb.append(desc);
+ } else {
+ sb.append('L');
+ if (t.indexOf('.') < 0) {
+ if (!defaultPackage) {
+ sb.append("java/lang/");
+ }
+ sb.append(t);
+ } else {
+ sb.append(t.replace('.', '/'));
+ }
+ sb.append(';');
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns the name of the method described by this object.
+ *
+ * @return the name of the method described by this object.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Returns the descriptor of the method described by this object.
+ *
+ * @return the descriptor of the method described by this object.
+ */
+ public String getDescriptor() {
+ return desc;
+ }
+
+ /**
+ * Returns the return type of the method described by this object.
+ *
+ * @return the return type of the method described by this object.
+ */
+ public Type getReturnType() {
+ return Type.getReturnType(desc);
+ }
+
+ /**
+ * Returns the argument types of the method described by this object.
+ *
+ * @return the argument types of the method described by this object.
+ */
+ public Type[] getArgumentTypes() {
+ return Type.getArgumentTypes(desc);
+ }
+
+ @Override
+ public String toString() {
+ return name + desc;
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (!(o instanceof Method)) {
+ return false;
+ }
+ Method other = (Method) o;
+ return name.equals(other.name) && desc.equals(other.desc);
+ }
+
+ @Override
+ public int hashCode() {
+ return name.hashCode() ^ desc.hashCode();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
new file mode 100644
index 0000000..2035511
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
@@ -0,0 +1,250 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.signature.SignatureReader;
+import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+import jdk.internal.org.objectweb.asm.signature.SignatureWriter;
+
+/**
+ * A class responsible for remapping types and names.
+ * Subclasses can override the following methods:
+ *
+ * <ul>
+ * <li>{@link #map(String)} - map type</li>
+ * <li>{@link #mapFieldName(String, String, String)} - map field name</li>
+ * <li>{@link #mapMethodName(String, String, String)} - map method name</li>
+ * </ul>
+ *
+ * @author Eugene Kuleshov
+ */
+public abstract class Remapper {
+
+ public String mapDesc(String desc) {
+ Type t = Type.getType(desc);
+ switch (t.getSort()) {
+ case Type.ARRAY:
+ String s = mapDesc(t.getElementType().getDescriptor());
+ for (int i = 0; i < t.getDimensions(); ++i) {
+ s = '[' + s;
+ }
+ return s;
+ case Type.OBJECT:
+ String newType = map(t.getInternalName());
+ if (newType != null) {
+ return 'L' + newType + ';';
+ }
+ }
+ return desc;
+ }
+
+ private Type mapType(Type t) {
+ switch (t.getSort()) {
+ case Type.ARRAY:
+ String s = mapDesc(t.getElementType().getDescriptor());
+ for (int i = 0; i < t.getDimensions(); ++i) {
+ s = '[' + s;
+ }
+ return Type.getType(s);
+ case Type.OBJECT:
+ s = map(t.getInternalName());
+ return s != null ? Type.getObjectType(s) : t;
+ case Type.METHOD:
+ return Type.getMethodType(mapMethodDesc(t.getDescriptor()));
+ }
+ return t;
+ }
+
+ public String mapType(String type) {
+ if (type == null) {
+ return null;
+ }
+ return mapType(Type.getObjectType(type)).getInternalName();
+ }
+
+ public String[] mapTypes(String[] types) {
+ String[] newTypes = null;
+ boolean needMapping = false;
+ for (int i = 0; i < types.length; i++) {
+ String type = types[i];
+ String newType = map(type);
+ if (newType != null && newTypes == null) {
+ newTypes = new String[types.length];
+ if (i > 0) {
+ System.arraycopy(types, 0, newTypes, 0, i);
+ }
+ needMapping = true;
+ }
+ if (needMapping) {
+ newTypes[i] = newType == null
+ ? type
+ : newType;
+ }
+ }
+ return needMapping
+ ? newTypes
+ : types;
+ }
+
+ public String mapMethodDesc(String desc) {
+ if("()V".equals(desc)) {
+ return desc;
+ }
+
+ Type[] args = Type.getArgumentTypes(desc);
+ StringBuffer s = new StringBuffer("(");
+ for (int i = 0; i < args.length; i++) {
+ s.append(mapDesc(args[i].getDescriptor()));
+ }
+ Type returnType = Type.getReturnType(desc);
+ if(returnType == Type.VOID_TYPE) {
+ s.append(")V");
+ return s.toString();
+ }
+ s.append(')').append(mapDesc(returnType.getDescriptor()));
+ return s.toString();
+ }
+
+ public Object mapValue(Object value) {
+ if (value instanceof Type) {
+ return mapType((Type) value);
+ }
+ if (value instanceof Handle) {
+ Handle h = (Handle) value;
+ return new Handle(h.getTag(),
+ mapType(h.getOwner()),
+ mapMethodName(h.getOwner(), h.getName(), h.getDesc()),
+ mapMethodDesc(h.getDesc()));
+ }
+ return value;
+ }
+
+ /**
+ *
+ * @param typeSignature true if signature is a FieldTypeSignature, such as
+ * the signature parameter of the ClassVisitor.visitField or
+ * MethodVisitor.visitLocalVariable methods
+ */
+ public String mapSignature(String signature, boolean typeSignature) {
+ if (signature == null) {
+ return null;
+ }
+ SignatureReader r = new SignatureReader(signature);
+ SignatureWriter w = new SignatureWriter();
+ SignatureVisitor a = createRemappingSignatureAdapter(w);
+ if (typeSignature) {
+ r.acceptType(a);
+ } else {
+ r.accept(a);
+ }
+ return w.toString();
+ }
+
+ protected SignatureVisitor createRemappingSignatureAdapter(
+ SignatureVisitor v)
+ {
+ return new RemappingSignatureAdapter(v, this);
+ }
+
+ /**
+ * Map method name to the new name. Subclasses can override.
+ *
+ * @param owner owner of the method.
+ * @param name name of the method.
+ * @param desc descriptor of the method.
+ * @return new name of the method
+ */
+ public String mapMethodName(String owner, String name, String desc) {
+ return name;
+ }
+
+ /**
+ * Map invokedynamic method name to the new name. Subclasses can override.
+ *
+ * @param name name of the invokedynamic.
+ * @param desc descriptor of the invokedynamic.
+ * @return new invokdynamic name.
+ */
+ public String mapInvokeDynamicMethodName(String name, String desc) {
+ return name;
+ }
+
+ /**
+ * Map field name to the new name. Subclasses can override.
+ *
+ * @param owner owner of the field.
+ * @param name name of the field
+ * @param desc descriptor of the field
+ * @return new name of the field.
+ */
+ public String mapFieldName(String owner, String name, String desc) {
+ return name;
+ }
+
+ /**
+ * Map type name to the new name. Subclasses can override.
+ *
+ */
+ public String map(String typeName) {
+ return typeName;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
new file mode 100644
index 0000000..ebe510d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
@@ -0,0 +1,115 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * An {@link AnnotationVisitor} adapter for type remapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class RemappingAnnotationAdapter extends AnnotationVisitor {
+
+ protected final Remapper remapper;
+
+ public RemappingAnnotationAdapter(
+ final AnnotationVisitor av,
+ final Remapper remapper)
+ {
+ this(Opcodes.ASM4, av, remapper);
+ }
+
+ protected RemappingAnnotationAdapter(
+ final int api,
+ final AnnotationVisitor av,
+ final Remapper remapper)
+ {
+ super(api, av);
+ this.remapper = remapper;
+ }
+
+ @Override
+ public void visit(String name, Object value) {
+ av.visit(name, remapper.mapValue(value));
+ }
+
+ @Override
+ public void visitEnum(String name, String desc, String value) {
+ av.visitEnum(name, remapper.mapDesc(desc), value);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ AnnotationVisitor v = av.visitAnnotation(name, remapper.mapDesc(desc));
+ return v == null ? null : (v == av
+ ? this
+ : new RemappingAnnotationAdapter(v, remapper));
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(String name) {
+ AnnotationVisitor v = av.visitArray(name);
+ return v == null ? null : (v == av
+ ? this
+ : new RemappingAnnotationAdapter(v, remapper));
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
new file mode 100644
index 0000000..44fe939
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
@@ -0,0 +1,189 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} for type remapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class RemappingClassAdapter extends ClassVisitor {
+
+ protected final Remapper remapper;
+
+ protected String className;
+
+ public RemappingClassAdapter(final ClassVisitor cv, final Remapper remapper)
+ {
+ this(Opcodes.ASM4, cv, remapper);
+ }
+
+ protected RemappingClassAdapter(
+ final int api,
+ final ClassVisitor cv,
+ final Remapper remapper)
+ {
+ super(api, cv);
+ this.remapper = remapper;
+ }
+
+ @Override
+ public void visit(
+ int version,
+ int access,
+ String name,
+ String signature,
+ String superName,
+ String[] interfaces)
+ {
+ this.className = name;
+ super.visit(version,
+ access,
+ remapper.mapType(name),
+ remapper.mapSignature(signature, false),
+ remapper.mapType(superName),
+ interfaces == null ? null
+ : remapper.mapTypes(interfaces));
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ AnnotationVisitor av;
+ av = super.visitAnnotation(remapper.mapDesc(desc), visible);
+ return av == null ? null : createRemappingAnnotationAdapter(av);
+ }
+
+ @Override
+ public FieldVisitor visitField(
+ int access,
+ String name,
+ String desc,
+ String signature,
+ Object value)
+ {
+ FieldVisitor fv = super.visitField(access,
+ remapper.mapFieldName(className, name, desc),
+ remapper.mapDesc(desc),
+ remapper.mapSignature(signature, true),
+ remapper.mapValue(value));
+ return fv == null ? null : createRemappingFieldAdapter(fv);
+ }
+
+ @Override
+ public MethodVisitor visitMethod(
+ int access,
+ String name,
+ String desc,
+ String signature,
+ String[] exceptions)
+ {
+ String newDesc = remapper.mapMethodDesc(desc);
+ MethodVisitor mv = super.visitMethod(access,
+ remapper.mapMethodName(className, name, desc),
+ newDesc,
+ remapper.mapSignature(signature, false),
+ exceptions == null ? null : remapper.mapTypes(exceptions));
+ return mv == null ? null : createRemappingMethodAdapter(access, newDesc, mv);
+ }
+
+ @Override
+ public void visitInnerClass(
+ String name,
+ String outerName,
+ String innerName,
+ int access)
+ {
+ super.visitInnerClass(remapper.mapType(name),
+ outerName == null ? null : remapper.mapType(outerName),
+ innerName, // TODO should it be changed?
+ access);
+ }
+
+ @Override
+ public void visitOuterClass(String owner, String name, String desc) {
+ super.visitOuterClass(remapper.mapType(owner),
+ name == null ? null : remapper.mapMethodName(owner, name, desc),
+ desc == null ? null : remapper.mapMethodDesc(desc));
+ }
+
+ protected FieldVisitor createRemappingFieldAdapter(FieldVisitor fv) {
+ return new RemappingFieldAdapter(fv, remapper);
+ }
+
+ protected MethodVisitor createRemappingMethodAdapter(
+ int access,
+ String newDesc,
+ MethodVisitor mv)
+ {
+ return new RemappingMethodAdapter(access, newDesc, mv, remapper);
+ }
+
+ protected AnnotationVisitor createRemappingAnnotationAdapter(
+ AnnotationVisitor av)
+ {
+ return new RemappingAnnotationAdapter(av, remapper);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
new file mode 100644
index 0000000..a47da70
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
@@ -0,0 +1,94 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} adapter for type remapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class RemappingFieldAdapter extends FieldVisitor {
+
+ private final Remapper remapper;
+
+ public RemappingFieldAdapter(final FieldVisitor fv, final Remapper remapper)
+ {
+ this(Opcodes.ASM4, fv, remapper);
+ }
+
+ protected RemappingFieldAdapter(
+ final int api,
+ final FieldVisitor fv,
+ final Remapper remapper)
+ {
+ super(api, fv);
+ this.remapper = remapper;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ AnnotationVisitor av = fv.visitAnnotation(remapper.mapDesc(desc), visible);
+ return av == null ? null : new RemappingAnnotationAdapter(av, remapper);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
new file mode 100644
index 0000000..d4612b1
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
@@ -0,0 +1,236 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link LocalVariablesSorter} for type mapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class RemappingMethodAdapter extends LocalVariablesSorter {
+
+ protected final Remapper remapper;
+
+ public RemappingMethodAdapter(
+ final int access,
+ final String desc,
+ final MethodVisitor mv,
+ final Remapper remapper)
+ {
+ this(Opcodes.ASM4, access, desc, mv, remapper);
+ }
+
+ protected RemappingMethodAdapter(
+ final int api,
+ final int access,
+ final String desc,
+ final MethodVisitor mv,
+ final Remapper remapper)
+ {
+ super(api, access, desc, mv);
+ this.remapper = remapper;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotationDefault() {
+ AnnotationVisitor av = mv.visitAnnotationDefault();
+ return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ AnnotationVisitor av = mv.visitAnnotation(remapper.mapDesc(desc), visible);
+ return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+ }
+
+ @Override
+ public AnnotationVisitor visitParameterAnnotation(
+ int parameter,
+ String desc,
+ boolean visible)
+ {
+ AnnotationVisitor av = mv.visitParameterAnnotation(parameter,
+ remapper.mapDesc(desc),
+ visible);
+ return av == null ? av : new RemappingAnnotationAdapter(av, remapper);
+ }
+
+ @Override
+ public void visitFrame(
+ int type,
+ int nLocal,
+ Object[] local,
+ int nStack,
+ Object[] stack)
+ {
+ super.visitFrame(type, nLocal, remapEntries(nLocal, local), nStack, remapEntries(nStack, stack));
+ }
+
+ private Object[] remapEntries(int n, Object[] entries) {
+ for (int i = 0; i < n; i++) {
+ if (entries[i] instanceof String) {
+ Object[] newEntries = new Object[n];
+ if (i > 0) {
+ System.arraycopy(entries, 0, newEntries, 0, i);
+ }
+ do {
+ Object t = entries[i];
+ newEntries[i++] = t instanceof String
+ ? remapper.mapType((String) t)
+ : t;
+ } while (i < n);
+ return newEntries;
+ }
+ }
+ return entries;
+ }
+
+ @Override
+ public void visitFieldInsn(
+ int opcode,
+ String owner,
+ String name,
+ String desc)
+ {
+ super.visitFieldInsn(opcode,
+ remapper.mapType(owner),
+ remapper.mapFieldName(owner, name, desc),
+ remapper.mapDesc(desc));
+ }
+
+ @Override
+ public void visitMethodInsn(
+ int opcode,
+ String owner,
+ String name,
+ String desc)
+ {
+ super.visitMethodInsn(opcode,
+ remapper.mapType(owner),
+ remapper.mapMethodName(owner, name, desc),
+ remapper.mapMethodDesc(desc));
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ for(int i=0; i<bsmArgs.length; i++) {
+ bsmArgs[i] = remapper.mapValue(bsmArgs[i]);
+ }
+ super.visitInvokeDynamicInsn(
+ remapper.mapInvokeDynamicMethodName(name, desc),
+ remapper.mapMethodDesc(desc),
+ (Handle)remapper.mapValue(bsm),
+ bsmArgs);
+ }
+
+ @Override
+ public void visitTypeInsn(int opcode, String type) {
+ super.visitTypeInsn(opcode, remapper.mapType(type));
+ }
+
+ @Override
+ public void visitLdcInsn(Object cst) {
+ super.visitLdcInsn(remapper.mapValue(cst));
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(String desc, int dims) {
+ super.visitMultiANewArrayInsn(remapper.mapDesc(desc), dims);
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ Label start,
+ Label end,
+ Label handler,
+ String type)
+ {
+ super.visitTryCatchBlock(start, end, handler,
+ type == null ? null : remapper.mapType(type));
+ }
+
+ @Override
+ public void visitLocalVariable(
+ String name,
+ String desc,
+ String signature,
+ Label start,
+ Label end,
+ int index)
+ {
+ super.visitLocalVariable(name,
+ remapper.mapDesc(desc),
+ remapper.mapSignature(signature, true),
+ start,
+ end,
+ index);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
new file mode 100644
index 0000000..e4c8071
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
@@ -0,0 +1,187 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} adapter for type mapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class RemappingSignatureAdapter extends SignatureVisitor {
+
+ private final SignatureVisitor v;
+
+ private final Remapper remapper;
+
+ private String className;
+
+ public RemappingSignatureAdapter(
+ final SignatureVisitor v,
+ final Remapper remapper)
+ {
+ this(Opcodes.ASM4, v, remapper);
+ }
+
+ protected RemappingSignatureAdapter(
+ final int api,
+ final SignatureVisitor v,
+ final Remapper remapper)
+ {
+ super(api);
+ this.v = v;
+ this.remapper = remapper;
+ }
+
+ @Override
+ public void visitClassType(String name) {
+ className = name;
+ v.visitClassType(remapper.mapType(name));
+ }
+
+ @Override
+ public void visitInnerClassType(String name) {
+ className = className + '$' + name;
+ String remappedName = remapper.mapType(className);
+ v.visitInnerClassType(remappedName.substring(remappedName.lastIndexOf('$') + 1));
+ }
+
+ @Override
+ public void visitFormalTypeParameter(String name) {
+ v.visitFormalTypeParameter(name);
+ }
+
+ @Override
+ public void visitTypeVariable(String name) {
+ v.visitTypeVariable(name);
+ }
+
+ @Override
+ public SignatureVisitor visitArrayType() {
+ v.visitArrayType();
+ return this;
+ }
+
+ @Override
+ public void visitBaseType(char descriptor) {
+ v.visitBaseType(descriptor);
+ }
+
+ @Override
+ public SignatureVisitor visitClassBound() {
+ v.visitClassBound();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitExceptionType() {
+ v.visitExceptionType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterface() {
+ v.visitInterface();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterfaceBound() {
+ v.visitInterfaceBound();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitParameterType() {
+ v.visitParameterType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitReturnType() {
+ v.visitReturnType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitSuperclass() {
+ v.visitSuperclass();
+ return this;
+ }
+
+ @Override
+ public void visitTypeArgument() {
+ v.visitTypeArgument();
+ }
+
+ @Override
+ public SignatureVisitor visitTypeArgument(char wildcard) {
+ v.visitTypeArgument(wildcard);
+ return this;
+ }
+
+ @Override
+ public void visitEnd() {
+ v.visitEnd();
+ }
+
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
new file mode 100644
index 0000000..03e36ee
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -0,0 +1,559 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} that adds a serial version unique identifier to a
+ * class if missing. Here is typical usage of this class:
+ *
+ * <pre>
+ * ClassWriter cw = new ClassWriter(...);
+ * ClassVisitor sv = new SerialVersionUIDAdder(cw);
+ * ClassVisitor ca = new MyClassAdapter(sv);
+ * new ClassReader(orginalClass).accept(ca, false);
+ * </pre>
+ *
+ * The SVUID algorithm can be found <a href=
+ * "http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html"
+ * >http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html</a>:
+ *
+ * <pre>
+ * The serialVersionUID is computed using the signature of a stream of bytes
+ * that reflect the class definition. The National Institute of Standards and
+ * Technology (NIST) Secure Hash Algorithm (SHA-1) is used to compute a
+ * signature for the stream. The first two 32-bit quantities are used to form a
+ * 64-bit hash. A java.lang.DataOutputStream is used to convert primitive data
+ * types to a sequence of bytes. The values input to the stream are defined by
+ * the Java Virtual Machine (VM) specification for classes.
+ *
+ * The sequence of items in the stream is as follows:
+ *
+ * 1. The class name written using UTF encoding.
+ * 2. The class modifiers written as a 32-bit integer.
+ * 3. The name of each interface sorted by name written using UTF encoding.
+ * 4. For each field of the class sorted by field name (except private static
+ * and private transient fields):
+ * 1. The name of the field in UTF encoding.
+ * 2. The modifiers of the field written as a 32-bit integer.
+ * 3. The descriptor of the field in UTF encoding
+ * 5. If a class initializer exists, write out the following:
+ * 1. The name of the method, <clinit>, in UTF encoding.
+ * 2. The modifier of the method, java.lang.reflect.Modifier.STATIC,
+ * written as a 32-bit integer.
+ * 3. The descriptor of the method, ()V, in UTF encoding.
+ * 6. For each non-private constructor sorted by method name and signature:
+ * 1. The name of the method, <init>, in UTF encoding.
+ * 2. The modifiers of the method written as a 32-bit integer.
+ * 3. The descriptor of the method in UTF encoding.
+ * 7. For each non-private method sorted by method name and signature:
+ * 1. The name of the method in UTF encoding.
+ * 2. The modifiers of the method written as a 32-bit integer.
+ * 3. The descriptor of the method in UTF encoding.
+ * 8. The SHA-1 algorithm is executed on the stream of bytes produced by
+ * DataOutputStream and produces five 32-bit values sha[0..4].
+ *
+ * 9. The hash value is assembled from the first and second 32-bit values of
+ * the SHA-1 message digest. If the result of the message digest, the five
+ * 32-bit words H0 H1 H2 H3 H4, is in an array of five int values named
+ * sha, the hash value would be computed as follows:
+ *
+ * long hash = ((sha[0] >>> 24) & 0xFF) |
+ * ((sha[0] >>> 16) & 0xFF) << 8 |
+ * ((sha[0] >>> 8) & 0xFF) << 16 |
+ * ((sha[0] >>> 0) & 0xFF) << 24 |
+ * ((sha[1] >>> 24) & 0xFF) << 32 |
+ * ((sha[1] >>> 16) & 0xFF) << 40 |
+ * ((sha[1] >>> 8) & 0xFF) << 48 |
+ * ((sha[1] >>> 0) & 0xFF) << 56;
+ * </pre>
+ *
+ * @author Rajendra Inamdar, Vishal Vishnoi
+ */
+public class SerialVersionUIDAdder extends ClassVisitor {
+
+ /**
+ * Flag that indicates if we need to compute SVUID.
+ */
+ private boolean computeSVUID;
+
+ /**
+ * Set to true if the class already has SVUID.
+ */
+ private boolean hasSVUID;
+
+ /**
+ * Classes access flags.
+ */
+ private int access;
+
+ /**
+ * Internal name of the class
+ */
+ private String name;
+
+ /**
+ * Interfaces implemented by the class.
+ */
+ private String[] interfaces;
+
+ /**
+ * Collection of fields. (except private static and private transient
+ * fields)
+ */
+ private Collection<Item> svuidFields;
+
+ /**
+ * Set to true if the class has static initializer.
+ */
+ private boolean hasStaticInitializer;
+
+ /**
+ * Collection of non-private constructors.
+ */
+ private Collection<Item> svuidConstructors;
+
+ /**
+ * Collection of non-private methods.
+ */
+ private Collection<Item> svuidMethods;
+
+ /**
+ * Creates a new {@link SerialVersionUIDAdder}. <i>Subclasses must not use
+ * this constructor</i>. Instead, they must use the
+ * {@link #SerialVersionUIDAdder(int, ClassVisitor)} version.
+ *
+ * @param cv a {@link ClassVisitor} to which this visitor will delegate
+ * calls.
+ */
+ public SerialVersionUIDAdder(final ClassVisitor cv) {
+ this(Opcodes.ASM4, cv);
+ }
+
+ /**
+ * Creates a new {@link SerialVersionUIDAdder}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param cv a {@link ClassVisitor} to which this visitor will delegate
+ * calls.
+ */
+ protected SerialVersionUIDAdder(final int api, final ClassVisitor cv) {
+ super(api, cv);
+ svuidFields = new ArrayList<Item>();
+ svuidConstructors = new ArrayList<Item>();
+ svuidMethods = new ArrayList<Item>();
+ }
+
+ // ------------------------------------------------------------------------
+ // Overriden methods
+ // ------------------------------------------------------------------------
+
+ /*
+ * Visit class header and get class name, access , and interfaces
+ * information (step 1,2, and 3) for SVUID computation.
+ */
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ computeSVUID = (access & Opcodes.ACC_INTERFACE) == 0;
+
+ if (computeSVUID) {
+ this.name = name;
+ this.access = access;
+ this.interfaces = interfaces;
+ }
+
+ super.visit(version, access, name, signature, superName, interfaces);
+ }
+
+ /*
+ * Visit the methods and get constructor and method information (step 5 and
+ * 7). Also determine if there is a class initializer (step 6).
+ */
+ @Override
+ public MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ if (computeSVUID) {
+ if ("<clinit>".equals(name)) {
+ hasStaticInitializer = true;
+ }
+ /*
+ * Remembers non private constructors and methods for SVUID
+ * computation For constructor and method modifiers, only the
+ * ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,
+ * ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT and ACC_STRICT flags
+ * are used.
+ */
+ int mods = access
+ & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PRIVATE
+ | Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
+ | Opcodes.ACC_FINAL | Opcodes.ACC_SYNCHRONIZED
+ | Opcodes.ACC_NATIVE | Opcodes.ACC_ABSTRACT | Opcodes.ACC_STRICT);
+
+ // all non private methods
+ if ((access & Opcodes.ACC_PRIVATE) == 0) {
+ if ("<init>".equals(name)) {
+ svuidConstructors.add(new Item(name, mods, desc));
+ } else if (!"<clinit>".equals(name)) {
+ svuidMethods.add(new Item(name, mods, desc));
+ }
+ }
+ }
+
+ return super.visitMethod(access, name, desc, signature, exceptions);
+ }
+
+ /*
+ * Gets class field information for step 4 of the algorithm. Also determines
+ * if the class already has a SVUID.
+ */
+ @Override
+ public FieldVisitor visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ if (computeSVUID) {
+ if ("serialVersionUID".equals(name)) {
+ // since the class already has SVUID, we won't be computing it.
+ computeSVUID = false;
+ hasSVUID = true;
+ }
+ /*
+ * Remember field for SVUID computation For field modifiers, only
+ * the ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC,
+ * ACC_FINAL, ACC_VOLATILE, and ACC_TRANSIENT flags are used when
+ * computing serialVersionUID values.
+ */
+ if ((access & Opcodes.ACC_PRIVATE) == 0
+ || (access & (Opcodes.ACC_STATIC | Opcodes.ACC_TRANSIENT)) == 0)
+ {
+ int mods = access
+ & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PRIVATE
+ | Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
+ | Opcodes.ACC_FINAL | Opcodes.ACC_VOLATILE | Opcodes.ACC_TRANSIENT);
+ svuidFields.add(new Item(name, mods, desc));
+ }
+ }
+
+ return super.visitField(access, name, desc, signature, value);
+ }
+
+ /**
+ * Handle a bizarre special case. Nested classes (static classes declared
+ * inside another class) that are protected have their access bit set to
+ * public in their class files to deal with some odd reflection situation.
+ * Our SVUID computation must do as the JVM does and ignore access bits in
+ * the class file in favor of the access bits InnerClass attribute.
+ */
+ @Override
+ public void visitInnerClass(final String aname, final String outerName, final String innerName, final int attr_access) {
+ if ((name != null) && name.equals(aname)) {
+ this.access = attr_access;
+ }
+ super.visitInnerClass(aname, outerName, innerName, attr_access);
+ }
+
+ /*
+ * Add the SVUID if class doesn't have one
+ */
+ @Override
+ public void visitEnd() {
+ // compute SVUID and add it to the class
+ if (computeSVUID && !hasSVUID) {
+ try {
+ super.visitField(Opcodes.ACC_FINAL + Opcodes.ACC_STATIC,
+ "serialVersionUID",
+ "J",
+ null,
+ new Long(computeSVUID()));
+ } catch (Throwable e) {
+ throw new RuntimeException("Error while computing SVUID for "
+ + name, e);
+ }
+ }
+
+ super.visitEnd();
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Returns the value of SVUID if the class doesn't have one already. Please
+ * note that 0 is returned if the class already has SVUID, thus use
+ * <code>isHasSVUID</code> to determine if the class already had an SVUID.
+ *
+ * @return Returns the serial version UID
+ * @throws IOException if an I/O error occurs
+ */
+ protected long computeSVUID() throws IOException {
+ ByteArrayOutputStream bos;
+ DataOutputStream dos = null;
+ long svuid = 0;
+
+ try {
+ bos = new ByteArrayOutputStream();
+ dos = new DataOutputStream(bos);
+
+ /*
+ * 1. The class name written using UTF encoding.
+ */
+ dos.writeUTF(name.replace('/', '.'));
+
+ /*
+ * 2. The class modifiers written as a 32-bit integer.
+ */
+ dos.writeInt(access
+ & (Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL
+ | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT));
+
+ /*
+ * 3. The name of each interface sorted by name written using UTF
+ * encoding.
+ */
+ Arrays.sort(interfaces);
+ for (int i = 0; i < interfaces.length; i++) {
+ dos.writeUTF(interfaces[i].replace('/', '.'));
+ }
+
+ /*
+ * 4. For each field of the class sorted by field name (except
+ * private static and private transient fields):
+ *
+ * 1. The name of the field in UTF encoding. 2. The modifiers of the
+ * field written as a 32-bit integer. 3. The descriptor of the field
+ * in UTF encoding
+ *
+ * Note that field signatures are not dot separated. Method and
+ * constructor signatures are dot separated. Go figure...
+ */
+ writeItems(svuidFields, dos, false);
+
+ /*
+ * 5. If a class initializer exists, write out the following: 1. The
+ * name of the method, <clinit>, in UTF encoding. 2. The modifier of
+ * the method, java.lang.reflect.Modifier.STATIC, written as a
+ * 32-bit integer. 3. The descriptor of the method, ()V, in UTF
+ * encoding.
+ */
+ if (hasStaticInitializer) {
+ dos.writeUTF("<clinit>");
+ dos.writeInt(Opcodes.ACC_STATIC);
+ dos.writeUTF("()V");
+ } // if..
+
+ /*
+ * 6. For each non-private constructor sorted by method name and
+ * signature: 1. The name of the method, <init>, in UTF encoding. 2.
+ * The modifiers of the method written as a 32-bit integer. 3. The
+ * descriptor of the method in UTF encoding.
+ */
+ writeItems(svuidConstructors, dos, true);
+
+ /*
+ * 7. For each non-private method sorted by method name and
+ * signature: 1. The name of the method in UTF encoding. 2. The
+ * modifiers of the method written as a 32-bit integer. 3. The
+ * descriptor of the method in UTF encoding.
+ */
+ writeItems(svuidMethods, dos, true);
+
+ dos.flush();
+
+ /*
+ * 8. The SHA-1 algorithm is executed on the stream of bytes
+ * produced by DataOutputStream and produces five 32-bit values
+ * sha[0..4].
+ */
+ byte[] hashBytes = computeSHAdigest(bos.toByteArray());
+
+ /*
+ * 9. The hash value is assembled from the first and second 32-bit
+ * values of the SHA-1 message digest. If the result of the message
+ * digest, the five 32-bit words H0 H1 H2 H3 H4, is in an array of
+ * five int values named sha, the hash value would be computed as
+ * follows:
+ *
+ * long hash = ((sha[0] >>> 24) & 0xFF) | ((sha[0] >>> 16) & 0xFF) <<
+ * 8 | ((sha[0] >>> 8) & 0xFF) << 16 | ((sha[0] >>> 0) & 0xFF) <<
+ * 24 | ((sha[1] >>> 24) & 0xFF) << 32 | ((sha[1] >>> 16) & 0xFF) <<
+ * 40 | ((sha[1] >>> 8) & 0xFF) << 48 | ((sha[1] >>> 0) & 0xFF) <<
+ * 56;
+ */
+ for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--) {
+ svuid = (svuid << 8) | (hashBytes[i] & 0xFF);
+ }
+ } finally {
+ // close the stream (if open)
+ if (dos != null) {
+ dos.close();
+ }
+ }
+
+ return svuid;
+ }
+
+ /**
+ * Returns the SHA-1 message digest of the given value.
+ *
+ * @param value the value whose SHA message digest must be computed.
+ * @return the SHA-1 message digest of the given value.
+ */
+ protected byte[] computeSHAdigest(final byte[] value) {
+ try {
+ return MessageDigest.getInstance("SHA").digest(value);
+ } catch (Exception e) {
+ throw new UnsupportedOperationException(e.toString());
+ }
+ }
+
+ /**
+ * Sorts the items in the collection and writes it to the data output stream
+ *
+ * @param itemCollection collection of items
+ * @param dos a <code>DataOutputStream</code> value
+ * @param dotted a <code>boolean</code> value
+ * @exception IOException if an error occurs
+ */
+ private static void writeItems(
+ final Collection<Item> itemCollection,
+ final DataOutput dos,
+ final boolean dotted) throws IOException
+ {
+ int size = itemCollection.size();
+ Item[] items = itemCollection.toArray(new Item[size]);
+ Arrays.sort(items);
+ for (int i = 0; i < size; i++) {
+ dos.writeUTF(items[i].name);
+ dos.writeInt(items[i].access);
+ dos.writeUTF(dotted
+ ? items[i].desc.replace('/', '.')
+ : items[i].desc);
+ }
+ }
+
+ // ------------------------------------------------------------------------
+ // Inner classes
+ // ------------------------------------------------------------------------
+
+ private static class Item implements Comparable<Item> {
+
+ final String name;
+
+ final int access;
+
+ final String desc;
+
+ Item(final String name, final int access, final String desc) {
+ this.name = name;
+ this.access = access;
+ this.desc = desc;
+ }
+
+ public int compareTo(final Item other) {
+ int retVal = name.compareTo(other.name);
+ if (retVal == 0) {
+ retVal = desc.compareTo(other.desc);
+ }
+ return retVal;
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (o instanceof Item) {
+ return compareTo((Item) o) == 0;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return (name + desc).hashCode();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
new file mode 100644
index 0000000..56b9bb5
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
@@ -0,0 +1,98 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * A {@link Remapper} using a {@link Map} to define its mapping.
+ *
+ * @author Eugene Kuleshov
+ */
+public class SimpleRemapper extends Remapper {
+
+ private final Map<String, String> mapping;
+
+ public SimpleRemapper(Map<String, String> mapping) {
+ this.mapping = mapping;
+ }
+
+ public SimpleRemapper(String oldName, String newName) {
+ this.mapping = Collections.singletonMap(oldName, newName);
+ }
+
+ @Override
+ public String mapMethodName(String owner, String name, String desc) {
+ String s = map(owner + '.' + name + desc);
+ return s == null ? name : s;
+ }
+
+ @Override
+ public String mapFieldName(String owner, String name, String desc) {
+ String s = map(owner + '.' + name);
+ return s == null ? name : s;
+ }
+
+ @Override
+ public String map(String key) {
+ return mapping.get(key);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
new file mode 100644
index 0000000..f459734
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
@@ -0,0 +1,138 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} that merges clinit methods into a single one.
+ *
+ * @author Eric Bruneton
+ */
+public class StaticInitMerger extends ClassVisitor {
+
+ private String name;
+
+ private MethodVisitor clinit;
+
+ private final String prefix;
+
+ private int counter;
+
+ public StaticInitMerger(final String prefix, final ClassVisitor cv) {
+ this(Opcodes.ASM4, prefix, cv);
+ }
+
+ protected StaticInitMerger(
+ final int api,
+ final String prefix,
+ final ClassVisitor cv)
+ {
+ super(api, cv);
+ this.prefix = prefix;
+ }
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ cv.visit(version, access, name, signature, superName, interfaces);
+ this.name = name;
+ }
+
+ @Override
+ public MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ MethodVisitor mv;
+ if ("<clinit>".equals(name)) {
+ int a = Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC;
+ String n = prefix + counter++;
+ mv = cv.visitMethod(a, n, desc, signature, exceptions);
+
+ if (clinit == null) {
+ clinit = cv.visitMethod(a, name, desc, null, null);
+ }
+ clinit.visitMethodInsn(Opcodes.INVOKESTATIC, this.name, n, desc);
+ } else {
+ mv = cv.visitMethod(access, name, desc, signature, exceptions);
+ }
+ return mv;
+ }
+
+ @Override
+ public void visitEnd() {
+ if (clinit != null) {
+ clinit.visitInsn(Opcodes.RETURN);
+ clinit.visitMaxs(0, 0);
+ }
+ cv.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
new file mode 100644
index 0000000..a500983
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
@@ -0,0 +1,84 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.commons;
+
+import jdk.internal.org.objectweb.asm.Label;
+
+/**
+ * A code generator for switch statements.
+ *
+ * @author Juozas Baliuka
+ * @author Chris Nokleberg
+ * @author Eric Bruneton
+ */
+public interface TableSwitchGenerator {
+
+ /**
+ * Generates the code for a switch case.
+ *
+ * @param key the switch case key.
+ * @param end a label that corresponds to the end of the switch statement.
+ */
+ void generateCase(int key, Label end);
+
+ /**
+ * Generates the code for the default switch case.
+ */
+ void generateDefault();
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
new file mode 100644
index 0000000..dd024e3
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
@@ -0,0 +1,132 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jdk.internal.org.objectweb.asm.commons;
+
+import java.util.Collections;
+import java.util.Comparator;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.tree.MethodNode;
+import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
+
+/**
+ * A {@link MethodVisitor} adapter to sort the exception handlers. The handlers
+ * are sorted in a method innermost-to-outermost. This allows the programmer to
+ * add handlers without worrying about ordering them correctly with respect to
+ * existing, in-code handlers.
+ *
+ * Behavior is only defined for properly-nested handlers. If any "try" blocks
+ * overlap (something that isn't possible in Java code) then this may not do
+ * what you want. In fact, this adapter just sorts by the length of the "try"
+ * block, taking advantage of the fact that a given try block must be larger
+ * than any block it contains).
+ *
+ * @author Adrian Sampson
+ */
+public class TryCatchBlockSorter extends MethodNode {
+
+ public TryCatchBlockSorter(
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ this(Opcodes.ASM4, mv, access, name, desc, signature, exceptions);
+ }
+
+ protected TryCatchBlockSorter(
+ final int api,
+ final MethodVisitor mv,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ super(api, access, name, desc, signature, exceptions);
+ this.mv = mv;
+ }
+
+ @Override
+ public void visitEnd() {
+ // Compares TryCatchBlockNodes by the length of their "try" block.
+ Comparator<TryCatchBlockNode> comp = new Comparator<TryCatchBlockNode>() {
+
+ public int compare(TryCatchBlockNode t1, TryCatchBlockNode t2) {
+ int len1 = blockLength(t1);
+ int len2 = blockLength(t2);
+ return len1 - len2;
+ }
+
+ private int blockLength(TryCatchBlockNode block) {
+ int startidx = instructions.indexOf(block.start);
+ int endidx = instructions.indexOf(block.end);
+ return endidx - startidx;
+ }
+ };
+ Collections.sort(tryCatchBlocks, comp);
+ if (mv != null) {
+ accept(mv);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
new file mode 100644
index 0000000..b737c12
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
@@ -0,0 +1,258 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.signature;
+
+/**
+ * A type signature parser to make a signature visitor visit an existing
+ * signature.
+ *
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public class SignatureReader {
+
+ /**
+ * The signature to be read.
+ */
+ private final String signature;
+
+ /**
+ * Constructs a {@link SignatureReader} for the given signature.
+ *
+ * @param signature A <i>ClassSignature</i>, <i>MethodTypeSignature</i>,
+ * or <i>FieldTypeSignature</i>.
+ */
+ public SignatureReader(final String signature) {
+ this.signature = signature;
+ }
+
+ /**
+ * Makes the given visitor visit the signature of this
+ * {@link SignatureReader}. This signature is the one specified in the
+ * constructor (see {@link #SignatureReader(String) SignatureReader}). This
+ * method is intended to be called on a {@link SignatureReader} that was
+ * created using a <i>ClassSignature</i> (such as the
+ * <code>signature</code> parameter of the
+ * {@link jdk.internal.org.objectweb.asm.ClassVisitor#visit ClassVisitor.visit} method)
+ * or a <i>MethodTypeSignature</i> (such as the <code>signature</code>
+ * parameter of the
+ * {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitMethod ClassVisitor.visitMethod}
+ * method).
+ *
+ * @param v the visitor that must visit this signature.
+ */
+ public void accept(final SignatureVisitor v) {
+ String signature = this.signature;
+ int len = signature.length();
+ int pos;
+ char c;
+
+ if (signature.charAt(0) == '<') {
+ pos = 2;
+ do {
+ int end = signature.indexOf(':', pos);
+ v.visitFormalTypeParameter(signature.substring(pos - 1, end));
+ pos = end + 1;
+
+ c = signature.charAt(pos);
+ if (c == 'L' || c == '[' || c == 'T') {
+ pos = parseType(signature, pos, v.visitClassBound());
+ }
+
+ while ((c = signature.charAt(pos++)) == ':') {
+ pos = parseType(signature, pos, v.visitInterfaceBound());
+ }
+ } while (c != '>');
+ } else {
+ pos = 0;
+ }
+
+ if (signature.charAt(pos) == '(') {
+ pos++;
+ while (signature.charAt(pos) != ')') {
+ pos = parseType(signature, pos, v.visitParameterType());
+ }
+ pos = parseType(signature, pos + 1, v.visitReturnType());
+ while (pos < len) {
+ pos = parseType(signature, pos + 1, v.visitExceptionType());
+ }
+ } else {
+ pos = parseType(signature, pos, v.visitSuperclass());
+ while (pos < len) {
+ pos = parseType(signature, pos, v.visitInterface());
+ }
+ }
+ }
+
+ /**
+ * Makes the given visitor visit the signature of this
+ * {@link SignatureReader}. This signature is the one specified in the
+ * constructor (see {@link #SignatureReader(String) SignatureReader}). This
+ * method is intended to be called on a {@link SignatureReader} that was
+ * created using a <i>FieldTypeSignature</i>, such as the
+ * <code>signature</code> parameter of the
+ * {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitField
+ * ClassVisitor.visitField} or {@link
+ * jdk.internal.org.objectweb.asm.MethodVisitor#visitLocalVariable
+ * MethodVisitor.visitLocalVariable} methods.
+ *
+ * @param v the visitor that must visit this signature.
+ */
+ public void acceptType(final SignatureVisitor v) {
+ parseType(this.signature, 0, v);
+ }
+
+ /**
+ * Parses a field type signature and makes the given visitor visit it.
+ *
+ * @param signature a string containing the signature that must be parsed.
+ * @param pos index of the first character of the signature to parsed.
+ * @param v the visitor that must visit this signature.
+ * @return the index of the first character after the parsed signature.
+ */
+ private static int parseType(
+ final String signature,
+ int pos,
+ final SignatureVisitor v)
+ {
+ char c;
+ int start, end;
+ boolean visited, inner;
+ String name;
+
+ switch (c = signature.charAt(pos++)) {
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ case 'F':
+ case 'J':
+ case 'D':
+ case 'V':
+ v.visitBaseType(c);
+ return pos;
+
+ case '[':
+ return parseType(signature, pos, v.visitArrayType());
+
+ case 'T':
+ end = signature.indexOf(';', pos);
+ v.visitTypeVariable(signature.substring(pos, end));
+ return end + 1;
+
+ default: // case 'L':
+ start = pos;
+ visited = false;
+ inner = false;
+ for (;;) {
+ switch (c = signature.charAt(pos++)) {
+ case '.':
+ case ';':
+ if (!visited) {
+ name = signature.substring(start, pos - 1);
+ if (inner) {
+ v.visitInnerClassType(name);
+ } else {
+ v.visitClassType(name);
+ }
+ }
+ if (c == ';') {
+ v.visitEnd();
+ return pos;
+ }
+ start = pos;
+ visited = false;
+ inner = true;
+ break;
+
+ case '<':
+ name = signature.substring(start, pos - 1);
+ if (inner) {
+ v.visitInnerClassType(name);
+ } else {
+ v.visitClassType(name);
+ }
+ visited = true;
+ top: for (;;) {
+ switch (c = signature.charAt(pos)) {
+ case '>':
+ break top;
+ case '*':
+ ++pos;
+ v.visitTypeArgument();
+ break;
+ case '+':
+ case '-':
+ pos = parseType(signature,
+ pos + 1,
+ v.visitTypeArgument(c));
+ break;
+ default:
+ pos = parseType(signature,
+ pos,
+ v.visitTypeArgument('='));
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
new file mode 100644
index 0000000..d3699c1
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
@@ -0,0 +1,257 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.signature;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A visitor to visit a generic signature. The methods of this interface must be
+ * called in one of the three following orders (the last one is the only valid
+ * order for a {@link SignatureVisitor} that is returned by a method of this
+ * interface): <ul> <li><i>ClassSignature</i> = (
+ * <tt>visitFormalTypeParameter</tt>
+ * <tt>visitClassBound</tt>?
+ * <tt>visitInterfaceBound</tt>* )* ( <tt>visitSuperClass</tt>
+ * <tt>visitInterface</tt>* )</li>
+ * <li><i>MethodSignature</i> = ( <tt>visitFormalTypeParameter</tt>
+ * <tt>visitClassBound</tt>?
+ * <tt>visitInterfaceBound</tt>* )* ( <tt>visitParameterType</tt>*
+ * <tt>visitReturnType</tt>
+ * <tt>visitExceptionType</tt>* )</li> <li><i>TypeSignature</i> =
+ * <tt>visitBaseType</tt> | <tt>visitTypeVariable</tt> |
+ * <tt>visitArrayType</tt> | (
+ * <tt>visitClassType</tt> <tt>visitTypeArgument</tt>* (
+ * <tt>visitInnerClassType</tt> <tt>visitTypeArgument</tt>* )*
+ * <tt>visitEnd</tt> ) )</li> </ul>
+ *
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public abstract class SignatureVisitor {
+
+ /**
+ * Wildcard for an "extends" type argument.
+ */
+ public final static char EXTENDS = '+';
+
+ /**
+ * Wildcard for a "super" type argument.
+ */
+ public final static char SUPER = '-';
+
+ /**
+ * Wildcard for a normal type argument.
+ */
+ public final static char INSTANCEOF = '=';
+
+ /**
+ * The ASM API version implemented by this visitor. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * Constructs a new {@link SignatureVisitor}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public SignatureVisitor(final int api) {
+ this.api = api;
+ }
+
+ /**
+ * Visits a formal type parameter.
+ *
+ * @param name the name of the formal parameter.
+ */
+ public void visitFormalTypeParameter(String name) {
+ }
+
+ /**
+ * Visits the class bound of the last visited formal type parameter.
+ *
+ * @return a non null visitor to visit the signature of the class bound.
+ */
+ public SignatureVisitor visitClassBound() {
+ return this;
+ }
+
+ /**
+ * Visits an interface bound of the last visited formal type parameter.
+ *
+ * @return a non null visitor to visit the signature of the interface bound.
+ */
+ public SignatureVisitor visitInterfaceBound() {
+ return this;
+ }
+
+ /**
+ * Visits the type of the super class.
+ *
+ * @return a non null visitor to visit the signature of the super class
+ * type.
+ */
+ public SignatureVisitor visitSuperclass() {
+ return this;
+ }
+
+ /**
+ * Visits the type of an interface implemented by the class.
+ *
+ * @return a non null visitor to visit the signature of the interface type.
+ */
+ public SignatureVisitor visitInterface() {
+ return this;
+ }
+
+ /**
+ * Visits the type of a method parameter.
+ *
+ * @return a non null visitor to visit the signature of the parameter type.
+ */
+ public SignatureVisitor visitParameterType() {
+ return this;
+ }
+
+ /**
+ * Visits the return type of the method.
+ *
+ * @return a non null visitor to visit the signature of the return type.
+ */
+ public SignatureVisitor visitReturnType() {
+ return this;
+ }
+
+ /**
+ * Visits the type of a method exception.
+ *
+ * @return a non null visitor to visit the signature of the exception type.
+ */
+ public SignatureVisitor visitExceptionType() {
+ return this;
+ }
+
+ /**
+ * Visits a signature corresponding to a primitive type.
+ *
+ * @param descriptor the descriptor of the primitive type, or 'V' for
+ * <tt>void</tt>.
+ */
+ public void visitBaseType(char descriptor) {
+ }
+
+ /**
+ * Visits a signature corresponding to a type variable.
+ *
+ * @param name the name of the type variable.
+ */
+ public void visitTypeVariable(String name) {
+ }
+
+ /**
+ * Visits a signature corresponding to an array type.
+ *
+ * @return a non null visitor to visit the signature of the array element
+ * type.
+ */
+ public SignatureVisitor visitArrayType() {
+ return this;
+ }
+
+ /**
+ * Starts the visit of a signature corresponding to a class or interface
+ * type.
+ *
+ * @param name the internal name of the class or interface.
+ */
+ public void visitClassType(String name) {
+ }
+
+ /**
+ * Visits an inner class.
+ *
+ * @param name the local name of the inner class in its enclosing class.
+ */
+ public void visitInnerClassType(String name) {
+ }
+
+ /**
+ * Visits an unbounded type argument of the last visited class or inner
+ * class type.
+ */
+ public void visitTypeArgument() {
+ }
+
+ /**
+ * Visits a type argument of the last visited class or inner class type.
+ *
+ * @param wildcard '+', '-' or '='.
+ * @return a non null visitor to visit the signature of the type argument.
+ */
+ public SignatureVisitor visitTypeArgument(char wildcard) {
+ return this;
+ }
+
+ /**
+ * Ends the visit of a signature corresponding to a class or interface type.
+ */
+ public void visitEnd() {
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
new file mode 100644
index 0000000..b341e00
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
@@ -0,0 +1,256 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.signature;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A signature visitor that generates signatures in string format.
+ *
+ * @author Thomas Hallgren
+ * @author Eric Bruneton
+ */
+public class SignatureWriter extends SignatureVisitor {
+
+ /**
+ * Buffer used to construct the signature.
+ */
+ private final StringBuffer buf = new StringBuffer();
+
+ /**
+ * Indicates if the signature contains formal type parameters.
+ */
+ private boolean hasFormals;
+
+ /**
+ * Indicates if the signature contains method parameter types.
+ */
+ private boolean hasParameters;
+
+ /**
+ * Stack used to keep track of class types that have arguments. Each element
+ * of this stack is a boolean encoded in one bit. The top of the stack is
+ * the lowest order bit. Pushing false = *2, pushing true = *2+1, popping =
+ * /2.
+ */
+ private int argumentStack;
+
+ /**
+ * Constructs a new {@link SignatureWriter} object.
+ */
+ public SignatureWriter() {
+ super(Opcodes.ASM4);
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the SignatureVisitor interface
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visitFormalTypeParameter(final String name) {
+ if (!hasFormals) {
+ hasFormals = true;
+ buf.append('<');
+ }
+ buf.append(name);
+ buf.append(':');
+ }
+
+ @Override
+ public SignatureVisitor visitClassBound() {
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterfaceBound() {
+ buf.append(':');
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitSuperclass() {
+ endFormals();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterface() {
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitParameterType() {
+ endFormals();
+ if (!hasParameters) {
+ hasParameters = true;
+ buf.append('(');
+ }
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitReturnType() {
+ endFormals();
+ if (!hasParameters) {
+ buf.append('(');
+ }
+ buf.append(')');
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitExceptionType() {
+ buf.append('^');
+ return this;
+ }
+
+ @Override
+ public void visitBaseType(final char descriptor) {
+ buf.append(descriptor);
+ }
+
+ @Override
+ public void visitTypeVariable(final String name) {
+ buf.append('T');
+ buf.append(name);
+ buf.append(';');
+ }
+
+ @Override
+ public SignatureVisitor visitArrayType() {
+ buf.append('[');
+ return this;
+ }
+
+ @Override
+ public void visitClassType(final String name) {
+ buf.append('L');
+ buf.append(name);
+ argumentStack *= 2;
+ }
+
+ @Override
+ public void visitInnerClassType(final String name) {
+ endArguments();
+ buf.append('.');
+ buf.append(name);
+ argumentStack *= 2;
+ }
+
+ @Override
+ public void visitTypeArgument() {
+ if (argumentStack % 2 == 0) {
+ ++argumentStack;
+ buf.append('<');
+ }
+ buf.append('*');
+ }
+
+ @Override
+ public SignatureVisitor visitTypeArgument(final char wildcard) {
+ if (argumentStack % 2 == 0) {
+ ++argumentStack;
+ buf.append('<');
+ }
+ if (wildcard != '=') {
+ buf.append(wildcard);
+ }
+ return this;
+ }
+
+ @Override
+ public void visitEnd() {
+ endArguments();
+ buf.append(';');
+ }
+
+ /**
+ * Returns the signature that was built by this signature writer.
+ *
+ * @return the signature that was built by this signature writer.
+ */
+ @Override
+ public String toString() {
+ return buf.toString();
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Ends the formal type parameters section of the signature.
+ */
+ private void endFormals() {
+ if (hasFormals) {
+ hasFormals = false;
+ buf.append('>');
+ }
+ }
+
+ /**
+ * Ends the type arguments of a class or inner class type.
+ */
+ private void endArguments() {
+ if (argumentStack % 2 != 0) {
+ buf.append('>');
+ }
+ argumentStack /= 2;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
new file mode 100644
index 0000000..a965476
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -0,0 +1,267 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a bytecode instruction. <i>An instruction can appear
+ * at most once in at most one {@link InsnList} at a time</i>.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class AbstractInsnNode {
+
+ /**
+ * The type of {@link InsnNode} instructions.
+ */
+ public static final int INSN = 0;
+
+ /**
+ * The type of {@link IntInsnNode} instructions.
+ */
+ public static final int INT_INSN = 1;
+
+ /**
+ * The type of {@link VarInsnNode} instructions.
+ */
+ public static final int VAR_INSN = 2;
+
+ /**
+ * The type of {@link TypeInsnNode} instructions.
+ */
+ public static final int TYPE_INSN = 3;
+
+ /**
+ * The type of {@link FieldInsnNode} instructions.
+ */
+ public static final int FIELD_INSN = 4;
+
+ /**
+ * The type of {@link MethodInsnNode} instructions.
+ */
+ public static final int METHOD_INSN = 5;
+
+ /**
+ * The type of {@link InvokeDynamicInsnNode} instructions.
+ */
+ public static final int INVOKE_DYNAMIC_INSN = 6;
+
+ /**
+ * The type of {@link JumpInsnNode} instructions.
+ */
+ public static final int JUMP_INSN = 7;
+
+ /**
+ * The type of {@link LabelNode} "instructions".
+ */
+ public static final int LABEL = 8;
+
+ /**
+ * The type of {@link LdcInsnNode} instructions.
+ */
+ public static final int LDC_INSN = 9;
+
+ /**
+ * The type of {@link IincInsnNode} instructions.
+ */
+ public static final int IINC_INSN = 10;
+
+ /**
+ * The type of {@link TableSwitchInsnNode} instructions.
+ */
+ public static final int TABLESWITCH_INSN = 11;
+
+ /**
+ * The type of {@link LookupSwitchInsnNode} instructions.
+ */
+ public static final int LOOKUPSWITCH_INSN = 12;
+
+ /**
+ * The type of {@link MultiANewArrayInsnNode} instructions.
+ */
+ public static final int MULTIANEWARRAY_INSN = 13;
+
+ /**
+ * The type of {@link FrameNode} "instructions".
+ */
+ public static final int FRAME = 14;
+
+ /**
+ * The type of {@link LineNumberNode} "instructions".
+ */
+ public static final int LINE = 15;
+
+ /**
+ * The opcode of this instruction.
+ */
+ protected int opcode;
+
+ /**
+ * Previous instruction in the list to which this instruction belongs.
+ */
+ AbstractInsnNode prev;
+
+ /**
+ * Next instruction in the list to which this instruction belongs.
+ */
+ AbstractInsnNode next;
+
+ /**
+ * Index of this instruction in the list to which it belongs. The value of
+ * this field is correct only when {@link InsnList#cache} is not null. A
+ * value of -1 indicates that this instruction does not belong to any
+ * {@link InsnList}.
+ */
+ int index;
+
+ /**
+ * Constructs a new {@link AbstractInsnNode}.
+ *
+ * @param opcode the opcode of the instruction to be constructed.
+ */
+ protected AbstractInsnNode(final int opcode) {
+ this.opcode = opcode;
+ this.index = -1;
+ }
+
+ /**
+ * Returns the opcode of this instruction.
+ *
+ * @return the opcode of this instruction.
+ */
+ public int getOpcode() {
+ return opcode;
+ }
+
+ /**
+ * Returns the type of this instruction.
+ *
+ * @return the type of this instruction, i.e. one the constants defined in
+ * this class.
+ */
+ public abstract int getType();
+
+ /**
+ * Returns the previous instruction in the list to which this instruction
+ * belongs, if any.
+ *
+ * @return the previous instruction in the list to which this instruction
+ * belongs, if any. May be <tt>null</tt>.
+ */
+ public AbstractInsnNode getPrevious() {
+ return prev;
+ }
+
+ /**
+ * Returns the next instruction in the list to which this instruction
+ * belongs, if any.
+ *
+ * @return the next instruction in the list to which this instruction
+ * belongs, if any. May be <tt>null</tt>.
+ */
+ public AbstractInsnNode getNext() {
+ return next;
+ }
+
+ /**
+ * Makes the given code visitor visit this instruction.
+ *
+ * @param cv a code visitor.
+ */
+ public abstract void accept(final MethodVisitor cv);
+
+ /**
+ * Returns a copy of this instruction.
+ *
+ * @param labels a map from LabelNodes to cloned LabelNodes.
+ * @return a copy of this instruction. The returned instruction does not
+ * belong to any {@link InsnList}.
+ */
+ public abstract AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels);
+
+ /**
+ * Returns the clone of the given label.
+ *
+ * @param label a label.
+ * @param map a map from LabelNodes to cloned LabelNodes.
+ * @return the clone of the given label.
+ */
+ static LabelNode clone(final LabelNode label, final Map<LabelNode, LabelNode> map) {
+ return map.get(label);
+ }
+
+ /**
+ * Returns the clones of the given labels.
+ *
+ * @param labels a list of labels.
+ * @param map a map from LabelNodes to cloned LabelNodes.
+ * @return the clones of the given labels.
+ */
+ static LabelNode[] clone(final List<LabelNode> labels, final Map<LabelNode, LabelNode> map) {
+ LabelNode[] clones = new LabelNode[labels.size()];
+ for (int i = 0; i < clones.length; ++i) {
+ clones[i] = map.get(labels.get(i));
+ }
+ return clones;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
new file mode 100644
index 0000000..6f53ed7
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
@@ -0,0 +1,253 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an annotationn.
+ *
+ * @author Eric Bruneton
+ */
+public class AnnotationNode extends AnnotationVisitor {
+
+ /**
+ * The class descriptor of the annotation class.
+ */
+ public String desc;
+
+ /**
+ * The name value pairs of this annotation. Each name value pair is stored
+ * as two consecutive elements in the list. The name is a {@link String},
+ * and the value may be a {@link Byte}, {@link Boolean}, {@link Character},
+ * {@link Short}, {@link Integer}, {@link Long}, {@link Float},
+ * {@link Double}, {@link String} or {@link jdk.internal.org.objectweb.asm.Type}, or an
+ * two elements String array (for enumeration values), a
+ * {@link AnnotationNode}, or a {@link List} of values of one of the
+ * preceding types. The list may be <tt>null</tt> if there is no name
+ * value pair.
+ */
+ public List<Object> values;
+
+ /**
+ * Constructs a new {@link AnnotationNode}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #AnnotationNode(int, String)} version.
+ *
+ * @param desc the class descriptor of the annotation class.
+ */
+ public AnnotationNode(final String desc) {
+ this(Opcodes.ASM4, desc);
+ }
+
+ /**
+ * Constructs a new {@link AnnotationNode}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param desc the class descriptor of the annotation class.
+ */
+ public AnnotationNode(final int api, final String desc) {
+ super(api);
+ this.desc = desc;
+ }
+
+ /**
+ * Constructs a new {@link AnnotationNode} to visit an array value.
+ *
+ * @param values where the visited values must be stored.
+ */
+ AnnotationNode(final List<Object> values) {
+ super(Opcodes.ASM4);
+ this.values = values;
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the AnnotationVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(final String name, final Object value) {
+ if (values == null) {
+ values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+ }
+ if (this.desc != null) {
+ values.add(name);
+ }
+ values.add(value);
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ if (values == null) {
+ values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+ }
+ if (this.desc != null) {
+ values.add(name);
+ }
+ values.add(new String[] { desc, value });
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ if (values == null) {
+ values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+ }
+ if (this.desc != null) {
+ values.add(name);
+ }
+ AnnotationNode annotation = new AnnotationNode(desc);
+ values.add(annotation);
+ return annotation;
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(final String name) {
+ if (values == null) {
+ values = new ArrayList<Object>(this.desc != null ? 2 : 1);
+ }
+ if (this.desc != null) {
+ values.add(name);
+ }
+ List<Object> array = new ArrayList<Object>();
+ values.add(array);
+ return new AnnotationNode(array);
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Accept methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Checks that this annotation node is compatible with the given ASM API
+ * version. This methods checks that this node, and all its nodes
+ * recursively, do not contain elements that were introduced in more recent
+ * versions of the ASM API than the given version.
+ *
+ * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
+ */
+ public void check(final int api) {
+ // nothing to do
+ }
+
+ /**
+ * Makes the given visitor visit this annotation.
+ *
+ * @param av an annotation visitor. Maybe <tt>null</tt>.
+ */
+ public void accept(final AnnotationVisitor av) {
+ if (av != null) {
+ if (values != null) {
+ for (int i = 0; i < values.size(); i += 2) {
+ String name = (String) values.get(i);
+ Object value = values.get(i + 1);
+ accept(av, name, value);
+ }
+ }
+ av.visitEnd();
+ }
+ }
+
+ /**
+ * Makes the given visitor visit a given annotation value.
+ *
+ * @param av an annotation visitor. Maybe <tt>null</tt>.
+ * @param name the value name.
+ * @param value the actual value.
+ */
+ static void accept(
+ final AnnotationVisitor av,
+ final String name,
+ final Object value)
+ {
+ if (av != null) {
+ if (value instanceof String[]) {
+ String[] typeconst = (String[]) value;
+ av.visitEnum(name, typeconst[0], typeconst[1]);
+ } else if (value instanceof AnnotationNode) {
+ AnnotationNode an = (AnnotationNode) value;
+ an.accept(av.visitAnnotation(name, an.desc));
+ } else if (value instanceof List) {
+ AnnotationVisitor v = av.visitArray(name);
+ List<?> array = (List<?>) value;
+ for (int j = 0; j < array.size(); ++j) {
+ accept(v, null, array.get(j));
+ }
+ v.visitEnd();
+ } else {
+ av.visit(name, value);
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
new file mode 100644
index 0000000..81b36c8
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
@@ -0,0 +1,400 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a class.
+ *
+ * @author Eric Bruneton
+ */
+public class ClassNode extends ClassVisitor {
+
+ /**
+ * The class version.
+ */
+ public int version;
+
+ /**
+ * The class's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This
+ * field also indicates if the class is deprecated.
+ */
+ public int access;
+
+ /**
+ * The internal name of the class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ */
+ public String name;
+
+ /**
+ * The signature of the class. Mayt be <tt>null</tt>.
+ */
+ public String signature;
+
+ /**
+ * The internal of name of the super class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}). For
+ * interfaces, the super class is {@link Object}. May be <tt>null</tt>,
+ * but only for the {@link Object} class.
+ */
+ public String superName;
+
+ /**
+ * The internal names of the class's interfaces (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}). This
+ * list is a list of {@link String} objects.
+ */
+ public List<String> interfaces;
+
+ /**
+ * The name of the source file from which this class was compiled. May be
+ * <tt>null</tt>.
+ */
+ public String sourceFile;
+
+ /**
+ * Debug information to compute the correspondance between source and
+ * compiled elements of the class. May be <tt>null</tt>.
+ */
+ public String sourceDebug;
+
+ /**
+ * The internal name of the enclosing class of the class. May be
+ * <tt>null</tt>.
+ */
+ public String outerClass;
+
+ /**
+ * The name of the method that contains the class, or <tt>null</tt> if the
+ * class is not enclosed in a method.
+ */
+ public String outerMethod;
+
+ /**
+ * The descriptor of the method that contains the class, or <tt>null</tt>
+ * if the class is not enclosed in a method.
+ */
+ public String outerMethodDesc;
+
+ /**
+ * The runtime visible annotations of this class. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label visible
+ */
+ public List<AnnotationNode> visibleAnnotations;
+
+ /**
+ * The runtime invisible annotations of this class. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label invisible
+ */
+ public List<AnnotationNode> invisibleAnnotations;
+
+ /**
+ * The non standard attributes of this class. This list is a list of
+ * {@link Attribute} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.Attribute
+ */
+ public List<Attribute> attrs;
+
+ /**
+ * Informations about the inner classes of this class. This list is a list
+ * of {@link InnerClassNode} objects.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.InnerClassNode
+ */
+ public List<InnerClassNode> innerClasses;
+
+ /**
+ * The fields of this class. This list is a list of {@link FieldNode}
+ * objects.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.FieldNode
+ */
+ public List<FieldNode> fields;
+
+ /**
+ * The methods of this class. This list is a list of {@link MethodNode}
+ * objects.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.MethodNode
+ */
+ public List<MethodNode> methods;
+
+ /**
+ * Constructs a new {@link ClassNode}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the {@link #ClassNode(int)}
+ * version.
+ */
+ public ClassNode() {
+ this(Opcodes.ASM4);
+ }
+
+ /**
+ * Constructs a new {@link ClassNode}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public ClassNode(final int api) {
+ super(api);
+ this.interfaces = new ArrayList<String>();
+ this.innerClasses = new ArrayList<InnerClassNode>();
+ this.fields = new ArrayList<FieldNode>();
+ this.methods = new ArrayList<MethodNode>();
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the ClassVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ this.version = version;
+ this.access = access;
+ this.name = name;
+ this.signature = signature;
+ this.superName = superName;
+ if (interfaces != null) {
+ this.interfaces.addAll(Arrays.asList(interfaces));
+ }
+ }
+
+ @Override
+ public void visitSource(final String file, final String debug) {
+ sourceFile = file;
+ sourceDebug = debug;
+ }
+
+ @Override
+ public void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ outerClass = owner;
+ outerMethod = name;
+ outerMethodDesc = desc;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ AnnotationNode an = new AnnotationNode(desc);
+ if (visible) {
+ if (visibleAnnotations == null) {
+ visibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ visibleAnnotations.add(an);
+ } else {
+ if (invisibleAnnotations == null) {
+ invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ invisibleAnnotations.add(an);
+ }
+ return an;
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ if (attrs == null) {
+ attrs = new ArrayList<Attribute>(1);
+ }
+ attrs.add(attr);
+ }
+
+ @Override
+ public void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ InnerClassNode icn = new InnerClassNode(name,
+ outerName,
+ innerName,
+ access);
+ innerClasses.add(icn);
+ }
+
+ @Override
+ public FieldVisitor visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ FieldNode fn = new FieldNode(access, name, desc, signature, value);
+ fields.add(fn);
+ return fn;
+ }
+
+ @Override
+ public MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ MethodNode mn = new MethodNode(access,
+ name,
+ desc,
+ signature,
+ exceptions);
+ methods.add(mn);
+ return mn;
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Accept method
+ // ------------------------------------------------------------------------
+
+ /**
+ * Checks that this class node is compatible with the given ASM API version.
+ * This methods checks that this node, and all its nodes recursively, do not
+ * contain elements that were introduced in more recent versions of the ASM
+ * API than the given version.
+ *
+ * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
+ */
+ public void check(final int api) {
+ // nothing to do
+ }
+
+ /**
+ * Makes the given class visitor visit this class.
+ *
+ * @param cv a class visitor.
+ */
+ public void accept(final ClassVisitor cv) {
+ // visits header
+ String[] interfaces = new String[this.interfaces.size()];
+ this.interfaces.toArray(interfaces);
+ cv.visit(version, access, name, signature, superName, interfaces);
+ // visits source
+ if (sourceFile != null || sourceDebug != null) {
+ cv.visitSource(sourceFile, sourceDebug);
+ }
+ // visits outer class
+ if (outerClass != null) {
+ cv.visitOuterClass(outerClass, outerMethod, outerMethodDesc);
+ }
+ // visits attributes
+ int i, n;
+ n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = visibleAnnotations.get(i);
+ an.accept(cv.visitAnnotation(an.desc, true));
+ }
+ n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = invisibleAnnotations.get(i);
+ an.accept(cv.visitAnnotation(an.desc, false));
+ }
+ n = attrs == null ? 0 : attrs.size();
+ for (i = 0; i < n; ++i) {
+ cv.visitAttribute(attrs.get(i));
+ }
+ // visits inner classes
+ for (i = 0; i < innerClasses.size(); ++i) {
+ innerClasses.get(i).accept(cv);
+ }
+ // visits fields
+ for (i = 0; i < fields.size(); ++i) {
+ fields.get(i).accept(cv);
+ }
+ // visits methods
+ for (i = 0; i < methods.size(); ++i) {
+ methods.get(i).accept(cv);
+ }
+ // visits end
+ cv.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
new file mode 100644
index 0000000..b6bcca9
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
@@ -0,0 +1,135 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a field instruction. A field instruction is an
+ * instruction that loads or stores the value of a field of an object.
+ *
+ * @author Eric Bruneton
+ */
+public class FieldInsnNode extends AbstractInsnNode {
+
+ /**
+ * The internal name of the field's owner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ */
+ public String owner;
+
+ /**
+ * The field's name.
+ */
+ public String name;
+
+ /**
+ * The field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public String desc;
+
+ /**
+ * Constructs a new {@link FieldInsnNode}.
+ *
+ * @param opcode the opcode of the type instruction to be constructed. This
+ * opcode must be GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+ * @param owner the internal name of the field's owner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public FieldInsnNode(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ super(opcode);
+ this.owner = owner;
+ this.name = name;
+ this.desc = desc;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be GETSTATIC,
+ * PUTSTATIC, GETFIELD or PUTFIELD.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return FIELD_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor cv) {
+ cv.visitFieldInsn(opcode, owner, name, desc);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new FieldInsnNode(opcode, owner, name, desc);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
new file mode 100644
index 0000000..d25842b
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
@@ -0,0 +1,272 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a field.
+ *
+ * @author Eric Bruneton
+ */
+public class FieldNode extends FieldVisitor {
+
+ /**
+ * The field's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This
+ * field also indicates if the field is synthetic and/or deprecated.
+ */
+ public int access;
+
+ /**
+ * The field's name.
+ */
+ public String name;
+
+ /**
+ * The field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public String desc;
+
+ /**
+ * The field's signature. May be <tt>null</tt>.
+ */
+ public String signature;
+
+ /**
+ * The field's initial value. This field, which may be <tt>null</tt> if
+ * the field does not have an initial value, must be an {@link Integer}, a
+ * {@link Float}, a {@link Long}, a {@link Double} or a {@link String}.
+ */
+ public Object value;
+
+ /**
+ * The runtime visible annotations of this field. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label visible
+ */
+ public List<AnnotationNode> visibleAnnotations;
+
+ /**
+ * The runtime invisible annotations of this field. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label invisible
+ */
+ public List<AnnotationNode> invisibleAnnotations;
+
+ /**
+ * The non standard attributes of this field. This list is a list of
+ * {@link Attribute} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.Attribute
+ */
+ public List<Attribute> attrs;
+
+ /**
+ * Constructs a new {@link FieldNode}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #FieldNode(int, int, String, String, String, Object)} version.
+ *
+ * @param access the field's access flags (see
+ * {@link jdk.internal.org.objectweb.asm.Opcodes}). This parameter also indicates
+ * if the field is synthetic and/or deprecated.
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type
+ * Type}).
+ * @param signature the field's signature.
+ * @param value the field's initial value. This parameter, which may be
+ * <tt>null</tt> if the field does not have an initial value, must be
+ * an {@link Integer}, a {@link Float}, a {@link Long}, a
+ * {@link Double} or a {@link String}.
+ */
+ public FieldNode(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ this(Opcodes.ASM4, access, name, desc, signature, value);
+ }
+
+ /**
+ * Constructs a new {@link FieldNode}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #FieldNode(int, int, String, String, String, Object)} version.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param access the field's access flags (see
+ * {@link jdk.internal.org.objectweb.asm.Opcodes}). This parameter also indicates
+ * if the field is synthetic and/or deprecated.
+ * @param name the field's name.
+ * @param desc the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type
+ * Type}).
+ * @param signature the field's signature.
+ * @param value the field's initial value. This parameter, which may be
+ * <tt>null</tt> if the field does not have an initial value, must be
+ * an {@link Integer}, a {@link Float}, a {@link Long}, a
+ * {@link Double} or a {@link String}.
+ */
+ public FieldNode(
+ final int api,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ super(api);
+ this.access = access;
+ this.name = name;
+ this.desc = desc;
+ this.signature = signature;
+ this.value = value;
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the FieldVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ AnnotationNode an = new AnnotationNode(desc);
+ if (visible) {
+ if (visibleAnnotations == null) {
+ visibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ visibleAnnotations.add(an);
+ } else {
+ if (invisibleAnnotations == null) {
+ invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ invisibleAnnotations.add(an);
+ }
+ return an;
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ if (attrs == null) {
+ attrs = new ArrayList<Attribute>(1);
+ }
+ attrs.add(attr);
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Accept methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Checks that this field node is compatible with the given ASM API version.
+ * This methods checks that this node, and all its nodes recursively, do not
+ * contain elements that were introduced in more recent versions of the ASM
+ * API than the given version.
+ *
+ * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
+ */
+ public void check(final int api) {
+ // nothing to do
+ }
+
+ /**
+ * Makes the given class visitor visit this field.
+ *
+ * @param cv a class visitor.
+ */
+ public void accept(final ClassVisitor cv) {
+ FieldVisitor fv = cv.visitField(access, name, desc, signature, value);
+ if (fv == null) {
+ return;
+ }
+ int i, n;
+ n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = visibleAnnotations.get(i);
+ an.accept(fv.visitAnnotation(an.desc, true));
+ }
+ n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = invisibleAnnotations.get(i);
+ an.accept(fv.visitAnnotation(an.desc, false));
+ }
+ n = attrs == null ? 0 : attrs.size();
+ for (i = 0; i < n; ++i) {
+ fv.visitAttribute(attrs.get(i));
+ }
+ fv.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
new file mode 100644
index 0000000..42975b3
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
@@ -0,0 +1,240 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a stack map frame. These nodes are pseudo instruction
+ * nodes in order to be inserted in an instruction list. In fact these nodes
+ * must(*) be inserted <i>just before</i> any instruction node <b>i</b> that
+ * follows an unconditionnal branch instruction such as GOTO or THROW, that is
+ * the target of a jump instruction, or that starts an exception handler block.
+ * The stack map frame types must describe the values of the local variables and
+ * of the operand stack elements <i>just before</i> <b>i</b> is executed. <br>
+ * <br> (*) this is mandatory only for classes whose version is greater than or
+ * equal to {@link Opcodes#V1_6 V1_6}.
+ *
+ * @author Eric Bruneton
+ */
+public class FrameNode extends AbstractInsnNode {
+
+ /**
+ * The type of this frame. Must be {@link Opcodes#F_NEW} for expanded
+ * frames, or {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND},
+ * {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or
+ * {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for compressed frames.
+ */
+ public int type;
+
+ /**
+ * The types of the local variables of this stack map frame. Elements of
+ * this list can be Integer, String or LabelNode objects (for primitive,
+ * reference and uninitialized types respectively - see
+ * {@link MethodVisitor}).
+ */
+ public List<Object> local;
+
+ /**
+ * The types of the operand stack elements of this stack map frame. Elements
+ * of this list can be Integer, String or LabelNode objects (for primitive,
+ * reference and uninitialized types respectively - see
+ * {@link MethodVisitor}).
+ */
+ public List<Object> stack;
+
+ private FrameNode() {
+ super(-1);
+ }
+
+ /**
+ * Constructs a new {@link FrameNode}.
+ *
+ * @param type the type of this frame. Must be {@link Opcodes#F_NEW} for
+ * expanded frames, or {@link Opcodes#F_FULL},
+ * {@link Opcodes#F_APPEND}, {@link Opcodes#F_CHOP},
+ * {@link Opcodes#F_SAME} or {@link Opcodes#F_APPEND},
+ * {@link Opcodes#F_SAME1} for compressed frames.
+ * @param nLocal number of local variables of this stack map frame.
+ * @param local the types of the local variables of this stack map frame.
+ * Elements of this list can be Integer, String or LabelNode objects
+ * (for primitive, reference and uninitialized types respectively -
+ * see {@link MethodVisitor}).
+ * @param nStack number of operand stack elements of this stack map frame.
+ * @param stack the types of the operand stack elements of this stack map
+ * frame. Elements of this list can be Integer, String or LabelNode
+ * objects (for primitive, reference and uninitialized types
+ * respectively - see {@link MethodVisitor}).
+ */
+ public FrameNode(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ super(-1);
+ this.type = type;
+ switch (type) {
+ case Opcodes.F_NEW:
+ case Opcodes.F_FULL:
+ this.local = asList(nLocal, local);
+ this.stack = asList(nStack, stack);
+ break;
+ case Opcodes.F_APPEND:
+ this.local = asList(nLocal, local);
+ break;
+ case Opcodes.F_CHOP:
+ this.local = Arrays.asList(new Object[nLocal]);
+ break;
+ case Opcodes.F_SAME:
+ break;
+ case Opcodes.F_SAME1:
+ this.stack = asList(1, stack);
+ break;
+ }
+ }
+
+ @Override
+ public int getType() {
+ return FRAME;
+ }
+
+ /**
+ * Makes the given visitor visit this stack map frame.
+ *
+ * @param mv a method visitor.
+ */
+ @Override
+ public void accept(final MethodVisitor mv) {
+ switch (type) {
+ case Opcodes.F_NEW:
+ case Opcodes.F_FULL:
+ mv.visitFrame(type,
+ local.size(),
+ asArray(local),
+ stack.size(),
+ asArray(stack));
+ break;
+ case Opcodes.F_APPEND:
+ mv.visitFrame(type, local.size(), asArray(local), 0, null);
+ break;
+ case Opcodes.F_CHOP:
+ mv.visitFrame(type, local.size(), null, 0, null);
+ break;
+ case Opcodes.F_SAME:
+ mv.visitFrame(type, 0, null, 0, null);
+ break;
+ case Opcodes.F_SAME1:
+ mv.visitFrame(type, 0, null, 1, asArray(stack));
+ break;
+ }
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ FrameNode clone = new FrameNode();
+ clone.type = type;
+ if (local != null) {
+ clone.local = new ArrayList<Object>();
+ for (int i = 0; i < local.size(); ++i) {
+ Object l = local.get(i);
+ if (l instanceof LabelNode) {
+ l = labels.get(l);
+ }
+ clone.local.add(l);
+ }
+ }
+ if (stack != null) {
+ clone.stack = new ArrayList<Object>();
+ for (int i = 0; i < stack.size(); ++i) {
+ Object s = stack.get(i);
+ if (s instanceof LabelNode) {
+ s = labels.get(s);
+ }
+ clone.stack.add(s);
+ }
+ }
+ return clone;
+ }
+
+ // ------------------------------------------------------------------------
+
+ private static List<Object> asList(final int n, final Object[] o) {
+ return Arrays.asList(o).subList(0, n);
+ }
+
+ private static Object[] asArray(final List<Object> l) {
+ Object[] objs = new Object[l.size()];
+ for (int i = 0; i < objs.length; ++i) {
+ Object o = l.get(i);
+ if (o instanceof LabelNode) {
+ o = ((LabelNode) o).getLabel();
+ }
+ objs[i] = o;
+ }
+ return objs;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
new file mode 100644
index 0000000..2c390e5
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
@@ -0,0 +1,109 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an IINC instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class IincInsnNode extends AbstractInsnNode {
+
+ /**
+ * Index of the local variable to be incremented.
+ */
+ public int var;
+
+ /**
+ * Amount to increment the local variable by.
+ */
+ public int incr;
+
+ /**
+ * Constructs a new {@link IincInsnNode}.
+ *
+ * @param var index of the local variable to be incremented.
+ * @param incr increment amount to increment the local variable by.
+ */
+ public IincInsnNode(final int var, final int incr) {
+ super(Opcodes.IINC);
+ this.var = var;
+ this.incr = incr;
+ }
+
+ @Override
+ public int getType() {
+ return IINC_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitIincInsn(var, incr);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new IincInsnNode(var, incr);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
new file mode 100644
index 0000000..38e19d9
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
@@ -0,0 +1,130 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+
+/**
+ * A node that represents an inner class.
+ *
+ * @author Eric Bruneton
+ */
+public class InnerClassNode {
+
+ /**
+ * The internal name of an inner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ */
+ public String name;
+
+ /**
+ * The internal name of the class to which the inner class belongs (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}). May
+ * be <tt>null</tt>.
+ */
+ public String outerName;
+
+ /**
+ * The (simple) name of the inner class inside its enclosing class. May be
+ * <tt>null</tt> for anonymous inner classes.
+ */
+ public String innerName;
+
+ /**
+ * The access flags of the inner class as originally declared in the
+ * enclosing class.
+ */
+ public int access;
+
+ /**
+ * Constructs a new {@link InnerClassNode}.
+ *
+ * @param name the internal name of an inner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ * @param outerName the internal name of the class to which the inner class
+ * belongs (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ * May be <tt>null</tt>.
+ * @param innerName the (simple) name of the inner class inside its
+ * enclosing class. May be <tt>null</tt> for anonymous inner
+ * classes.
+ * @param access the access flags of the inner class as originally declared
+ * in the enclosing class.
+ */
+ public InnerClassNode(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ this.name = name;
+ this.outerName = outerName;
+ this.innerName = innerName;
+ this.access = access;
+ }
+
+ /**
+ * Makes the given class visitor visit this inner class.
+ *
+ * @param cv a class visitor.
+ */
+ public void accept(final ClassVisitor cv) {
+ cv.visitInnerClass(name, outerName, innerName, access);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
new file mode 100644
index 0000000..d1c2f5c
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
@@ -0,0 +1,607 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A doubly linked list of {@link AbstractInsnNode} objects. <i>This
+ * implementation is not thread safe</i>.
+ */
+public class InsnList {
+
+ /**
+ * The number of instructions in this list.
+ */
+ private int size;
+
+ /**
+ * The first instruction in this list. May be <tt>null</tt>.
+ */
+ private AbstractInsnNode first;
+
+ /**
+ * The last instruction in this list. May be <tt>null</tt>.
+ */
+ private AbstractInsnNode last;
+
+ /**
+ * A cache of the instructions of this list. This cache is used to improve
+ * the performance of the {@link #get} method.
+ */
+ AbstractInsnNode[] cache;
+
+ /**
+ * Returns the number of instructions in this list.
+ *
+ * @return the number of instructions in this list.
+ */
+ public int size() {
+ return size;
+ }
+
+ /**
+ * Returns the first instruction in this list.
+ *
+ * @return the first instruction in this list, or <tt>null</tt> if the
+ * list is empty.
+ */
+ public AbstractInsnNode getFirst() {
+ return first;
+ }
+
+ /**
+ * Returns the last instruction in this list.
+ *
+ * @return the last instruction in this list, or <tt>null</tt> if the list
+ * is empty.
+ */
+ public AbstractInsnNode getLast() {
+ return last;
+ }
+
+ /**
+ * Returns the instruction whose index is given. This method builds a cache
+ * of the instructions in this list to avoid scanning the whole list each
+ * time it is called. Once the cache is built, this method run in constant
+ * time. This cache is invalidated by all the methods that modify the list.
+ *
+ * @param index the index of the instruction that must be returned.
+ * @return the instruction whose index is given.
+ * @throws IndexOutOfBoundsException if (index < 0 || index >= size()).
+ */
+ public AbstractInsnNode get(final int index) {
+ if (index < 0 || index >= size) {
+ throw new IndexOutOfBoundsException();
+ }
+ if (cache == null) {
+ cache = toArray();
+ }
+ return cache[index];
+ }
+
+ /**
+ * Returns <tt>true</tt> if the given instruction belongs to this list.
+ * This method always scans the instructions of this list until it finds the
+ * given instruction or reaches the end of the list.
+ *
+ * @param insn an instruction.
+ * @return <tt>true</tt> if the given instruction belongs to this list.
+ */
+ public boolean contains(final AbstractInsnNode insn) {
+ AbstractInsnNode i = first;
+ while (i != null && i != insn) {
+ i = i.next;
+ }
+ return i != null;
+ }
+
+ /**
+ * Returns the index of the given instruction in this list. This method
+ * builds a cache of the instruction indexes to avoid scanning the whole
+ * list each time it is called. Once the cache is built, this method run in
+ * constant time. The cache is invalidated by all the methods that modify
+ * the list.
+ *
+ * @param insn an instruction <i>of this list</i>.
+ * @return the index of the given instruction in this list. <i>The result of
+ * this method is undefined if the given instruction does not belong
+ * to this list</i>. Use {@link #contains contains} to test if an
+ * instruction belongs to an instruction list or not.
+ */
+ public int indexOf(final AbstractInsnNode insn) {
+ if (cache == null) {
+ cache = toArray();
+ }
+ return insn.index;
+ }
+
+ /**
+ * Makes the given visitor visit all of the instructions in this list.
+ *
+ * @param mv the method visitor that must visit the instructions.
+ */
+ public void accept(final MethodVisitor mv) {
+ AbstractInsnNode insn = first;
+ while (insn != null) {
+ insn.accept(mv);
+ insn = insn.next;
+ }
+ }
+
+ /**
+ * Returns an iterator over the instructions in this list.
+ *
+ * @return an iterator over the instructions in this list.
+ */
+ public ListIterator<AbstractInsnNode> iterator() {
+ return iterator(0);
+ }
+
+ /**
+ * Returns an iterator over the instructions in this list.
+ *
+ * @return an iterator over the instructions in this list.
+ */
+ @SuppressWarnings("unchecked")
+ public ListIterator<AbstractInsnNode> iterator(int index) {
+ return new InsnListIterator(index);
+ }
+
+ /**
+ * Returns an array containing all of the instructions in this list.
+ *
+ * @return an array containing all of the instructions in this list.
+ */
+ public AbstractInsnNode[] toArray() {
+ int i = 0;
+ AbstractInsnNode elem = first;
+ AbstractInsnNode[] insns = new AbstractInsnNode[size];
+ while (elem != null) {
+ insns[i] = elem;
+ elem.index = i++;
+ elem = elem.next;
+ }
+ return insns;
+ }
+
+ /**
+ * Replaces an instruction of this list with another instruction.
+ *
+ * @param location an instruction <i>of this list</i>.
+ * @param insn another instruction, <i>which must not belong to any
+ * {@link InsnList}</i>.
+ */
+ public void set(final AbstractInsnNode location, final AbstractInsnNode insn) {
+ AbstractInsnNode next = location.next;
+ insn.next = next;
+ if (next != null) {
+ next.prev = insn;
+ } else {
+ last = insn;
+ }
+ AbstractInsnNode prev = location.prev;
+ insn.prev = prev;
+ if (prev != null) {
+ prev.next = insn;
+ } else {
+ first = insn;
+ }
+ if (cache != null) {
+ int index = location.index;
+ cache[index] = insn;
+ insn.index = index;
+ } else {
+ insn.index = 0; // insn now belongs to an InsnList
+ }
+ location.index = -1; // i no longer belongs to an InsnList
+ location.prev = null;
+ location.next = null;
+ }
+
+ /**
+ * Adds the given instruction to the end of this list.
+ *
+ * @param insn an instruction, <i>which must not belong to any
+ * {@link InsnList}</i>.
+ */
+ public void add(final AbstractInsnNode insn) {
+ ++size;
+ if (last == null) {
+ first = insn;
+ last = insn;
+ } else {
+ last.next = insn;
+ insn.prev = last;
+ }
+ last = insn;
+ cache = null;
+ insn.index = 0; // insn now belongs to an InsnList
+ }
+
+ /**
+ * Adds the given instructions to the end of this list.
+ *
+ * @param insns an instruction list, which is cleared during the process.
+ * This list must be different from 'this'.
+ */
+ public void add(final InsnList insns) {
+ if (insns.size == 0) {
+ return;
+ }
+ size += insns.size;
+ if (last == null) {
+ first = insns.first;
+ last = insns.last;
+ } else {
+ AbstractInsnNode elem = insns.first;
+ last.next = elem;
+ elem.prev = last;
+ last = insns.last;
+ }
+ cache = null;
+ insns.removeAll(false);
+ }
+
+ /**
+ * Inserts the given instruction at the begining of this list.
+ *
+ * @param insn an instruction, <i>which must not belong to any
+ * {@link InsnList}</i>.
+ */
+ public void insert(final AbstractInsnNode insn) {
+ ++size;
+ if (first == null) {
+ first = insn;
+ last = insn;
+ } else {
+ first.prev = insn;
+ insn.next = first;
+ }
+ first = insn;
+ cache = null;
+ insn.index = 0; // insn now belongs to an InsnList
+ }
+
+ /**
+ * Inserts the given instructions at the begining of this list.
+ *
+ * @param insns an instruction list, which is cleared during the process.
+ * This list must be different from 'this'.
+ */
+ public void insert(final InsnList insns) {
+ if (insns.size == 0) {
+ return;
+ }
+ size += insns.size;
+ if (first == null) {
+ first = insns.first;
+ last = insns.last;
+ } else {
+ AbstractInsnNode elem = insns.last;
+ first.prev = elem;
+ elem.next = first;
+ first = insns.first;
+ }
+ cache = null;
+ insns.removeAll(false);
+ }
+
+ /**
+ * Inserts the given instruction after the specified instruction.
+ *
+ * @param location an instruction <i>of this list</i> after which insn must be
+ * inserted.
+ * @param insn the instruction to be inserted, <i>which must not belong to
+ * any {@link InsnList}</i>.
+ */
+ public void insert(final AbstractInsnNode location, final AbstractInsnNode insn) {
+ ++size;
+ AbstractInsnNode next = location.next;
+ if (next == null) {
+ last = insn;
+ } else {
+ next.prev = insn;
+ }
+ location.next = insn;
+ insn.next = next;
+ insn.prev = location;
+ cache = null;
+ insn.index = 0; // insn now belongs to an InsnList
+ }
+
+ /**
+ * Inserts the given instructions after the specified instruction.
+ *
+ * @param location an instruction <i>of this list</i> after which the
+ * instructions must be inserted.
+ * @param insns the instruction list to be inserted, which is cleared during
+ * the process. This list must be different from 'this'.
+ */
+ public void insert(final AbstractInsnNode location, final InsnList insns) {
+ if (insns.size == 0) {
+ return;
+ }
+ size += insns.size;
+ AbstractInsnNode ifirst = insns.first;
+ AbstractInsnNode ilast = insns.last;
+ AbstractInsnNode next = location.next;
+ if (next == null) {
+ last = ilast;
+ } else {
+ next.prev = ilast;
+ }
+ location.next = ifirst;
+ ilast.next = next;
+ ifirst.prev = location;
+ cache = null;
+ insns.removeAll(false);
+ }
+
+ /**
+ * Inserts the given instruction before the specified instruction.
+ *
+ * @param location an instruction <i>of this list</i> before which insn must be
+ * inserted.
+ * @param insn the instruction to be inserted, <i>which must not belong to
+ * any {@link InsnList}</i>.
+ */
+ public void insertBefore(final AbstractInsnNode location, final AbstractInsnNode insn) {
+ ++size;
+ AbstractInsnNode prev = location.prev;
+ if (prev == null) {
+ first = insn;
+ } else {
+ prev.next = insn;
+ }
+ location.prev = insn;
+ insn.next = location;
+ insn.prev = prev;
+ cache = null;
+ insn.index = 0; // insn now belongs to an InsnList
+ }
+
+ /**
+ * Inserts the given instructions before the specified instruction.
+ *
+ * @param location an instruction <i>of this list</i> before which the instructions
+ * must be inserted.
+ * @param insns the instruction list to be inserted, which is cleared during
+ * the process. This list must be different from 'this'.
+ */
+ public void insertBefore(final AbstractInsnNode location, final InsnList insns) {
+ if (insns.size == 0) {
+ return;
+ }
+ size += insns.size;
+ AbstractInsnNode ifirst = insns.first;
+ AbstractInsnNode ilast = insns.last;
+ AbstractInsnNode prev = location .prev;
+ if (prev == null) {
+ first = ifirst;
+ } else {
+ prev.next = ifirst;
+ }
+ location .prev = ilast;
+ ilast.next = location ;
+ ifirst.prev = prev;
+ cache = null;
+ insns.removeAll(false);
+ }
+
+
+
+ /**
+ * Removes the given instruction from this list.
+ *
+ * @param insn the instruction <i>of this list</i> that must be removed.
+ */
+ public void remove(final AbstractInsnNode insn) {
+ --size;
+ AbstractInsnNode next = insn.next;
+ AbstractInsnNode prev = insn.prev;
+ if (next == null) {
+ if (prev == null) {
+ first = null;
+ last = null;
+ } else {
+ prev.next = null;
+ last = prev;
+ }
+ } else {
+ if (prev == null) {
+ first = next;
+ next.prev = null;
+ } else {
+ prev.next = next;
+ next.prev = prev;
+ }
+ }
+ cache = null;
+ insn.index = -1; // insn no longer belongs to an InsnList
+ insn.prev = null;
+ insn.next = null;
+ }
+
+ /**
+ * Removes all of the instructions of this list.
+ *
+ * @param mark if the instructions must be marked as no longer belonging to
+ * any {@link InsnList}.
+ */
+ void removeAll(final boolean mark) {
+ if (mark) {
+ AbstractInsnNode insn = first;
+ while (insn != null) {
+ AbstractInsnNode next = insn.next;
+ insn.index = -1; // insn no longer belongs to an InsnList
+ insn.prev = null;
+ insn.next = null;
+ insn = next;
+ }
+ }
+ size = 0;
+ first = null;
+ last = null;
+ cache = null;
+ }
+
+ /**
+ * Removes all of the instructions of this list.
+ */
+ public void clear() {
+ removeAll(false);
+ }
+
+ /**
+ * Reset all labels in the instruction list. This method should be called
+ * before reusing same instructions list between several
+ * <code>ClassWriter</code>s.
+ */
+ public void resetLabels() {
+ AbstractInsnNode insn = first;
+ while (insn != null) {
+ if (insn instanceof LabelNode) {
+ ((LabelNode) insn).resetLabel();
+ }
+ insn = insn.next;
+ }
+ }
+
+ // this class is not generified because it will create bridges
+ private final class InsnListIterator implements ListIterator/*<AbstractInsnNode>*/ {
+
+ AbstractInsnNode next;
+
+ AbstractInsnNode prev;
+
+ InsnListIterator(int index) {
+ if(index==size()) {
+ next = null;
+ prev = getLast();
+ } else {
+ next = get(index);
+ prev = next.prev;
+ }
+ }
+
+ public boolean hasNext() {
+ return next != null;
+ }
+
+ public Object next() {
+ if (next == null) {
+ throw new NoSuchElementException();
+ }
+ AbstractInsnNode result = next;
+ prev = result;
+ next = result.next;
+ return result;
+ }
+
+ public void remove() {
+ InsnList.this.remove(prev);
+ prev = prev.prev;
+ }
+
+ public boolean hasPrevious() {
+ return prev != null;
+ }
+
+ public Object previous() {
+ AbstractInsnNode result = prev;
+ next = result;
+ prev = result.prev;
+ return result;
+ }
+
+ public int nextIndex() {
+ if (next == null) {
+ return size();
+ }
+ if (cache == null) {
+ cache = toArray();
+ }
+ return next.index;
+ }
+
+ public int previousIndex() {
+ if (prev == null) {
+ return -1;
+ }
+ if (cache == null) {
+ cache = toArray();
+ }
+ return prev.index;
+ }
+
+ public void add(Object o) {
+ InsnList.this.insertBefore(next, (AbstractInsnNode) o);
+ prev = (AbstractInsnNode) o;
+ }
+
+ public void set(Object o) {
+ InsnList.this.set(next.prev, (AbstractInsnNode) o);
+ prev = (AbstractInsnNode) o;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
new file mode 100644
index 0000000..62ac385
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
@@ -0,0 +1,113 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a zero operand instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class InsnNode extends AbstractInsnNode {
+
+ /**
+ * Constructs a new {@link InsnNode}.
+ *
+ * @param opcode the opcode of the instruction to be constructed. This
+ * opcode must be NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
+ * ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
+ * FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD, LALOAD,
+ * FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IASTORE, LASTORE,
+ * FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE, POP, POP2,
+ * DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP, IADD, LADD,
+ * FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV,
+ * LDIV, FDIV, DDIV, IREM, LREM, FREM, DREM, INEG, LNEG, FNEG, DNEG,
+ * ISHL, LSHL, ISHR, LSHR, IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR,
+ * LXOR, I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F,
+ * I2B, I2C, I2S, LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN,
+ * FRETURN, DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW,
+ * MONITORENTER, or MONITOREXIT.
+ */
+ public InsnNode(final int opcode) {
+ super(opcode);
+ }
+
+ @Override
+ public int getType() {
+ return INSN;
+ }
+
+ /**
+ * Makes the given visitor visit this instruction.
+ *
+ * @param mv a method visitor.
+ */
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitInsn(opcode);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new InsnNode(opcode);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
new file mode 100644
index 0000000..d1b88f5
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
@@ -0,0 +1,113 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents an instruction with a single int operand.
+ *
+ * @author Eric Bruneton
+ */
+public class IntInsnNode extends AbstractInsnNode {
+
+ /**
+ * The operand of this instruction.
+ */
+ public int operand;
+
+ /**
+ * Constructs a new {@link IntInsnNode}.
+ *
+ * @param opcode the opcode of the instruction to be constructed. This
+ * opcode must be BIPUSH, SIPUSH or NEWARRAY.
+ * @param operand the operand of the instruction to be constructed.
+ */
+ public IntInsnNode(final int opcode, final int operand) {
+ super(opcode);
+ this.operand = operand;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be BIPUSH,
+ * SIPUSH or NEWARRAY.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return INT_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitIntInsn(opcode, operand);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new IntInsnNode(opcode, operand);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
new file mode 100644
index 0000000..2370b30
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
@@ -0,0 +1,129 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an invokedynamic instruction.
+ *
+ * @author Remi Forax
+ */
+public class InvokeDynamicInsnNode extends AbstractInsnNode {
+
+ /**
+ * Invokedynamic name.
+ */
+ public String name;
+
+ /**
+ * Invokedynamic descriptor.
+ */
+ public String desc;
+
+ /**
+ * Bootstrap method
+ */
+ public Handle bsm;
+
+ /**
+ * Bootstrap constant arguments
+ */
+ public Object[] bsmArgs;
+
+ /**
+ * Constructs a new {@link InvokeDynamicInsnNode}.
+ *
+ * @param name invokedynamic name.
+ * @param desc invokedynamic descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ * @param bsm the bootstrap method.
+ * @param bsmArgs the boostrap constant arguments.
+ */
+ public InvokeDynamicInsnNode(
+ final String name,
+ final String desc,
+ final Handle bsm,
+ final Object... bsmArgs)
+ {
+ super(Opcodes.INVOKEDYNAMIC);
+ this.name = name;
+ this.desc = desc;
+ this.bsm = bsm;
+ this.bsmArgs = bsmArgs;
+ }
+
+ @Override
+ public int getType() {
+ return INVOKE_DYNAMIC_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
new file mode 100644
index 0000000..265e1c8
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
@@ -0,0 +1,121 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a jump instruction. A jump instruction is an
+ * instruction that may jump to another instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class JumpInsnNode extends AbstractInsnNode {
+
+ /**
+ * The operand of this instruction. This operand is a label that designates
+ * the instruction to which this instruction may jump.
+ */
+ public LabelNode label;
+
+ /**
+ * Constructs a new {@link JumpInsnNode}.
+ *
+ * @param opcode the opcode of the type instruction to be constructed. This
+ * opcode must be IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+ * IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ,
+ * IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+ * @param label the operand of the instruction to be constructed. This
+ * operand is a label that designates the instruction to which the
+ * jump instruction may jump.
+ */
+ public JumpInsnNode(final int opcode, final LabelNode label) {
+ super(opcode);
+ this.label = label;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be IFEQ, IFNE,
+ * IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT,
+ * IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE, GOTO, JSR,
+ * IFNULL or IFNONNULL.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return JUMP_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitJumpInsn(opcode, label.getLabel());
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new JumpInsnNode(opcode, clone(label, labels));
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
new file mode 100644
index 0000000..2dd61f4
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
@@ -0,0 +1,107 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * An {@link AbstractInsnNode} that encapsulates a {@link Label}.
+ */
+public class LabelNode extends AbstractInsnNode {
+
+ private Label label;
+
+ public LabelNode() {
+ super(-1);
+ }
+
+ public LabelNode(final Label label) {
+ super(-1);
+ this.label = label;
+ }
+
+ @Override
+ public int getType() {
+ return LABEL;
+ }
+
+ public Label getLabel() {
+ if (label == null) {
+ label = new Label();
+ }
+ return label;
+ }
+
+ @Override
+ public void accept(final MethodVisitor cv) {
+ cv.visitLabel(getLabel());
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return labels.get(this);
+ }
+
+ public void resetLabel() {
+ label = null;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
new file mode 100644
index 0000000..7220d91
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
@@ -0,0 +1,106 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents an LDC instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class LdcInsnNode extends AbstractInsnNode {
+
+ /**
+ * The constant to be loaded on the stack. This parameter must be a non null
+ * {@link Integer}, a {@link Float}, a {@link Long}, a {@link Double}, a
+ * {@link String} or a {@link jdk.internal.org.objectweb.asm.Type}.
+ */
+ public Object cst;
+
+ /**
+ * Constructs a new {@link LdcInsnNode}.
+ *
+ * @param cst the constant to be loaded on the stack. This parameter must be
+ * a non null {@link Integer}, a {@link Float}, a {@link Long}, a
+ * {@link Double} or a {@link String}.
+ */
+ public LdcInsnNode(final Object cst) {
+ super(Opcodes.LDC);
+ this.cst = cst;
+ }
+
+ @Override
+ public int getType() {
+ return LDC_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitLdcInsn(cst);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new LdcInsnNode(cst);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
new file mode 100644
index 0000000..7160d30
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
@@ -0,0 +1,111 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a line number declaration. These nodes are pseudo
+ * instruction nodes in order to be inserted in an instruction list.
+ *
+ * @author Eric Bruneton
+ */
+public class LineNumberNode extends AbstractInsnNode {
+
+ /**
+ * A line number. This number refers to the source file from which the class
+ * was compiled.
+ */
+ public int line;
+
+ /**
+ * The first instruction corresponding to this line number.
+ */
+ public LabelNode start;
+
+ /**
+ * Constructs a new {@link LineNumberNode}.
+ *
+ * @param line a line number. This number refers to the source file from
+ * which the class was compiled.
+ * @param start the first instruction corresponding to this line number.
+ */
+ public LineNumberNode(final int line, final LabelNode start) {
+ super(-1);
+ this.line = line;
+ this.start = start;
+ }
+
+ @Override
+ public int getType() {
+ return LINE;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitLineNumber(line, start.getLabel());
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new LineNumberNode(line, clone(start, labels));
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
new file mode 100644
index 0000000..0d3272b
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
@@ -0,0 +1,144 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a local variable declaration.
+ *
+ * @author Eric Bruneton
+ */
+public class LocalVariableNode {
+
+ /**
+ * The name of a local variable.
+ */
+ public String name;
+
+ /**
+ * The type descriptor of this local variable.
+ */
+ public String desc;
+
+ /**
+ * The signature of this local variable. May be <tt>null</tt>.
+ */
+ public String signature;
+
+ /**
+ * The first instruction corresponding to the scope of this local variable
+ * (inclusive).
+ */
+ public LabelNode start;
+
+ /**
+ * The last instruction corresponding to the scope of this local variable
+ * (exclusive).
+ */
+ public LabelNode end;
+
+ /**
+ * The local variable's index.
+ */
+ public int index;
+
+ /**
+ * Constructs a new {@link LocalVariableNode}.
+ *
+ * @param name the name of a local variable.
+ * @param desc the type descriptor of this local variable.
+ * @param signature the signature of this local variable. May be
+ * <tt>null</tt>.
+ * @param start the first instruction corresponding to the scope of this
+ * local variable (inclusive).
+ * @param end the last instruction corresponding to the scope of this local
+ * variable (exclusive).
+ * @param index the local variable's index.
+ */
+ public LocalVariableNode(
+ final String name,
+ final String desc,
+ final String signature,
+ final LabelNode start,
+ final LabelNode end,
+ final int index)
+ {
+ this.name = name;
+ this.desc = desc;
+ this.signature = signature;
+ this.start = start;
+ this.end = end;
+ this.index = index;
+ }
+
+ /**
+ * Makes the given visitor visit this local variable declaration.
+ *
+ * @param mv a method visitor.
+ */
+ public void accept(final MethodVisitor mv) {
+ mv.visitLocalVariable(name,
+ desc,
+ signature,
+ start.getLabel(),
+ end.getLabel(),
+ index);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
new file mode 100644
index 0000000..8a801dd
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -0,0 +1,145 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a LOOKUPSWITCH instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class LookupSwitchInsnNode extends AbstractInsnNode {
+
+ /**
+ * Beginning of the default handler block.
+ */
+ public LabelNode dflt;
+
+ /**
+ * The values of the keys. This list is a list of {@link Integer} objects.
+ */
+ public List<Integer> keys;
+
+ /**
+ * Beginnings of the handler blocks. This list is a list of
+ * {@link LabelNode} objects.
+ */
+ public List<LabelNode> labels;
+
+ /**
+ * Constructs a new {@link LookupSwitchInsnNode}.
+ *
+ * @param dflt beginning of the default handler block.
+ * @param keys the values of the keys.
+ * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+ * the beginning of the handler block for the <tt>keys[i]</tt> key.
+ */
+ public LookupSwitchInsnNode(
+ final LabelNode dflt,
+ final int[] keys,
+ final LabelNode[] labels)
+ {
+ super(Opcodes.LOOKUPSWITCH);
+ this.dflt = dflt;
+ this.keys = new ArrayList<Integer>(keys == null ? 0 : keys.length);
+ this.labels = new ArrayList<LabelNode>(labels == null ? 0 : labels.length);
+ if (keys != null) {
+ for (int i = 0; i < keys.length; ++i) {
+ this.keys.add(new Integer(keys[i]));
+ }
+ }
+ if (labels != null) {
+ this.labels.addAll(Arrays.asList(labels));
+ }
+ }
+
+ @Override
+ public int getType() {
+ return LOOKUPSWITCH_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ int[] keys = new int[this.keys.size()];
+ for (int i = 0; i < keys.length; ++i) {
+ keys[i] = this.keys.get(i).intValue();
+ }
+ Label[] labels = new Label[this.labels.size()];
+ for (int i = 0; i < labels.length; ++i) {
+ labels[i] = this.labels.get(i).getLabel();
+ }
+ mv.visitLookupSwitchInsn(dflt.getLabel(), keys, labels);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ LookupSwitchInsnNode clone = new LookupSwitchInsnNode(clone(dflt,
+ labels), null, clone(this.labels, labels));
+ clone.keys.addAll(keys);
+ return clone;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
new file mode 100644
index 0000000..16d554f
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
@@ -0,0 +1,136 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a method instruction. A method instruction is an
+ * instruction that invokes a method.
+ *
+ * @author Eric Bruneton
+ */
+public class MethodInsnNode extends AbstractInsnNode {
+
+ /**
+ * The internal name of the method's owner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ */
+ public String owner;
+
+ /**
+ * The method's name.
+ */
+ public String name;
+
+ /**
+ * The method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public String desc;
+
+ /**
+ * Constructs a new {@link MethodInsnNode}.
+ *
+ * @param opcode the opcode of the type instruction to be constructed. This
+ * opcode must be INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+ * INVOKEINTERFACE.
+ * @param owner the internal name of the method's owner class (see
+ * {@link jdk.internal.org.objectweb.asm.Type#getInternalName() getInternalName}).
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public MethodInsnNode(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ super(opcode);
+ this.owner = owner;
+ this.name = name;
+ this.desc = desc;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be
+ * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return METHOD_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitMethodInsn(opcode, owner, name, desc);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new MethodInsnNode(opcode, owner, name, desc);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
new file mode 100644
index 0000000..ab60cf2
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
@@ -0,0 +1,675 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A node that represents a method.
+ *
+ * @author Eric Bruneton
+ */
+public class MethodNode extends MethodVisitor {
+
+ /**
+ * The method's access flags (see {@link Opcodes}). This field also
+ * indicates if the method is synthetic and/or deprecated.
+ */
+ public int access;
+
+ /**
+ * The method's name.
+ */
+ public String name;
+
+ /**
+ * The method's descriptor (see {@link Type}).
+ */
+ public String desc;
+
+ /**
+ * The method's signature. May be <tt>null</tt>.
+ */
+ public String signature;
+
+ /**
+ * The internal names of the method's exception classes (see
+ * {@link Type#getInternalName() getInternalName}). This list is a list of
+ * {@link String} objects.
+ */
+ public List<String> exceptions;
+
+ /**
+ * The runtime visible annotations of this method. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label visible
+ */
+ public List<AnnotationNode> visibleAnnotations;
+
+ /**
+ * The runtime invisible annotations of this method. This list is a list of
+ * {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label invisible
+ */
+ public List<AnnotationNode> invisibleAnnotations;
+
+ /**
+ * The non standard attributes of this method. This list is a list of
+ * {@link Attribute} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.Attribute
+ */
+ public List<Attribute> attrs;
+
+ /**
+ * The default value of this annotation interface method. This field must be
+ * a {@link Byte}, {@link Boolean}, {@link Character}, {@link Short},
+ * {@link Integer}, {@link Long}, {@link Float}, {@link Double},
+ * {@link String} or {@link Type}, or an two elements String array (for
+ * enumeration values), a {@link AnnotationNode}, or a {@link List} of
+ * values of one of the preceding types. May be <tt>null</tt>.
+ */
+ public Object annotationDefault;
+
+ /**
+ * The runtime visible parameter annotations of this method. These lists are
+ * lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label invisible parameters
+ */
+ public List<AnnotationNode>[] visibleParameterAnnotations;
+
+ /**
+ * The runtime invisible parameter annotations of this method. These lists
+ * are lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AnnotationNode
+ * @label visible parameters
+ */
+ public List<AnnotationNode>[] invisibleParameterAnnotations;
+
+ /**
+ * The instructions of this method. This list is a list of
+ * {@link AbstractInsnNode} objects.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.AbstractInsnNode
+ * @label instructions
+ */
+ public InsnList instructions;
+
+ /**
+ * The try catch blocks of this method. This list is a list of
+ * {@link TryCatchBlockNode} objects.
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode
+ */
+ public List<TryCatchBlockNode> tryCatchBlocks;
+
+ /**
+ * The maximum stack size of this method.
+ */
+ public int maxStack;
+
+ /**
+ * The maximum number of local variables of this method.
+ */
+ public int maxLocals;
+
+ /**
+ * The local variables of this method. This list is a list of
+ * {@link LocalVariableNode} objects. May be <tt>null</tt>
+ *
+ * @associates jdk.internal.org.objectweb.asm.tree.LocalVariableNode
+ */
+ public List<LocalVariableNode> localVariables;
+
+ /**
+ * If the accept method has been called on this object.
+ */
+ private boolean visited;
+
+ /**
+ * Constructs an uninitialized {@link MethodNode}. <i>Subclasses must not
+ * use this constructor</i>. Instead, they must use the
+ * {@link #MethodNode(int)} version.
+ */
+ public MethodNode() {
+ this(Opcodes.ASM4);
+ }
+
+ /**
+ * Constructs an uninitialized {@link MethodNode}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ public MethodNode(final int api) {
+ super(api);
+ this.instructions = new InsnList();
+ }
+
+ /**
+ * Constructs a new {@link MethodNode}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #MethodNode(int, int, String, String, String, String[])} version.
+ *
+ * @param access the method's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the method is synthetic and/or
+ * deprecated.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type}).
+ * @param signature the method's signature. May be <tt>null</tt>.
+ * @param exceptions the internal names of the method's exception classes
+ * (see {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ */
+ public MethodNode(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ this(Opcodes.ASM4, access, name, desc, signature, exceptions);
+ }
+
+ /**
+ * Constructs a new {@link MethodNode}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param access the method's access flags (see {@link Opcodes}). This
+ * parameter also indicates if the method is synthetic and/or
+ * deprecated.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type}).
+ * @param signature the method's signature. May be <tt>null</tt>.
+ * @param exceptions the internal names of the method's exception classes
+ * (see {@link Type#getInternalName() getInternalName}). May be
+ * <tt>null</tt>.
+ */
+ public MethodNode(
+ final int api,
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ super(api);
+ this.access = access;
+ this.name = name;
+ this.desc = desc;
+ this.signature = signature;
+ this.exceptions = new ArrayList<String>(exceptions == null
+ ? 0
+ : exceptions.length);
+ boolean isAbstract = (access & Opcodes.ACC_ABSTRACT) != 0;
+ if (!isAbstract) {
+ this.localVariables = new ArrayList<LocalVariableNode>(5);
+ }
+ this.tryCatchBlocks = new ArrayList<TryCatchBlockNode>();
+ if (exceptions != null) {
+ this.exceptions.addAll(Arrays.asList(exceptions));
+ }
+ this.instructions = new InsnList();
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the MethodVisitor abstract class
+ // ------------------------------------------------------------------------
+
+ @Override
+ public AnnotationVisitor visitAnnotationDefault() {
+ return new AnnotationNode(new ArrayList<Object>(0) {
+ @Override
+ public boolean add(final Object o) {
+ annotationDefault = o;
+ return super.add(o);
+ }
+ });
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ AnnotationNode an = new AnnotationNode(desc);
+ if (visible) {
+ if (visibleAnnotations == null) {
+ visibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ visibleAnnotations.add(an);
+ } else {
+ if (invisibleAnnotations == null) {
+ invisibleAnnotations = new ArrayList<AnnotationNode>(1);
+ }
+ invisibleAnnotations.add(an);
+ }
+ return an;
+ }
+
+ @Override
+ public AnnotationVisitor visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ AnnotationNode an = new AnnotationNode(desc);
+ if (visible) {
+ if (visibleParameterAnnotations == null) {
+ int params = Type.getArgumentTypes(this.desc).length;
+ visibleParameterAnnotations = (List<AnnotationNode>[])new List<?>[params];
+ }
+ if (visibleParameterAnnotations[parameter] == null) {
+ visibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(1);
+ }
+ visibleParameterAnnotations[parameter].add(an);
+ } else {
+ if (invisibleParameterAnnotations == null) {
+ int params = Type.getArgumentTypes(this.desc).length;
+ invisibleParameterAnnotations = (List<AnnotationNode>[])new List<?>[params];
+ }
+ if (invisibleParameterAnnotations[parameter] == null) {
+ invisibleParameterAnnotations[parameter] = new ArrayList<AnnotationNode>(1);
+ }
+ invisibleParameterAnnotations[parameter].add(an);
+ }
+ return an;
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ if (attrs == null) {
+ attrs = new ArrayList<Attribute>(1);
+ }
+ attrs.add(attr);
+ }
+
+ @Override
+ public void visitCode() {
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ instructions.add(new FrameNode(type, nLocal, local == null
+ ? null
+ : getLabelNodes(local), nStack, stack == null
+ ? null
+ : getLabelNodes(stack)));
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ instructions.add(new InsnNode(opcode));
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ instructions.add(new IntInsnNode(opcode, operand));
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ instructions.add(new VarInsnNode(opcode, var));
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ instructions.add(new TypeInsnNode(opcode, type));
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ instructions.add(new FieldInsnNode(opcode, owner, name, desc));
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ instructions.add(new MethodInsnNode(opcode, owner, name, desc));
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ instructions.add(new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs));
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ instructions.add(new JumpInsnNode(opcode, getLabelNode(label)));
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ instructions.add(getLabelNode(label));
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ instructions.add(new LdcInsnNode(cst));
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ instructions.add(new IincInsnNode(var, increment));
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ instructions.add(new TableSwitchInsnNode(min,
+ max,
+ getLabelNode(dflt),
+ getLabelNodes(labels)));
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ instructions.add(new LookupSwitchInsnNode(getLabelNode(dflt),
+ keys,
+ getLabelNodes(labels)));
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ instructions.add(new MultiANewArrayInsnNode(desc, dims));
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ tryCatchBlocks.add(new TryCatchBlockNode(getLabelNode(start),
+ getLabelNode(end),
+ getLabelNode(handler),
+ type));
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ localVariables.add(new LocalVariableNode(name,
+ desc,
+ signature,
+ getLabelNode(start),
+ getLabelNode(end),
+ index));
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ instructions.add(new LineNumberNode(line, getLabelNode(start)));
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ this.maxStack = maxStack;
+ this.maxLocals = maxLocals;
+ }
+
+ @Override
+ public void visitEnd() {
+ }
+
+ /**
+ * Returns the LabelNode corresponding to the given Label. Creates a new
+ * LabelNode if necessary. The default implementation of this method uses
+ * the {@link Label#info} field to store associations between labels and
+ * label nodes.
+ *
+ * @param l a Label.
+ * @return the LabelNode corresponding to l.
+ */
+ protected LabelNode getLabelNode(final Label l) {
+ if (!(l.info instanceof LabelNode)) {
+ l.info = new LabelNode(l);
+ }
+ return (LabelNode) l.info;
+ }
+
+ private LabelNode[] getLabelNodes(final Label[] l) {
+ LabelNode[] nodes = new LabelNode[l.length];
+ for (int i = 0; i < l.length; ++i) {
+ nodes[i] = getLabelNode(l[i]);
+ }
+ return nodes;
+ }
+
+ private Object[] getLabelNodes(final Object[] objs) {
+ Object[] nodes = new Object[objs.length];
+ for (int i = 0; i < objs.length; ++i) {
+ Object o = objs[i];
+ if (o instanceof Label) {
+ o = getLabelNode((Label) o);
+ }
+ nodes[i] = o;
+ }
+ return nodes;
+ }
+
+ // ------------------------------------------------------------------------
+ // Accept method
+ // ------------------------------------------------------------------------
+
+ /**
+ * Checks that this method node is compatible with the given ASM API
+ * version. This methods checks that this node, and all its nodes
+ * recursively, do not contain elements that were introduced in more recent
+ * versions of the ASM API than the given version.
+ *
+ * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}.
+ */
+ public void check(final int api) {
+ // nothing to do
+ }
+
+ /**
+ * Makes the given class visitor visit this method.
+ *
+ * @param cv a class visitor.
+ */
+ public void accept(final ClassVisitor cv) {
+ String[] exceptions = new String[this.exceptions.size()];
+ this.exceptions.toArray(exceptions);
+ MethodVisitor mv = cv.visitMethod(access,
+ name,
+ desc,
+ signature,
+ exceptions);
+ if (mv != null) {
+ accept(mv);
+ }
+ }
+
+ /**
+ * Makes the given method visitor visit this method.
+ *
+ * @param mv a method visitor.
+ */
+ public void accept(final MethodVisitor mv) {
+ // visits the method attributes
+ int i, j, n;
+ if (annotationDefault != null) {
+ AnnotationVisitor av = mv.visitAnnotationDefault();
+ AnnotationNode.accept(av, null, annotationDefault);
+ if (av != null) {
+ av.visitEnd();
+ }
+ }
+ n = visibleAnnotations == null ? 0 : visibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = visibleAnnotations.get(i);
+ an.accept(mv.visitAnnotation(an.desc, true));
+ }
+ n = invisibleAnnotations == null ? 0 : invisibleAnnotations.size();
+ for (i = 0; i < n; ++i) {
+ AnnotationNode an = invisibleAnnotations.get(i);
+ an.accept(mv.visitAnnotation(an.desc, false));
+ }
+ n = visibleParameterAnnotations == null
+ ? 0
+ : visibleParameterAnnotations.length;
+ for (i = 0; i < n; ++i) {
+ List<?> l = visibleParameterAnnotations[i];
+ if (l == null) {
+ continue;
+ }
+ for (j = 0; j < l.size(); ++j) {
+ AnnotationNode an = (AnnotationNode) l.get(j);
+ an.accept(mv.visitParameterAnnotation(i, an.desc, true));
+ }
+ }
+ n = invisibleParameterAnnotations == null
+ ? 0
+ : invisibleParameterAnnotations.length;
+ for (i = 0; i < n; ++i) {
+ List<?> l = invisibleParameterAnnotations[i];
+ if (l == null) {
+ continue;
+ }
+ for (j = 0; j < l.size(); ++j) {
+ AnnotationNode an = (AnnotationNode) l.get(j);
+ an.accept(mv.visitParameterAnnotation(i, an.desc, false));
+ }
+ }
+ if (visited) {
+ instructions.resetLabels();
+ }
+ n = attrs == null ? 0 : attrs.size();
+ for (i = 0; i < n; ++i) {
+ mv.visitAttribute(attrs.get(i));
+ }
+ // visits the method's code
+ if (instructions.size() > 0) {
+ mv.visitCode();
+ // visits try catch blocks
+ n = tryCatchBlocks == null ? 0 : tryCatchBlocks.size();
+ for (i = 0; i < n; ++i) {
+ tryCatchBlocks.get(i).accept(mv);
+ }
+ // visits instructions
+ instructions.accept(mv);
+ // visits local variables
+ n = localVariables == null ? 0 : localVariables.size();
+ for (i = 0; i < n; ++i) {
+ localVariables.get(i).accept(mv);
+ }
+ // visits maxs
+ mv.visitMaxs(maxStack, maxLocals);
+ visited = true;
+ }
+ mv.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
new file mode 100644
index 0000000..70e5625
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
@@ -0,0 +1,110 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a MULTIANEWARRAY instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class MultiANewArrayInsnNode extends AbstractInsnNode {
+
+ /**
+ * An array type descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public String desc;
+
+ /**
+ * Number of dimensions of the array to allocate.
+ */
+ public int dims;
+
+ /**
+ * Constructs a new {@link MultiANewArrayInsnNode}.
+ *
+ * @param desc an array type descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
+ * @param dims number of dimensions of the array to allocate.
+ */
+ public MultiANewArrayInsnNode(final String desc, final int dims) {
+ super(Opcodes.MULTIANEWARRAY);
+ this.desc = desc;
+ this.dims = dims;
+ }
+
+ @Override
+ public int getType() {
+ return MULTIANEWARRAY_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitMultiANewArrayInsn(desc, dims);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new MultiANewArrayInsnNode(desc, dims);
+ }
+
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
new file mode 100644
index 0000000..d1b80a8
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -0,0 +1,144 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A node that represents a TABLESWITCH instruction.
+ *
+ * @author Eric Bruneton
+ */
+public class TableSwitchInsnNode extends AbstractInsnNode {
+
+ /**
+ * The minimum key value.
+ */
+ public int min;
+
+ /**
+ * The maximum key value.
+ */
+ public int max;
+
+ /**
+ * Beginning of the default handler block.
+ */
+ public LabelNode dflt;
+
+ /**
+ * Beginnings of the handler blocks. This list is a list of
+ * {@link LabelNode} objects.
+ */
+ public List<LabelNode> labels;
+
+ /**
+ * Constructs a new {@link TableSwitchInsnNode}.
+ *
+ * @param min the minimum key value.
+ * @param max the maximum key value.
+ * @param dflt beginning of the default handler block.
+ * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+ * the beginning of the handler block for the <tt>min + i</tt> key.
+ */
+ public TableSwitchInsnNode(
+ final int min,
+ final int max,
+ final LabelNode dflt,
+ final LabelNode... labels)
+ {
+ super(Opcodes.TABLESWITCH);
+ this.min = min;
+ this.max = max;
+ this.dflt = dflt;
+ this.labels = new ArrayList<LabelNode>();
+ if (labels != null) {
+ this.labels.addAll(Arrays.asList(labels));
+ }
+ }
+
+ @Override
+ public int getType() {
+ return TABLESWITCH_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ Label[] labels = new Label[this.labels.size()];
+ for (int i = 0; i < labels.length; ++i) {
+ labels[i] = this.labels.get(i).getLabel();
+ }
+ mv.visitTableSwitchInsn(min, max, dflt.getLabel(), labels);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new TableSwitchInsnNode(min,
+ max,
+ clone(dflt, labels),
+ clone(this.labels, labels));
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
new file mode 100644
index 0000000..6d99611
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
@@ -0,0 +1,123 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a try catch block.
+ *
+ * @author Eric Bruneton
+ */
+public class TryCatchBlockNode {
+
+ /**
+ * Beginning of the exception handler's scope (inclusive).
+ */
+ public LabelNode start;
+
+ /**
+ * End of the exception handler's scope (exclusive).
+ */
+ public LabelNode end;
+
+ /**
+ * Beginning of the exception handler's code.
+ */
+ public LabelNode handler;
+
+ /**
+ * Internal name of the type of exceptions handled by the handler. May be
+ * <tt>null</tt> to catch any exceptions (for "finally" blocks).
+ */
+ public String type;
+
+ /**
+ * Constructs a new {@link TryCatchBlockNode}.
+ *
+ * @param start beginning of the exception handler's scope (inclusive).
+ * @param end end of the exception handler's scope (exclusive).
+ * @param handler beginning of the exception handler's code.
+ * @param type internal name of the type of exceptions handled by the
+ * handler, or <tt>null</tt> to catch any exceptions (for "finally"
+ * blocks).
+ */
+ public TryCatchBlockNode(
+ final LabelNode start,
+ final LabelNode end,
+ final LabelNode handler,
+ final String type)
+ {
+ this.start = start;
+ this.end = end;
+ this.handler = handler;
+ this.type = type;
+ }
+
+ /**
+ * Makes the given visitor visit this try catch block.
+ *
+ * @param mv a method visitor.
+ */
+ public void accept(final MethodVisitor mv) {
+ mv.visitTryCatchBlock(start.getLabel(), end.getLabel(), handler == null
+ ? null
+ : handler.getLabel(), type);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
new file mode 100644
index 0000000..7eb13b4
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
@@ -0,0 +1,116 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a type instruction. A type instruction is an
+ * instruction that takes a type descriptor as parameter.
+ *
+ * @author Eric Bruneton
+ */
+public class TypeInsnNode extends AbstractInsnNode {
+
+ /**
+ * The operand of this instruction. This operand is an internal name (see
+ * {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public String desc;
+
+ /**
+ * Constructs a new {@link TypeInsnNode}.
+ *
+ * @param opcode the opcode of the type instruction to be constructed. This
+ * opcode must be NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+ * @param desc the operand of the instruction to be constructed. This
+ * operand is an internal name (see {@link jdk.internal.org.objectweb.asm.Type}).
+ */
+ public TypeInsnNode(final int opcode, final String desc) {
+ super(opcode);
+ this.desc = desc;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be NEW,
+ * ANEWARRAY, CHECKCAST or INSTANCEOF.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return TYPE_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitTypeInsn(opcode, desc);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new TypeInsnNode(opcode, desc);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
new file mode 100644
index 0000000..eaa2488
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
@@ -0,0 +1,119 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A node that represents a local variable instruction. A local variable
+ * instruction is an instruction that loads or stores the value of a local
+ * variable.
+ *
+ * @author Eric Bruneton
+ */
+public class VarInsnNode extends AbstractInsnNode {
+
+ /**
+ * The operand of this instruction. This operand is the index of a local
+ * variable.
+ */
+ public int var;
+
+ /**
+ * Constructs a new {@link VarInsnNode}.
+ *
+ * @param opcode the opcode of the local variable instruction to be
+ * constructed. This opcode must be ILOAD, LLOAD, FLOAD, DLOAD,
+ * ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
+ * @param var the operand of the instruction to be constructed. This operand
+ * is the index of a local variable.
+ */
+ public VarInsnNode(final int opcode, final int var) {
+ super(opcode);
+ this.var = var;
+ }
+
+ /**
+ * Sets the opcode of this instruction.
+ *
+ * @param opcode the new instruction opcode. This opcode must be ILOAD,
+ * LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE
+ * or RET.
+ */
+ public void setOpcode(final int opcode) {
+ this.opcode = opcode;
+ }
+
+ @Override
+ public int getType() {
+ return VAR_INSN;
+ }
+
+ @Override
+ public void accept(final MethodVisitor mv) {
+ mv.visitVarInsn(opcode, var);
+ }
+
+ @Override
+ public AbstractInsnNode clone(final Map<LabelNode, LabelNode> labels) {
+ return new VarInsnNode(opcode, var);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
new file mode 100644
index 0000000..ff95c4d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -0,0 +1,579 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.IincInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InsnList;
+import jdk.internal.org.objectweb.asm.tree.JumpInsnNode;
+import jdk.internal.org.objectweb.asm.tree.LabelNode;
+import jdk.internal.org.objectweb.asm.tree.LookupSwitchInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodNode;
+import jdk.internal.org.objectweb.asm.tree.TableSwitchInsnNode;
+import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
+import jdk.internal.org.objectweb.asm.tree.VarInsnNode;
+
+/**
+ * A semantic bytecode analyzer. <i>This class does not fully check that JSR and
+ * RET instructions are valid.</i>
+ *
+ * @param <V> type of the Value used for the analysis.
+ *
+ * @author Eric Bruneton
+ */
+public class Analyzer<V extends Value> implements Opcodes {
+
+ private final Interpreter<V> interpreter;
+
+ private int n;
+
+ private InsnList insns;
+
+ private List<TryCatchBlockNode>[] handlers;
+
+ private Frame<V>[] frames;
+
+ private Subroutine[] subroutines;
+
+ private boolean[] queued;
+
+ private int[] queue;
+
+ private int top;
+
+ /**
+ * Constructs a new {@link Analyzer}.
+ *
+ * @param interpreter the interpreter to be used to symbolically interpret
+ * the bytecode instructions.
+ */
+ public Analyzer(final Interpreter<V> interpreter) {
+ this.interpreter = interpreter;
+ }
+
+ /**
+ * Analyzes the given method.
+ *
+ * @param owner the internal name of the class to which the method belongs.
+ * @param m the method to be analyzed.
+ * @return the symbolic state of the execution stack frame at each bytecode
+ * instruction of the method. The size of the returned array is
+ * equal to the number of instructions (and labels) of the method. A
+ * given frame is <tt>null</tt> if and only if the corresponding
+ * instruction cannot be reached (dead code).
+ * @throws AnalyzerException if a problem occurs during the analysis.
+ */
+ public Frame<V>[] analyze(final String owner, final MethodNode m)
+ throws AnalyzerException
+ {
+ if ((m.access & (ACC_ABSTRACT | ACC_NATIVE)) != 0) {
+ frames = (Frame<V>[])new Frame<?>[0];
+ return frames;
+ }
+ n = m.instructions.size();
+ insns = m.instructions;
+ handlers = (List<TryCatchBlockNode>[])new List<?>[n];
+ frames = (Frame<V>[])new Frame<?>[n];
+ subroutines = new Subroutine[n];
+ queued = new boolean[n];
+ queue = new int[n];
+ top = 0;
+
+ // computes exception handlers for each instruction
+ for (int i = 0; i < m.tryCatchBlocks.size(); ++i) {
+ TryCatchBlockNode tcb = m.tryCatchBlocks.get(i);
+ int begin = insns.indexOf(tcb.start);
+ int end = insns.indexOf(tcb.end);
+ for (int j = begin; j < end; ++j) {
+ List<TryCatchBlockNode> insnHandlers = handlers[j];
+ if (insnHandlers == null) {
+ insnHandlers = new ArrayList<TryCatchBlockNode>();
+ handlers[j] = insnHandlers;
+ }
+ insnHandlers.add(tcb);
+ }
+ }
+
+ // computes the subroutine for each instruction:
+ Subroutine main = new Subroutine(null, m.maxLocals, null);
+ List<AbstractInsnNode> subroutineCalls = new ArrayList<AbstractInsnNode>();
+ Map<LabelNode, Subroutine> subroutineHeads = new HashMap<LabelNode, Subroutine>();
+ findSubroutine(0, main, subroutineCalls);
+ while (!subroutineCalls.isEmpty()) {
+ JumpInsnNode jsr = (JumpInsnNode) subroutineCalls.remove(0);
+ Subroutine sub = subroutineHeads.get(jsr.label);
+ if (sub == null) {
+ sub = new Subroutine(jsr.label, m.maxLocals, jsr);
+ subroutineHeads.put(jsr.label, sub);
+ findSubroutine(insns.indexOf(jsr.label), sub, subroutineCalls);
+ } else {
+ sub.callers.add(jsr);
+ }
+ }
+ for (int i = 0; i < n; ++i) {
+ if (subroutines[i] != null && subroutines[i].start == null) {
+ subroutines[i] = null;
+ }
+ }
+
+ // initializes the data structures for the control flow analysis
+ Frame<V> current = newFrame(m.maxLocals, m.maxStack);
+ Frame<V> handler = newFrame(m.maxLocals, m.maxStack);
+ current.setReturn(interpreter.newValue(Type.getReturnType(m.desc)));
+ Type[] args = Type.getArgumentTypes(m.desc);
+ int local = 0;
+ if ((m.access & ACC_STATIC) == 0) {
+ Type ctype = Type.getObjectType(owner);
+ current.setLocal(local++, interpreter.newValue(ctype));
+ }
+ for (int i = 0; i < args.length; ++i) {
+ current.setLocal(local++, interpreter.newValue(args[i]));
+ if (args[i].getSize() == 2) {
+ current.setLocal(local++, interpreter.newValue(null));
+ }
+ }
+ while (local < m.maxLocals) {
+ current.setLocal(local++, interpreter.newValue(null));
+ }
+ merge(0, current, null);
+
+ init(owner, m);
+
+ // control flow analysis
+ while (top > 0) {
+ int insn = queue[--top];
+ Frame<V> f = frames[insn];
+ Subroutine subroutine = subroutines[insn];
+ queued[insn] = false;
+
+ AbstractInsnNode insnNode = null;
+ try {
+ insnNode = m.instructions.get(insn);
+ int insnOpcode = insnNode.getOpcode();
+ int insnType = insnNode.getType();
+
+ if (insnType == AbstractInsnNode.LABEL
+ || insnType == AbstractInsnNode.LINE
+ || insnType == AbstractInsnNode.FRAME)
+ {
+ merge(insn + 1, f, subroutine);
+ newControlFlowEdge(insn, insn + 1);
+ } else {
+ current.init(f).execute(insnNode, interpreter);
+ subroutine = subroutine == null ? null : subroutine.copy();
+
+ if (insnNode instanceof JumpInsnNode) {
+ JumpInsnNode j = (JumpInsnNode) insnNode;
+ if (insnOpcode != GOTO && insnOpcode != JSR) {
+ merge(insn + 1, current, subroutine);
+ newControlFlowEdge(insn, insn + 1);
+ }
+ int jump = insns.indexOf(j.label);
+ if (insnOpcode == JSR) {
+ merge(jump, current, new Subroutine(j.label,
+ m.maxLocals,
+ j));
+ } else {
+ merge(jump, current, subroutine);
+ }
+ newControlFlowEdge(insn, jump);
+ } else if (insnNode instanceof LookupSwitchInsnNode) {
+ LookupSwitchInsnNode lsi = (LookupSwitchInsnNode) insnNode;
+ int jump = insns.indexOf(lsi.dflt);
+ merge(jump, current, subroutine);
+ newControlFlowEdge(insn, jump);
+ for (int j = 0; j < lsi.labels.size(); ++j) {
+ LabelNode label = lsi.labels.get(j);
+ jump = insns.indexOf(label);
+ merge(jump, current, subroutine);
+ newControlFlowEdge(insn, jump);
+ }
+ } else if (insnNode instanceof TableSwitchInsnNode) {
+ TableSwitchInsnNode tsi = (TableSwitchInsnNode) insnNode;
+ int jump = insns.indexOf(tsi.dflt);
+ merge(jump, current, subroutine);
+ newControlFlowEdge(insn, jump);
+ for (int j = 0; j < tsi.labels.size(); ++j) {
+ LabelNode label = tsi.labels.get(j);
+ jump = insns.indexOf(label);
+ merge(jump, current, subroutine);
+ newControlFlowEdge(insn, jump);
+ }
+ } else if (insnOpcode == RET) {
+ if (subroutine == null) {
+ throw new AnalyzerException(insnNode, "RET instruction outside of a sub routine");
+ }
+ for (int i = 0; i < subroutine.callers.size(); ++i) {
+ JumpInsnNode caller = subroutine.callers.get(i);
+ int call = insns.indexOf(caller);
+ if (frames[call] != null) {
+ merge(call + 1,
+ frames[call],
+ current,
+ subroutines[call],
+ subroutine.access);
+ newControlFlowEdge(insn, call + 1);
+ }
+ }
+ } else if (insnOpcode != ATHROW
+ && (insnOpcode < IRETURN || insnOpcode > RETURN))
+ {
+ if (subroutine != null) {
+ if (insnNode instanceof VarInsnNode) {
+ int var = ((VarInsnNode) insnNode).var;
+ subroutine.access[var] = true;
+ if (insnOpcode == LLOAD || insnOpcode == DLOAD
+ || insnOpcode == LSTORE
+ || insnOpcode == DSTORE)
+ {
+ subroutine.access[var + 1] = true;
+ }
+ } else if (insnNode instanceof IincInsnNode) {
+ int var = ((IincInsnNode) insnNode).var;
+ subroutine.access[var] = true;
+ }
+ }
+ merge(insn + 1, current, subroutine);
+ newControlFlowEdge(insn, insn + 1);
+ }
+ }
+
+ List<TryCatchBlockNode> insnHandlers = handlers[insn];
+ if (insnHandlers != null) {
+ for (int i = 0; i < insnHandlers.size(); ++i) {
+ TryCatchBlockNode tcb = insnHandlers.get(i);
+ Type type;
+ if (tcb.type == null) {
+ type = Type.getObjectType("java/lang/Throwable");
+ } else {
+ type = Type.getObjectType(tcb.type);
+ }
+ int jump = insns.indexOf(tcb.handler);
+ if (newControlFlowExceptionEdge(insn, tcb)) {
+ handler.init(f);
+ handler.clearStack();
+ handler.push(interpreter.newValue(type));
+ merge(jump, handler, subroutine);
+ }
+ }
+ }
+ } catch (AnalyzerException e) {
+ throw new AnalyzerException(e.node, "Error at instruction " + insn
+ + ": " + e.getMessage(), e);
+ } catch (Exception e) {
+ throw new AnalyzerException(insnNode, "Error at instruction " + insn
+ + ": " + e.getMessage(), e);
+ }
+ }
+
+ return frames;
+ }
+
+ private void findSubroutine(int insn, final Subroutine sub, final List<AbstractInsnNode> calls)
+ throws AnalyzerException
+ {
+ while (true) {
+ if (insn < 0 || insn >= n) {
+ throw new AnalyzerException(null, "Execution can fall off end of the code");
+ }
+ if (subroutines[insn] != null) {
+ return;
+ }
+ subroutines[insn] = sub.copy();
+ AbstractInsnNode node = insns.get(insn);
+
+ // calls findSubroutine recursively on normal successors
+ if (node instanceof JumpInsnNode) {
+ if (node.getOpcode() == JSR) {
+ // do not follow a JSR, it leads to another subroutine!
+ calls.add(node);
+ } else {
+ JumpInsnNode jnode = (JumpInsnNode) node;
+ findSubroutine(insns.indexOf(jnode.label), sub, calls);
+ }
+ } else if (node instanceof TableSwitchInsnNode) {
+ TableSwitchInsnNode tsnode = (TableSwitchInsnNode) node;
+ findSubroutine(insns.indexOf(tsnode.dflt), sub, calls);
+ for (int i = tsnode.labels.size() - 1; i >= 0; --i) {
+ LabelNode l = tsnode.labels.get(i);
+ findSubroutine(insns.indexOf(l), sub, calls);
+ }
+ } else if (node instanceof LookupSwitchInsnNode) {
+ LookupSwitchInsnNode lsnode = (LookupSwitchInsnNode) node;
+ findSubroutine(insns.indexOf(lsnode.dflt), sub, calls);
+ for (int i = lsnode.labels.size() - 1; i >= 0; --i) {
+ LabelNode l = lsnode.labels.get(i);
+ findSubroutine(insns.indexOf(l), sub, calls);
+ }
+ }
+
+ // calls findSubroutine recursively on exception handler successors
+ List<TryCatchBlockNode> insnHandlers = handlers[insn];
+ if (insnHandlers != null) {
+ for (int i = 0; i < insnHandlers.size(); ++i) {
+ TryCatchBlockNode tcb = insnHandlers.get(i);
+ findSubroutine(insns.indexOf(tcb.handler), sub, calls);
+ }
+ }
+
+ // if insn does not falls through to the next instruction, return.
+ switch (node.getOpcode()) {
+ case GOTO:
+ case RET:
+ case TABLESWITCH:
+ case LOOKUPSWITCH:
+ case IRETURN:
+ case LRETURN:
+ case FRETURN:
+ case DRETURN:
+ case ARETURN:
+ case RETURN:
+ case ATHROW:
+ return;
+ }
+ insn++;
+ }
+ }
+
+ /**
+ * Returns the symbolic stack frame for each instruction of the last
+ * recently analyzed method.
+ *
+ * @return the symbolic state of the execution stack frame at each bytecode
+ * instruction of the method. The size of the returned array is
+ * equal to the number of instructions (and labels) of the method. A
+ * given frame is <tt>null</tt> if the corresponding instruction
+ * cannot be reached, or if an error occured during the analysis of
+ * the method.
+ */
+ public Frame<V>[] getFrames() {
+ return frames;
+ }
+
+ /**
+ * Returns the exception handlers for the given instruction.
+ *
+ * @param insn the index of an instruction of the last recently analyzed
+ * method.
+ * @return a list of {@link TryCatchBlockNode} objects.
+ */
+ public List<TryCatchBlockNode> getHandlers(final int insn) {
+ return handlers[insn];
+ }
+
+ /**
+ * Initializes this analyzer. This method is called just before the
+ * execution of control flow analysis loop in #analyze. The default
+ * implementation of this method does nothing.
+ *
+ * @param owner the internal name of the class to which the method belongs.
+ * @param m the method to be analyzed.
+ * @throws AnalyzerException if a problem occurs.
+ */
+ protected void init(String owner, MethodNode m) throws AnalyzerException {
+ }
+
+ /**
+ * Constructs a new frame with the given size.
+ *
+ * @param nLocals the maximum number of local variables of the frame.
+ * @param nStack the maximum stack size of the frame.
+ * @return the created frame.
+ */
+ protected Frame<V> newFrame(final int nLocals, final int nStack) {
+ return new Frame<V>(nLocals, nStack);
+ }
+
+ /**
+ * Constructs a new frame that is identical to the given frame.
+ *
+ * @param src a frame.
+ * @return the created frame.
+ */
+ protected Frame<V> newFrame(final Frame<? extends V> src) {
+ return new Frame<V>(src);
+ }
+
+ /**
+ * Creates a control flow graph edge. The default implementation of this
+ * method does nothing. It can be overriden in order to construct the
+ * control flow graph of a method (this method is called by the
+ * {@link #analyze analyze} method during its visit of the method's code).
+ *
+ * @param insn an instruction index.
+ * @param successor index of a successor instruction.
+ */
+ protected void newControlFlowEdge(final int insn, final int successor) {
+ }
+
+ /**
+ * Creates a control flow graph edge corresponding to an exception handler.
+ * The default implementation of this method does nothing. It can be
+ * overridden in order to construct the control flow graph of a method (this
+ * method is called by the {@link #analyze analyze} method during its visit
+ * of the method's code).
+ *
+ * @param insn an instruction index.
+ * @param successor index of a successor instruction.
+ * @return true if this edge must be considered in the data flow analysis
+ * performed by this analyzer, or false otherwise. The default
+ * implementation of this method always returns true.
+ */
+ protected boolean newControlFlowExceptionEdge(
+ final int insn,
+ final int successor)
+ {
+ return true;
+ }
+
+ /**
+ * Creates a control flow graph edge corresponding to an exception handler.
+ * The default implementation of this method delegates to
+ * {@link #newControlFlowExceptionEdge(int, int)
+ * newControlFlowExceptionEdge(int, int)}. It can be overridden in order to
+ * construct the control flow graph of a method (this method is called by
+ * the {@link #analyze analyze} method during its visit of the method's
+ * code).
+ *
+ * @param insn an instruction index.
+ * @param tcb TryCatchBlockNode corresponding to this edge.
+ * @return true if this edge must be considered in the data flow analysis
+ * performed by this analyzer, or false otherwise. The default
+ * implementation of this method delegates to
+ * {@link #newControlFlowExceptionEdge(int, int)
+ * newControlFlowExceptionEdge(int, int)}.
+ */
+ protected boolean newControlFlowExceptionEdge(
+ final int insn,
+ final TryCatchBlockNode tcb)
+ {
+ return newControlFlowExceptionEdge(insn, insns.indexOf(tcb.handler));
+ }
+
+ // -------------------------------------------------------------------------
+
+ private void merge(
+ final int insn,
+ final Frame<V> frame,
+ final Subroutine subroutine) throws AnalyzerException
+ {
+ Frame<V> oldFrame = frames[insn];
+ Subroutine oldSubroutine = subroutines[insn];
+ boolean changes;
+
+ if (oldFrame == null) {
+ frames[insn] = newFrame(frame);
+ changes = true;
+ } else {
+ changes = oldFrame.merge(frame, interpreter);
+ }
+
+ if (oldSubroutine == null) {
+ if (subroutine != null) {
+ subroutines[insn] = subroutine.copy();
+ changes = true;
+ }
+ } else {
+ if (subroutine != null) {
+ changes |= oldSubroutine.merge(subroutine);
+ }
+ }
+ if (changes && !queued[insn]) {
+ queued[insn] = true;
+ queue[top++] = insn;
+ }
+ }
+
+ private void merge(
+ final int insn,
+ final Frame<V> beforeJSR,
+ final Frame<V> afterRET,
+ final Subroutine subroutineBeforeJSR,
+ final boolean[] access) throws AnalyzerException
+ {
+ Frame<V> oldFrame = frames[insn];
+ Subroutine oldSubroutine = subroutines[insn];
+ boolean changes;
+
+ afterRET.merge(beforeJSR, access);
+
+ if (oldFrame == null) {
+ frames[insn] = newFrame(afterRET);
+ changes = true;
+ } else {
+ changes = oldFrame.merge(afterRET, interpreter);
+ }
+
+ if (oldSubroutine != null && subroutineBeforeJSR != null) {
+ changes |= oldSubroutine.merge(subroutineBeforeJSR);
+ }
+ if (changes && !queued[insn]) {
+ queued[insn] = true;
+ queue[top++] = insn;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
new file mode 100644
index 0000000..a18f5d3
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
@@ -0,0 +1,93 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * Thrown if a problem occurs during the analysis of a method.
+ *
+ * @author Bing Ran
+ * @author Eric Bruneton
+ */
+public class AnalyzerException extends Exception {
+
+ public final AbstractInsnNode node;
+
+ public AnalyzerException(final AbstractInsnNode node, final String msg) {
+ super(msg);
+ this.node = node;
+ }
+
+ public AnalyzerException(final AbstractInsnNode node, final String msg, final Throwable exception) {
+ super(msg, exception);
+ this.node = node;
+ }
+
+ public AnalyzerException(
+ final AbstractInsnNode node,
+ final String msg,
+ final Object expected,
+ final Value encountered)
+ {
+ super((msg == null ? "Expected " : msg + ": expected ") + expected
+ + ", but found " + encountered);
+ this.node = node;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
new file mode 100644
index 0000000..7df82f6
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
@@ -0,0 +1,394 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.FieldInsnNode;
+import jdk.internal.org.objectweb.asm.tree.IntInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import jdk.internal.org.objectweb.asm.tree.LdcInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MultiANewArrayInsnNode;
+import jdk.internal.org.objectweb.asm.tree.TypeInsnNode;
+
+/**
+ * An {@link Interpreter} for {@link BasicValue} values.
+ *
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class BasicInterpreter extends Interpreter<BasicValue> implements
+ Opcodes
+{
+
+ public BasicInterpreter() {
+ super(ASM4);
+ }
+
+ protected BasicInterpreter(final int api) {
+ super(api);
+ }
+
+ @Override
+ public BasicValue newValue(final Type type) {
+ if (type == null) {
+ return BasicValue.UNINITIALIZED_VALUE;
+ }
+ switch (type.getSort()) {
+ case Type.VOID:
+ return null;
+ case Type.BOOLEAN:
+ case Type.CHAR:
+ case Type.BYTE:
+ case Type.SHORT:
+ case Type.INT:
+ return BasicValue.INT_VALUE;
+ case Type.FLOAT:
+ return BasicValue.FLOAT_VALUE;
+ case Type.LONG:
+ return BasicValue.LONG_VALUE;
+ case Type.DOUBLE:
+ return BasicValue.DOUBLE_VALUE;
+ case Type.ARRAY:
+ case Type.OBJECT:
+ return BasicValue.REFERENCE_VALUE;
+ default:
+ throw new Error("Internal error");
+ }
+ }
+
+ @Override
+ public BasicValue newOperation(final AbstractInsnNode insn)
+ throws AnalyzerException
+ {
+ switch (insn.getOpcode()) {
+ case ACONST_NULL:
+ return newValue(Type.getObjectType("null"));
+ case ICONST_M1:
+ case ICONST_0:
+ case ICONST_1:
+ case ICONST_2:
+ case ICONST_3:
+ case ICONST_4:
+ case ICONST_5:
+ return BasicValue.INT_VALUE;
+ case LCONST_0:
+ case LCONST_1:
+ return BasicValue.LONG_VALUE;
+ case FCONST_0:
+ case FCONST_1:
+ case FCONST_2:
+ return BasicValue.FLOAT_VALUE;
+ case DCONST_0:
+ case DCONST_1:
+ return BasicValue.DOUBLE_VALUE;
+ case BIPUSH:
+ case SIPUSH:
+ return BasicValue.INT_VALUE;
+ case LDC:
+ Object cst = ((LdcInsnNode) insn).cst;
+ if (cst instanceof Integer) {
+ return BasicValue.INT_VALUE;
+ } else if (cst instanceof Float) {
+ return BasicValue.FLOAT_VALUE;
+ } else if (cst instanceof Long) {
+ return BasicValue.LONG_VALUE;
+ } else if (cst instanceof Double) {
+ return BasicValue.DOUBLE_VALUE;
+ } else if (cst instanceof String) {
+ return newValue(Type.getObjectType("java/lang/String"));
+ } else if (cst instanceof Type) {
+ int sort = ((Type) cst).getSort();
+ if (sort == Type.OBJECT || sort == Type.ARRAY) {
+ return newValue(Type.getObjectType("java/lang/Class"));
+ } else if (sort == Type.METHOD) {
+ return newValue(Type.getObjectType("java/lang/invoke/MethodType"));
+ } else {
+ throw new IllegalArgumentException("Illegal LDC constant " + cst);
+ }
+ } else if (cst instanceof Handle) {
+ return newValue(Type.getObjectType("java/lang/invoke/MethodHandle"));
+ } else {
+ throw new IllegalArgumentException("Illegal LDC constant " + cst);
+ }
+ case JSR:
+ return BasicValue.RETURNADDRESS_VALUE;
+ case GETSTATIC:
+ return newValue(Type.getType(((FieldInsnNode) insn).desc));
+ case NEW:
+ return newValue(Type.getObjectType(((TypeInsnNode) insn).desc));
+ default:
+ throw new Error("Internal error.");
+ }
+ }
+
+ @Override
+ public BasicValue copyOperation(final AbstractInsnNode insn, final BasicValue value)
+ throws AnalyzerException
+ {
+ return value;
+ }
+
+ @Override
+ public BasicValue unaryOperation(final AbstractInsnNode insn, final BasicValue value)
+ throws AnalyzerException
+ {
+ switch (insn.getOpcode()) {
+ case INEG:
+ case IINC:
+ case L2I:
+ case F2I:
+ case D2I:
+ case I2B:
+ case I2C:
+ case I2S:
+ return BasicValue.INT_VALUE;
+ case FNEG:
+ case I2F:
+ case L2F:
+ case D2F:
+ return BasicValue.FLOAT_VALUE;
+ case LNEG:
+ case I2L:
+ case F2L:
+ case D2L:
+ return BasicValue.LONG_VALUE;
+ case DNEG:
+ case I2D:
+ case L2D:
+ case F2D:
+ return BasicValue.DOUBLE_VALUE;
+ case IFEQ:
+ case IFNE:
+ case IFLT:
+ case IFGE:
+ case IFGT:
+ case IFLE:
+ case TABLESWITCH:
+ case LOOKUPSWITCH:
+ case IRETURN:
+ case LRETURN:
+ case FRETURN:
+ case DRETURN:
+ case ARETURN:
+ case PUTSTATIC:
+ return null;
+ case GETFIELD:
+ return newValue(Type.getType(((FieldInsnNode) insn).desc));
+ case NEWARRAY:
+ switch (((IntInsnNode) insn).operand) {
+ case T_BOOLEAN:
+ return newValue(Type.getType("[Z"));
+ case T_CHAR:
+ return newValue(Type.getType("[C"));
+ case T_BYTE:
+ return newValue(Type.getType("[B"));
+ case T_SHORT:
+ return newValue(Type.getType("[S"));
+ case T_INT:
+ return newValue(Type.getType("[I"));
+ case T_FLOAT:
+ return newValue(Type.getType("[F"));
+ case T_DOUBLE:
+ return newValue(Type.getType("[D"));
+ case T_LONG:
+ return newValue(Type.getType("[J"));
+ default:
+ throw new AnalyzerException(insn, "Invalid array type");
+ }
+ case ANEWARRAY:
+ String desc = ((TypeInsnNode) insn).desc;
+ return newValue(Type.getType("[" + Type.getObjectType(desc)));
+ case ARRAYLENGTH:
+ return BasicValue.INT_VALUE;
+ case ATHROW:
+ return null;
+ case CHECKCAST:
+ desc = ((TypeInsnNode) insn).desc;
+ return newValue(Type.getObjectType(desc));
+ case INSTANCEOF:
+ return BasicValue.INT_VALUE;
+ case MONITORENTER:
+ case MONITOREXIT:
+ case IFNULL:
+ case IFNONNULL:
+ return null;
+ default:
+ throw new Error("Internal error.");
+ }
+ }
+
+ @Override
+ public BasicValue binaryOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value1,
+ final BasicValue value2) throws AnalyzerException
+ {
+ switch (insn.getOpcode()) {
+ case IALOAD:
+ case BALOAD:
+ case CALOAD:
+ case SALOAD:
+ case IADD:
+ case ISUB:
+ case IMUL:
+ case IDIV:
+ case IREM:
+ case ISHL:
+ case ISHR:
+ case IUSHR:
+ case IAND:
+ case IOR:
+ case IXOR:
+ return BasicValue.INT_VALUE;
+ case FALOAD:
+ case FADD:
+ case FSUB:
+ case FMUL:
+ case FDIV:
+ case FREM:
+ return BasicValue.FLOAT_VALUE;
+ case LALOAD:
+ case LADD:
+ case LSUB:
+ case LMUL:
+ case LDIV:
+ case LREM:
+ case LSHL:
+ case LSHR:
+ case LUSHR:
+ case LAND:
+ case LOR:
+ case LXOR:
+ return BasicValue.LONG_VALUE;
+ case DALOAD:
+ case DADD:
+ case DSUB:
+ case DMUL:
+ case DDIV:
+ case DREM:
+ return BasicValue.DOUBLE_VALUE;
+ case AALOAD:
+ return BasicValue.REFERENCE_VALUE;
+ case LCMP:
+ case FCMPL:
+ case FCMPG:
+ case DCMPL:
+ case DCMPG:
+ return BasicValue.INT_VALUE;
+ case IF_ICMPEQ:
+ case IF_ICMPNE:
+ case IF_ICMPLT:
+ case IF_ICMPGE:
+ case IF_ICMPGT:
+ case IF_ICMPLE:
+ case IF_ACMPEQ:
+ case IF_ACMPNE:
+ case PUTFIELD:
+ return null;
+ default:
+ throw new Error("Internal error.");
+ }
+ }
+
+ @Override
+ public BasicValue ternaryOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value1,
+ final BasicValue value2,
+ final BasicValue value3) throws AnalyzerException
+ {
+ return null;
+ }
+
+ @Override
+ public BasicValue naryOperation(final AbstractInsnNode insn, final List<? extends BasicValue> values)
+ throws AnalyzerException
+ {
+ int opcode = insn.getOpcode();
+ if (opcode == MULTIANEWARRAY) {
+ return newValue(Type.getType(((MultiANewArrayInsnNode) insn).desc));
+ } else if (opcode == INVOKEDYNAMIC){
+ return newValue(Type.getReturnType(((InvokeDynamicInsnNode) insn).desc));
+ } else {
+ return newValue(Type.getReturnType(((MethodInsnNode) insn).desc));
+ }
+ }
+
+ @Override
+ public void returnOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value,
+ final BasicValue expected) throws AnalyzerException
+ {
+ }
+
+ @Override
+ public BasicValue merge(final BasicValue v, final BasicValue w) {
+ if (!v.equals(w)) {
+ return BasicValue.UNINITIALIZED_VALUE;
+ }
+ return v;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
new file mode 100644
index 0000000..b92fd3d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
@@ -0,0 +1,137 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link Value} that is represented by its type in a seven types type system.
+ * This type system distinguishes the UNINITIALZED, INT, FLOAT, LONG, DOUBLE,
+ * REFERENCE and RETURNADDRESS types.
+ *
+ * @author Eric Bruneton
+ */
+public class BasicValue implements Value {
+
+ public static final BasicValue UNINITIALIZED_VALUE = new BasicValue(null);
+
+ public static final BasicValue INT_VALUE = new BasicValue(Type.INT_TYPE);
+
+ public static final BasicValue FLOAT_VALUE = new BasicValue(Type.FLOAT_TYPE);
+
+ public static final BasicValue LONG_VALUE = new BasicValue(Type.LONG_TYPE);
+
+ public static final BasicValue DOUBLE_VALUE = new BasicValue(Type.DOUBLE_TYPE);
+
+ public static final BasicValue REFERENCE_VALUE = new BasicValue(Type.getObjectType("java/lang/Object"));
+
+ public static final BasicValue RETURNADDRESS_VALUE = new BasicValue(Type.VOID_TYPE);
+
+ private final Type type;
+
+ public BasicValue(final Type type) {
+ this.type = type;
+ }
+
+ public Type getType() {
+ return type;
+ }
+
+ public int getSize() {
+ return type == Type.LONG_TYPE || type == Type.DOUBLE_TYPE ? 2 : 1;
+ }
+
+ public boolean isReference() {
+ return type != null
+ && (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY);
+ }
+
+ @Override
+ public boolean equals(final Object value) {
+ if (value == this) {
+ return true;
+ } else if (value instanceof BasicValue) {
+ if (type == null) {
+ return ((BasicValue) value).type == null;
+ } else {
+ return type.equals(((BasicValue) value).type);
+ }
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return type == null ? 0 : type.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ if (this == UNINITIALIZED_VALUE) {
+ return ".";
+ } else if (this == RETURNADDRESS_VALUE) {
+ return "A";
+ } else if (this == REFERENCE_VALUE) {
+ return "R";
+ } else {
+ return type.getDescriptor();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
new file mode 100644
index 0000000..8b51b4a
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
@@ -0,0 +1,488 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.FieldInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodInsnNode;
+
+/**
+ * An extended {@link BasicInterpreter} that checks that bytecode instructions
+ * are correctly used.
+ *
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class BasicVerifier extends BasicInterpreter {
+
+ public BasicVerifier() {
+ super(ASM4);
+ }
+
+ protected BasicVerifier(final int api) {
+ super(api);
+ }
+
+ @Override
+ public BasicValue copyOperation(final AbstractInsnNode insn, final BasicValue value)
+ throws AnalyzerException
+ {
+ Value expected;
+ switch (insn.getOpcode()) {
+ case ILOAD:
+ case ISTORE:
+ expected = BasicValue.INT_VALUE;
+ break;
+ case FLOAD:
+ case FSTORE:
+ expected = BasicValue.FLOAT_VALUE;
+ break;
+ case LLOAD:
+ case LSTORE:
+ expected = BasicValue.LONG_VALUE;
+ break;
+ case DLOAD:
+ case DSTORE:
+ expected = BasicValue.DOUBLE_VALUE;
+ break;
+ case ALOAD:
+ if (!value.isReference()) {
+ throw new AnalyzerException(insn,
+ null,
+ "an object reference",
+ value);
+ }
+ return value;
+ case ASTORE:
+ if (!value.isReference()
+ && !BasicValue.RETURNADDRESS_VALUE.equals(value))
+ {
+ throw new AnalyzerException(insn,
+ null,
+ "an object reference or a return address",
+ value);
+ }
+ return value;
+ default:
+ return value;
+ }
+ if (!expected.equals(value)) {
+ throw new AnalyzerException(insn, null, expected, value);
+ }
+ return value;
+ }
+
+ @Override
+ public BasicValue unaryOperation(final AbstractInsnNode insn, final BasicValue value)
+ throws AnalyzerException
+ {
+ BasicValue expected;
+ switch (insn.getOpcode()) {
+ case INEG:
+ case IINC:
+ case I2F:
+ case I2L:
+ case I2D:
+ case I2B:
+ case I2C:
+ case I2S:
+ case IFEQ:
+ case IFNE:
+ case IFLT:
+ case IFGE:
+ case IFGT:
+ case IFLE:
+ case TABLESWITCH:
+ case LOOKUPSWITCH:
+ case IRETURN:
+ case NEWARRAY:
+ case ANEWARRAY:
+ expected = BasicValue.INT_VALUE;
+ break;
+ case FNEG:
+ case F2I:
+ case F2L:
+ case F2D:
+ case FRETURN:
+ expected = BasicValue.FLOAT_VALUE;
+ break;
+ case LNEG:
+ case L2I:
+ case L2F:
+ case L2D:
+ case LRETURN:
+ expected = BasicValue.LONG_VALUE;
+ break;
+ case DNEG:
+ case D2I:
+ case D2F:
+ case D2L:
+ case DRETURN:
+ expected = BasicValue.DOUBLE_VALUE;
+ break;
+ case GETFIELD:
+ expected = newValue(Type.getObjectType(((FieldInsnNode) insn).owner));
+ break;
+ case CHECKCAST:
+ if (!value.isReference()) {
+ throw new AnalyzerException(insn,
+ null,
+ "an object reference",
+ value);
+ }
+ return super.unaryOperation(insn, value);
+ case ARRAYLENGTH:
+ if (!isArrayValue(value)) {
+ throw new AnalyzerException(insn,
+ null,
+ "an array reference",
+ value);
+ }
+ return super.unaryOperation(insn, value);
+ case ARETURN:
+ case ATHROW:
+ case INSTANCEOF:
+ case MONITORENTER:
+ case MONITOREXIT:
+ case IFNULL:
+ case IFNONNULL:
+ if (!value.isReference()) {
+ throw new AnalyzerException(insn,
+ null,
+ "an object reference",
+ value);
+ }
+ return super.unaryOperation(insn, value);
+ case PUTSTATIC:
+ expected = newValue(Type.getType(((FieldInsnNode) insn).desc));
+ break;
+ default:
+ throw new Error("Internal error.");
+ }
+ if (!isSubTypeOf(value, expected)) {
+ throw new AnalyzerException(insn, null, expected, value);
+ }
+ return super.unaryOperation(insn, value);
+ }
+
+ @Override
+ public BasicValue binaryOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value1,
+ final BasicValue value2) throws AnalyzerException
+ {
+ BasicValue expected1;
+ BasicValue expected2;
+ switch (insn.getOpcode()) {
+ case IALOAD:
+ expected1 = newValue(Type.getType("[I"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case BALOAD:
+ if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+ expected1 = newValue(Type.getType("[Z"));
+ } else {
+ expected1 = newValue(Type.getType("[B"));
+ }
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case CALOAD:
+ expected1 = newValue(Type.getType("[C"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case SALOAD:
+ expected1 = newValue(Type.getType("[S"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case LALOAD:
+ expected1 = newValue(Type.getType("[J"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case FALOAD:
+ expected1 = newValue(Type.getType("[F"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case DALOAD:
+ expected1 = newValue(Type.getType("[D"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case AALOAD:
+ expected1 = newValue(Type.getType("[Ljava/lang/Object;"));
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case IADD:
+ case ISUB:
+ case IMUL:
+ case IDIV:
+ case IREM:
+ case ISHL:
+ case ISHR:
+ case IUSHR:
+ case IAND:
+ case IOR:
+ case IXOR:
+ case IF_ICMPEQ:
+ case IF_ICMPNE:
+ case IF_ICMPLT:
+ case IF_ICMPGE:
+ case IF_ICMPGT:
+ case IF_ICMPLE:
+ expected1 = BasicValue.INT_VALUE;
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case FADD:
+ case FSUB:
+ case FMUL:
+ case FDIV:
+ case FREM:
+ case FCMPL:
+ case FCMPG:
+ expected1 = BasicValue.FLOAT_VALUE;
+ expected2 = BasicValue.FLOAT_VALUE;
+ break;
+ case LADD:
+ case LSUB:
+ case LMUL:
+ case LDIV:
+ case LREM:
+ case LAND:
+ case LOR:
+ case LXOR:
+ case LCMP:
+ expected1 = BasicValue.LONG_VALUE;
+ expected2 = BasicValue.LONG_VALUE;
+ break;
+ case LSHL:
+ case LSHR:
+ case LUSHR:
+ expected1 = BasicValue.LONG_VALUE;
+ expected2 = BasicValue.INT_VALUE;
+ break;
+ case DADD:
+ case DSUB:
+ case DMUL:
+ case DDIV:
+ case DREM:
+ case DCMPL:
+ case DCMPG:
+ expected1 = BasicValue.DOUBLE_VALUE;
+ expected2 = BasicValue.DOUBLE_VALUE;
+ break;
+ case IF_ACMPEQ:
+ case IF_ACMPNE:
+ expected1 = BasicValue.REFERENCE_VALUE;
+ expected2 = BasicValue.REFERENCE_VALUE;
+ break;
+ case PUTFIELD:
+ FieldInsnNode fin = (FieldInsnNode) insn;
+ expected1 = newValue(Type.getObjectType(fin.owner));
+ expected2 = newValue(Type.getType(fin.desc));
+ break;
+ default:
+ throw new Error("Internal error.");
+ }
+ if (!isSubTypeOf(value1, expected1)) {
+ throw new AnalyzerException(insn, "First argument", expected1, value1);
+ } else if (!isSubTypeOf(value2, expected2)) {
+ throw new AnalyzerException(insn, "Second argument", expected2, value2);
+ }
+ if (insn.getOpcode() == AALOAD) {
+ return getElementValue(value1);
+ } else {
+ return super.binaryOperation(insn, value1, value2);
+ }
+ }
+
+ @Override
+ public BasicValue ternaryOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value1,
+ final BasicValue value2,
+ final BasicValue value3) throws AnalyzerException
+ {
+ BasicValue expected1;
+ BasicValue expected3;
+ switch (insn.getOpcode()) {
+ case IASTORE:
+ expected1 = newValue(Type.getType("[I"));
+ expected3 = BasicValue.INT_VALUE;
+ break;
+ case BASTORE:
+ if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+ expected1 = newValue(Type.getType("[Z"));
+ } else {
+ expected1 = newValue(Type.getType("[B"));
+ }
+ expected3 = BasicValue.INT_VALUE;
+ break;
+ case CASTORE:
+ expected1 = newValue(Type.getType("[C"));
+ expected3 = BasicValue.INT_VALUE;
+ break;
+ case SASTORE:
+ expected1 = newValue(Type.getType("[S"));
+ expected3 = BasicValue.INT_VALUE;
+ break;
+ case LASTORE:
+ expected1 = newValue(Type.getType("[J"));
+ expected3 = BasicValue.LONG_VALUE;
+ break;
+ case FASTORE:
+ expected1 = newValue(Type.getType("[F"));
+ expected3 = BasicValue.FLOAT_VALUE;
+ break;
+ case DASTORE:
+ expected1 = newValue(Type.getType("[D"));
+ expected3 = BasicValue.DOUBLE_VALUE;
+ break;
+ case AASTORE:
+ expected1 = value1;
+ expected3 = BasicValue.REFERENCE_VALUE;
+ break;
+ default:
+ throw new Error("Internal error.");
+ }
+ if (!isSubTypeOf(value1, expected1)) {
+ throw new AnalyzerException(insn, "First argument", "a " + expected1
+ + " array reference", value1);
+ } else if (!BasicValue.INT_VALUE.equals(value2)) {
+ throw new AnalyzerException(insn, "Second argument",
+ BasicValue.INT_VALUE,
+ value2);
+ } else if (!isSubTypeOf(value3, expected3)) {
+ throw new AnalyzerException(insn, "Third argument", expected3, value3);
+ }
+ return null;
+ }
+
+ @Override
+ public BasicValue naryOperation(final AbstractInsnNode insn, final List<? extends BasicValue> values)
+ throws AnalyzerException
+ {
+ int opcode = insn.getOpcode();
+ if (opcode == MULTIANEWARRAY) {
+ for (int i = 0; i < values.size(); ++i) {
+ if (!BasicValue.INT_VALUE.equals(values.get(i))) {
+ throw new AnalyzerException(insn,
+ null,
+ BasicValue.INT_VALUE,
+ values.get(i));
+ }
+ }
+ } else {
+ int i = 0;
+ int j = 0;
+ if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) {
+ Type owner = Type.getObjectType(((MethodInsnNode) insn).owner);
+ if (!isSubTypeOf(values.get(i++), newValue(owner))) {
+ throw new AnalyzerException(insn, "Method owner",
+ newValue(owner),
+ values.get(0));
+ }
+ }
+ String desc = (opcode == INVOKEDYNAMIC)?
+ ((InvokeDynamicInsnNode) insn).desc:
+ ((MethodInsnNode) insn).desc;
+ Type[] args = Type.getArgumentTypes(desc);
+ while (i < values.size()) {
+ BasicValue expected = newValue(args[j++]);
+ BasicValue encountered = values.get(i++);
+ if (!isSubTypeOf(encountered, expected)) {
+ throw new AnalyzerException(insn,
+ "Argument " + j,
+ expected,
+ encountered);
+ }
+ }
+ }
+ return super.naryOperation(insn, values);
+ }
+
+ @Override
+ public void returnOperation(
+ final AbstractInsnNode insn,
+ final BasicValue value,
+ final BasicValue expected) throws AnalyzerException
+ {
+ if (!isSubTypeOf(value, expected)) {
+ throw new AnalyzerException(insn,
+ "Incompatible return type",
+ expected,
+ value);
+ }
+ }
+
+ protected boolean isArrayValue(final BasicValue value) {
+ return value.isReference();
+ }
+
+ protected BasicValue getElementValue(final BasicValue objectArrayValue)
+ throws AnalyzerException
+ {
+ return BasicValue.REFERENCE_VALUE;
+ }
+
+ protected boolean isSubTypeOf(final BasicValue value, final BasicValue expected) {
+ return value.equals(expected);
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
new file mode 100644
index 0000000..b25d4d8
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
@@ -0,0 +1,738 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.IincInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MultiANewArrayInsnNode;
+import jdk.internal.org.objectweb.asm.tree.VarInsnNode;
+
+/**
+ * A symbolic execution stack frame. A stack frame contains a set of local
+ * variable slots, and an operand stack. Warning: long and double values are
+ * represented by <i>two</i> slots in local variables, and by <i>one</i> slot
+ * in the operand stack.
+ *
+ * @param <V> type of the Value used for the analysis.
+ *
+ * @author Eric Bruneton
+ */
+public class Frame<V extends Value> {
+
+ /**
+ * The expected return type of the analyzed method, or <tt>null</tt> if the
+ * method returns void.
+ */
+ private V returnValue;
+
+ /**
+ * The local variables and operand stack of this frame.
+ */
+ private V[] values;
+
+ /**
+ * The number of local variables of this frame.
+ */
+ private int locals;
+
+ /**
+ * The number of elements in the operand stack.
+ */
+ private int top;
+
+ /**
+ * Constructs a new frame with the given size.
+ *
+ * @param nLocals the maximum number of local variables of the frame.
+ * @param nStack the maximum stack size of the frame.
+ */
+ public Frame(final int nLocals, final int nStack) {
+ this.values = (V[]) new Value[nLocals + nStack];
+ this.locals = nLocals;
+ }
+
+ /**
+ * Constructs a new frame that is identical to the given frame.
+ *
+ * @param src a frame.
+ */
+ public Frame(final Frame<? extends V> src) {
+ this(src.locals, src.values.length - src.locals);
+ init(src);
+ }
+
+ /**
+ * Copies the state of the given frame into this frame.
+ *
+ * @param src a frame.
+ * @return this frame.
+ */
+ public Frame<V> init(final Frame<? extends V> src) {
+ returnValue = src.returnValue;
+ System.arraycopy(src.values, 0, values, 0, values.length);
+ top = src.top;
+ return this;
+ }
+
+ /**
+ * Sets the expected return type of the analyzed method.
+ *
+ * @param v the expected return type of the analyzed method, or
+ * <tt>null</tt> if the method returns void.
+ */
+ public void setReturn(final V v) {
+ returnValue = v;
+ }
+
+ /**
+ * Returns the maximum number of local variables of this frame.
+ *
+ * @return the maximum number of local variables of this frame.
+ */
+ public int getLocals() {
+ return locals;
+ }
+
+ /**
+ * Returns the value of the given local variable.
+ *
+ * @param i a local variable index.
+ * @return the value of the given local variable.
+ * @throws IndexOutOfBoundsException if the variable does not exist.
+ */
+ public V getLocal(final int i) throws IndexOutOfBoundsException {
+ if (i >= locals) {
+ throw new IndexOutOfBoundsException("Trying to access an inexistant local variable");
+ }
+ return values[i];
+ }
+
+ /**
+ * Sets the value of the given local variable.
+ *
+ * @param i a local variable index.
+ * @param value the new value of this local variable.
+ * @throws IndexOutOfBoundsException if the variable does not exist.
+ */
+ public void setLocal(final int i, final V value)
+ throws IndexOutOfBoundsException
+ {
+ if (i >= locals) {
+ throw new IndexOutOfBoundsException("Trying to access an inexistant local variable "+i);
+ }
+ values[i] = value;
+ }
+
+ /**
+ * Returns the number of values in the operand stack of this frame. Long and
+ * double values are treated as single values.
+ *
+ * @return the number of values in the operand stack of this frame.
+ */
+ public int getStackSize() {
+ return top;
+ }
+
+ /**
+ * Returns the value of the given operand stack slot.
+ *
+ * @param i the index of an operand stack slot.
+ * @return the value of the given operand stack slot.
+ * @throws IndexOutOfBoundsException if the operand stack slot does not
+ * exist.
+ */
+ public V getStack(final int i) throws IndexOutOfBoundsException {
+ return values[i + locals];
+ }
+
+ /**
+ * Clears the operand stack of this frame.
+ */
+ public void clearStack() {
+ top = 0;
+ }
+
+ /**
+ * Pops a value from the operand stack of this frame.
+ *
+ * @return the value that has been popped from the stack.
+ * @throws IndexOutOfBoundsException if the operand stack is empty.
+ */
+ public V pop() throws IndexOutOfBoundsException {
+ if (top == 0) {
+ throw new IndexOutOfBoundsException("Cannot pop operand off an empty stack.");
+ }
+ return values[--top + locals];
+ }
+
+ /**
+ * Pushes a value into the operand stack of this frame.
+ *
+ * @param value the value that must be pushed into the stack.
+ * @throws IndexOutOfBoundsException if the operand stack is full.
+ */
+ public void push(final V value) throws IndexOutOfBoundsException {
+ if (top + locals >= values.length) {
+ throw new IndexOutOfBoundsException("Insufficient maximum stack size.");
+ }
+ values[top++ + locals] = value;
+ }
+
+ public void execute(
+ final AbstractInsnNode insn,
+ final Interpreter<V> interpreter) throws AnalyzerException
+ {
+ V value1, value2, value3, value4;
+ List<V> values;
+ int var;
+
+ switch (insn.getOpcode()) {
+ case Opcodes.NOP:
+ break;
+ case Opcodes.ACONST_NULL:
+ case Opcodes.ICONST_M1:
+ case Opcodes.ICONST_0:
+ case Opcodes.ICONST_1:
+ case Opcodes.ICONST_2:
+ case Opcodes.ICONST_3:
+ case Opcodes.ICONST_4:
+ case Opcodes.ICONST_5:
+ case Opcodes.LCONST_0:
+ case Opcodes.LCONST_1:
+ case Opcodes.FCONST_0:
+ case Opcodes.FCONST_1:
+ case Opcodes.FCONST_2:
+ case Opcodes.DCONST_0:
+ case Opcodes.DCONST_1:
+ case Opcodes.BIPUSH:
+ case Opcodes.SIPUSH:
+ case Opcodes.LDC:
+ push(interpreter.newOperation(insn));
+ break;
+ case Opcodes.ILOAD:
+ case Opcodes.LLOAD:
+ case Opcodes.FLOAD:
+ case Opcodes.DLOAD:
+ case Opcodes.ALOAD:
+ push(interpreter.copyOperation(insn,
+ getLocal(((VarInsnNode) insn).var)));
+ break;
+ case Opcodes.IALOAD:
+ case Opcodes.LALOAD:
+ case Opcodes.FALOAD:
+ case Opcodes.DALOAD:
+ case Opcodes.AALOAD:
+ case Opcodes.BALOAD:
+ case Opcodes.CALOAD:
+ case Opcodes.SALOAD:
+ value2 = pop();
+ value1 = pop();
+ push(interpreter.binaryOperation(insn, value1, value2));
+ break;
+ case Opcodes.ISTORE:
+ case Opcodes.LSTORE:
+ case Opcodes.FSTORE:
+ case Opcodes.DSTORE:
+ case Opcodes.ASTORE:
+ value1 = interpreter.copyOperation(insn, pop());
+ var = ((VarInsnNode) insn).var;
+ setLocal(var, value1);
+ if (value1.getSize() == 2) {
+ setLocal(var + 1, interpreter.newValue(null));
+ }
+ if (var > 0) {
+ Value local = getLocal(var - 1);
+ if (local != null && local.getSize() == 2) {
+ setLocal(var - 1, interpreter.newValue(null));
+ }
+ }
+ break;
+ case Opcodes.IASTORE:
+ case Opcodes.LASTORE:
+ case Opcodes.FASTORE:
+ case Opcodes.DASTORE:
+ case Opcodes.AASTORE:
+ case Opcodes.BASTORE:
+ case Opcodes.CASTORE:
+ case Opcodes.SASTORE:
+ value3 = pop();
+ value2 = pop();
+ value1 = pop();
+ interpreter.ternaryOperation(insn, value1, value2, value3);
+ break;
+ case Opcodes.POP:
+ if (pop().getSize() == 2) {
+ throw new AnalyzerException(insn, "Illegal use of POP");
+ }
+ break;
+ case Opcodes.POP2:
+ if (pop().getSize() == 1) {
+ if (pop().getSize() != 1) {
+ throw new AnalyzerException(insn, "Illegal use of POP2");
+ }
+ }
+ break;
+ case Opcodes.DUP:
+ value1 = pop();
+ if (value1.getSize() != 1) {
+ throw new AnalyzerException(insn, "Illegal use of DUP");
+ }
+ push(value1);
+ push(interpreter.copyOperation(insn, value1));
+ break;
+ case Opcodes.DUP_X1:
+ value1 = pop();
+ value2 = pop();
+ if (value1.getSize() != 1 || value2.getSize() != 1) {
+ throw new AnalyzerException(insn, "Illegal use of DUP_X1");
+ }
+ push(interpreter.copyOperation(insn, value1));
+ push(value2);
+ push(value1);
+ break;
+ case Opcodes.DUP_X2:
+ value1 = pop();
+ if (value1.getSize() == 1) {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ value3 = pop();
+ if (value3.getSize() == 1) {
+ push(interpreter.copyOperation(insn, value1));
+ push(value3);
+ push(value2);
+ push(value1);
+ break;
+ }
+ } else {
+ push(interpreter.copyOperation(insn, value1));
+ push(value2);
+ push(value1);
+ break;
+ }
+ }
+ throw new AnalyzerException(insn, "Illegal use of DUP_X2");
+ case Opcodes.DUP2:
+ value1 = pop();
+ if (value1.getSize() == 1) {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ push(value2);
+ push(value1);
+ push(interpreter.copyOperation(insn, value2));
+ push(interpreter.copyOperation(insn, value1));
+ break;
+ }
+ } else {
+ push(value1);
+ push(interpreter.copyOperation(insn, value1));
+ break;
+ }
+ throw new AnalyzerException(insn, "Illegal use of DUP2");
+ case Opcodes.DUP2_X1:
+ value1 = pop();
+ if (value1.getSize() == 1) {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ value3 = pop();
+ if (value3.getSize() == 1) {
+ push(interpreter.copyOperation(insn, value2));
+ push(interpreter.copyOperation(insn, value1));
+ push(value3);
+ push(value2);
+ push(value1);
+ break;
+ }
+ }
+ } else {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ push(interpreter.copyOperation(insn, value1));
+ push(value2);
+ push(value1);
+ break;
+ }
+ }
+ throw new AnalyzerException(insn, "Illegal use of DUP2_X1");
+ case Opcodes.DUP2_X2:
+ value1 = pop();
+ if (value1.getSize() == 1) {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ value3 = pop();
+ if (value3.getSize() == 1) {
+ value4 = pop();
+ if (value4.getSize() == 1) {
+ push(interpreter.copyOperation(insn, value2));
+ push(interpreter.copyOperation(insn, value1));
+ push(value4);
+ push(value3);
+ push(value2);
+ push(value1);
+ break;
+ }
+ } else {
+ push(interpreter.copyOperation(insn, value2));
+ push(interpreter.copyOperation(insn, value1));
+ push(value3);
+ push(value2);
+ push(value1);
+ break;
+ }
+ }
+ } else {
+ value2 = pop();
+ if (value2.getSize() == 1) {
+ value3 = pop();
+ if (value3.getSize() == 1) {
+ push(interpreter.copyOperation(insn, value1));
+ push(value3);
+ push(value2);
+ push(value1);
+ break;
+ }
+ } else {
+ push(interpreter.copyOperation(insn, value1));
+ push(value2);
+ push(value1);
+ break;
+ }
+ }
+ throw new AnalyzerException(insn, "Illegal use of DUP2_X2");
+ case Opcodes.SWAP:
+ value2 = pop();
+ value1 = pop();
+ if (value1.getSize() != 1 || value2.getSize() != 1) {
+ throw new AnalyzerException(insn, "Illegal use of SWAP");
+ }
+ push(interpreter.copyOperation(insn, value2));
+ push(interpreter.copyOperation(insn, value1));
+ break;
+ case Opcodes.IADD:
+ case Opcodes.LADD:
+ case Opcodes.FADD:
+ case Opcodes.DADD:
+ case Opcodes.ISUB:
+ case Opcodes.LSUB:
+ case Opcodes.FSUB:
+ case Opcodes.DSUB:
+ case Opcodes.IMUL:
+ case Opcodes.LMUL:
+ case Opcodes.FMUL:
+ case Opcodes.DMUL:
+ case Opcodes.IDIV:
+ case Opcodes.LDIV:
+ case Opcodes.FDIV:
+ case Opcodes.DDIV:
+ case Opcodes.IREM:
+ case Opcodes.LREM:
+ case Opcodes.FREM:
+ case Opcodes.DREM:
+ value2 = pop();
+ value1 = pop();
+ push(interpreter.binaryOperation(insn, value1, value2));
+ break;
+ case Opcodes.INEG:
+ case Opcodes.LNEG:
+ case Opcodes.FNEG:
+ case Opcodes.DNEG:
+ push(interpreter.unaryOperation(insn, pop()));
+ break;
+ case Opcodes.ISHL:
+ case Opcodes.LSHL:
+ case Opcodes.ISHR:
+ case Opcodes.LSHR:
+ case Opcodes.IUSHR:
+ case Opcodes.LUSHR:
+ case Opcodes.IAND:
+ case Opcodes.LAND:
+ case Opcodes.IOR:
+ case Opcodes.LOR:
+ case Opcodes.IXOR:
+ case Opcodes.LXOR:
+ value2 = pop();
+ value1 = pop();
+ push(interpreter.binaryOperation(insn, value1, value2));
+ break;
+ case Opcodes.IINC:
+ var = ((IincInsnNode) insn).var;
+ setLocal(var, interpreter.unaryOperation(insn, getLocal(var)));
+ break;
+ case Opcodes.I2L:
+ case Opcodes.I2F:
+ case Opcodes.I2D:
+ case Opcodes.L2I:
+ case Opcodes.L2F:
+ case Opcodes.L2D:
+ case Opcodes.F2I:
+ case Opcodes.F2L:
+ case Opcodes.F2D:
+ case Opcodes.D2I:
+ case Opcodes.D2L:
+ case Opcodes.D2F:
+ case Opcodes.I2B:
+ case Opcodes.I2C:
+ case Opcodes.I2S:
+ push(interpreter.unaryOperation(insn, pop()));
+ break;
+ case Opcodes.LCMP:
+ case Opcodes.FCMPL:
+ case Opcodes.FCMPG:
+ case Opcodes.DCMPL:
+ case Opcodes.DCMPG:
+ value2 = pop();
+ value1 = pop();
+ push(interpreter.binaryOperation(insn, value1, value2));
+ break;
+ case Opcodes.IFEQ:
+ case Opcodes.IFNE:
+ case Opcodes.IFLT:
+ case Opcodes.IFGE:
+ case Opcodes.IFGT:
+ case Opcodes.IFLE:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ case Opcodes.IF_ICMPEQ:
+ case Opcodes.IF_ICMPNE:
+ case Opcodes.IF_ICMPLT:
+ case Opcodes.IF_ICMPGE:
+ case Opcodes.IF_ICMPGT:
+ case Opcodes.IF_ICMPLE:
+ case Opcodes.IF_ACMPEQ:
+ case Opcodes.IF_ACMPNE:
+ value2 = pop();
+ value1 = pop();
+ interpreter.binaryOperation(insn, value1, value2);
+ break;
+ case Opcodes.GOTO:
+ break;
+ case Opcodes.JSR:
+ push(interpreter.newOperation(insn));
+ break;
+ case Opcodes.RET:
+ break;
+ case Opcodes.TABLESWITCH:
+ case Opcodes.LOOKUPSWITCH:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ case Opcodes.IRETURN:
+ case Opcodes.LRETURN:
+ case Opcodes.FRETURN:
+ case Opcodes.DRETURN:
+ case Opcodes.ARETURN:
+ value1 = pop();
+ interpreter.unaryOperation(insn, value1);
+ interpreter.returnOperation(insn, value1, returnValue);
+ break;
+ case Opcodes.RETURN:
+ if (returnValue != null) {
+ throw new AnalyzerException(insn, "Incompatible return type");
+ }
+ break;
+ case Opcodes.GETSTATIC:
+ push(interpreter.newOperation(insn));
+ break;
+ case Opcodes.PUTSTATIC:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ case Opcodes.GETFIELD:
+ push(interpreter.unaryOperation(insn, pop()));
+ break;
+ case Opcodes.PUTFIELD:
+ value2 = pop();
+ value1 = pop();
+ interpreter.binaryOperation(insn, value1, value2);
+ break;
+ case Opcodes.INVOKEVIRTUAL:
+ case Opcodes.INVOKESPECIAL:
+ case Opcodes.INVOKESTATIC:
+ case Opcodes.INVOKEINTERFACE: {
+ values = new ArrayList<V>();
+ String desc = ((MethodInsnNode) insn).desc;
+ for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
+ values.add(0, pop());
+ }
+ if (insn.getOpcode() != Opcodes.INVOKESTATIC) {
+ values.add(0, pop());
+ }
+ if (Type.getReturnType(desc) == Type.VOID_TYPE) {
+ interpreter.naryOperation(insn, values);
+ } else {
+ push(interpreter.naryOperation(insn, values));
+ }
+ break;
+ }
+ case Opcodes.INVOKEDYNAMIC: {
+ values = new ArrayList<V>();
+ String desc = ((InvokeDynamicInsnNode) insn).desc;
+ for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
+ values.add(0, pop());
+ }
+ if (Type.getReturnType(desc) == Type.VOID_TYPE) {
+ interpreter.naryOperation(insn, values);
+ } else {
+ push(interpreter.naryOperation(insn, values));
+ }
+ break;
+ }
+ case Opcodes.NEW:
+ push(interpreter.newOperation(insn));
+ break;
+ case Opcodes.NEWARRAY:
+ case Opcodes.ANEWARRAY:
+ case Opcodes.ARRAYLENGTH:
+ push(interpreter.unaryOperation(insn, pop()));
+ break;
+ case Opcodes.ATHROW:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ case Opcodes.CHECKCAST:
+ case Opcodes.INSTANCEOF:
+ push(interpreter.unaryOperation(insn, pop()));
+ break;
+ case Opcodes.MONITORENTER:
+ case Opcodes.MONITOREXIT:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ case Opcodes.MULTIANEWARRAY:
+ values = new ArrayList<V>();
+ for (int i = ((MultiANewArrayInsnNode) insn).dims; i > 0; --i) {
+ values.add(0, pop());
+ }
+ push(interpreter.naryOperation(insn, values));
+ break;
+ case Opcodes.IFNULL:
+ case Opcodes.IFNONNULL:
+ interpreter.unaryOperation(insn, pop());
+ break;
+ default:
+ throw new RuntimeException("Illegal opcode "+insn.getOpcode());
+ }
+ }
+
+ /**
+ * Merges this frame with the given frame.
+ *
+ * @param frame a frame.
+ * @param interpreter the interpreter used to merge values.
+ * @return <tt>true</tt> if this frame has been changed as a result of the
+ * merge operation, or <tt>false</tt> otherwise.
+ * @throws AnalyzerException if the frames have incompatible sizes.
+ */
+ public boolean merge(final Frame<? extends V> frame, final Interpreter<V> interpreter)
+ throws AnalyzerException
+ {
+ if (top != frame.top) {
+ throw new AnalyzerException(null, "Incompatible stack heights");
+ }
+ boolean changes = false;
+ for (int i = 0; i < locals + top; ++i) {
+ V v = interpreter.merge(values[i], frame.values[i]);
+ if (v != values[i]) {
+ values[i] = v;
+ changes |= true;
+ }
+ }
+ return changes;
+ }
+
+ /**
+ * Merges this frame with the given frame (case of a RET instruction).
+ *
+ * @param frame a frame
+ * @param access the local variables that have been accessed by the
+ * subroutine to which the RET instruction corresponds.
+ * @return <tt>true</tt> if this frame has been changed as a result of the
+ * merge operation, or <tt>false</tt> otherwise.
+ */
+ public boolean merge(final Frame<? extends V> frame, final boolean[] access) {
+ boolean changes = false;
+ for (int i = 0; i < locals; ++i) {
+ if (!access[i] && !values[i].equals(frame.values[i])) {
+ values[i] = frame.values[i];
+ changes = true;
+ }
+ }
+ return changes;
+ }
+
+ /**
+ * Returns a string representation of this frame.
+ *
+ * @return a string representation of this frame.
+ */
+ @Override
+ public String toString() {
+ StringBuffer b = new StringBuffer();
+ for (int i = 0; i < getLocals(); ++i) {
+ b.append(getLocal(i));
+ }
+ b.append(' ');
+ for (int i = 0; i < getStackSize(); ++i) {
+ b.append(getStack(i).toString());
+ }
+ return b.toString();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
new file mode 100644
index 0000000..fd8735f
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -0,0 +1,233 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * A semantic bytecode interpreter. More precisely, this interpreter only
+ * manages the computation of values from other values: it does not manage the
+ * transfer of values to or from the stack, and to or from the local variables.
+ * This separation allows a generic bytecode {@link Analyzer} to work with
+ * various semantic interpreters, without needing to duplicate the code to
+ * simulate the transfer of values.
+ *
+ * @param <V> type of the Value used for the analysis.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class Interpreter<V extends Value> {
+
+ protected final int api;
+
+ protected Interpreter(final int api) {
+ this.api = api;
+ }
+
+ /**
+ * Creates a new value that represents the given type.
+ *
+ * Called for method parameters (including <code>this</code>),
+ * exception handler variable and with <code>null</code> type
+ * for variables reserved by long and double types.
+ *
+ * @param type a primitive or reference type, or <tt>null</tt> to
+ * represent an uninitialized value.
+ * @return a value that represents the given type. The size of the returned
+ * value must be equal to the size of the given type.
+ */
+ public abstract V newValue(Type type);
+
+ /**
+ * Interprets a bytecode instruction without arguments. This method is
+ * called for the following opcodes:
+ *
+ * ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4,
+ * ICONST_5, LCONST_0, LCONST_1, FCONST_0, FCONST_1, FCONST_2, DCONST_0,
+ * DCONST_1, BIPUSH, SIPUSH, LDC, JSR, GETSTATIC, NEW
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @return the result of the interpretation of the given instruction.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V newOperation(AbstractInsnNode insn)
+ throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode instruction that moves a value on the stack or to
+ * or from local variables. This method is called for the following opcodes:
+ *
+ * ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE,
+ * ASTORE, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param value the value that must be moved by the instruction.
+ * @return the result of the interpretation of the given instruction. The
+ * returned value must be <tt>equal</tt> to the given value.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V copyOperation(AbstractInsnNode insn, V value)
+ throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode instruction with a single argument. This method is
+ * called for the following opcodes:
+ *
+ * INEG, LNEG, FNEG, DNEG, IINC, I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L,
+ * F2D, D2I, D2L, D2F, I2B, I2C, I2S, IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE,
+ * TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN,
+ * PUTSTATIC, GETFIELD, NEWARRAY, ANEWARRAY, ARRAYLENGTH, ATHROW, CHECKCAST,
+ * INSTANCEOF, MONITORENTER, MONITOREXIT, IFNULL, IFNONNULL
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param value the argument of the instruction to be interpreted.
+ * @return the result of the interpretation of the given instruction.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V unaryOperation(AbstractInsnNode insn, V value)
+ throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode instruction with two arguments. This method is
+ * called for the following opcodes:
+ *
+ * IALOAD, LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IADD,
+ * LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV,
+ * LDIV, FDIV, DDIV, IREM, LREM, FREM, DREM, ISHL, LSHL, ISHR, LSHR, IUSHR,
+ * LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, LCMP, FCMPL, FCMPG, DCMPL,
+ * DCMPG, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+ * IF_ACMPEQ, IF_ACMPNE, PUTFIELD
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param value1 the first argument of the instruction to be interpreted.
+ * @param value2 the second argument of the instruction to be interpreted.
+ * @return the result of the interpretation of the given instruction.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V binaryOperation(AbstractInsnNode insn, V value1, V value2)
+ throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode instruction with three arguments. This method is
+ * called for the following opcodes:
+ *
+ * IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param value1 the first argument of the instruction to be interpreted.
+ * @param value2 the second argument of the instruction to be interpreted.
+ * @param value3 the third argument of the instruction to be interpreted.
+ * @return the result of the interpretation of the given instruction.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V ternaryOperation(
+ AbstractInsnNode insn,
+ V value1,
+ V value2,
+ V value3) throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode instruction with a variable number of arguments.
+ * This method is called for the following opcodes:
+ *
+ * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE,
+ * MULTIANEWARRAY and INVOKEDYNAMIC
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param values the arguments of the instruction to be interpreted.
+ * @return the result of the interpretation of the given instruction.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract V naryOperation(
+ AbstractInsnNode insn,
+ List< ? extends V> values) throws AnalyzerException;
+
+ /**
+ * Interprets a bytecode return instruction. This method is called for the
+ * following opcodes:
+ *
+ * IRETURN, LRETURN, FRETURN, DRETURN, ARETURN
+ *
+ * @param insn the bytecode instruction to be interpreted.
+ * @param value the argument of the instruction to be interpreted.
+ * @param expected the expected return type of the analyzed method.
+ * @throws AnalyzerException if an error occured during the interpretation.
+ */
+ public abstract void returnOperation(
+ AbstractInsnNode insn,
+ V value,
+ V expected) throws AnalyzerException;
+
+ /**
+ * Merges two values. The merge operation must return a value that
+ * represents both values (for instance, if the two values are two types,
+ * the merged value must be a common super type of the two types. If the two
+ * values are integer intervals, the merged value must be an interval that
+ * contains the previous ones. Likewise for other types of values).
+ *
+ * @param v a value.
+ * @param w another value.
+ * @return the merged value. If the merged value is equal to <tt>v</tt>,
+ * this method <i>must</i> return <tt>v</tt>.
+ */
+ public abstract V merge(V v, V w);
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
new file mode 100644
index 0000000..29275c7
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
@@ -0,0 +1,358 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * An extended {@link BasicVerifier} that performs more precise verifications.
+ * This verifier computes exact class types, instead of using a single "object
+ * reference" type (as done in the {@link BasicVerifier}).
+ *
+ * @author Eric Bruneton
+ * @author Bing Ran
+ */
+public class SimpleVerifier extends BasicVerifier {
+
+ /**
+ * The class that is verified.
+ */
+ private final Type currentClass;
+
+ /**
+ * The super class of the class that is verified.
+ */
+ private final Type currentSuperClass;
+
+ /**
+ * The interfaces implemented by the class that is verified.
+ */
+ private final List<Type> currentClassInterfaces;
+
+ /**
+ * If the class that is verified is an interface.
+ */
+ private final boolean isInterface;
+
+ /**
+ * The loader to use for referenced classes.
+ */
+ private ClassLoader loader = getClass().getClassLoader();
+
+ /**
+ * Constructs a new {@link SimpleVerifier}.
+ */
+ public SimpleVerifier() {
+ this(null, null, false);
+ }
+
+ /**
+ * Constructs a new {@link SimpleVerifier} to verify a specific class. This
+ * class will not be loaded into the JVM since it may be incorrect.
+ *
+ * @param currentClass the class that is verified.
+ * @param currentSuperClass the super class of the class that is verified.
+ * @param isInterface if the class that is verified is an interface.
+ */
+ public SimpleVerifier(
+ final Type currentClass,
+ final Type currentSuperClass,
+ final boolean isInterface)
+ {
+ this(currentClass, currentSuperClass, null, isInterface);
+ }
+
+ /**
+ * Constructs a new {@link SimpleVerifier} to verify a specific class. This
+ * class will not be loaded into the JVM since it may be incorrect.
+ *
+ * @param currentClass the class that is verified.
+ * @param currentSuperClass the super class of the class that is verified.
+ * @param currentClassInterfaces the interfaces implemented by the class
+ * that is verified.
+ * @param isInterface if the class that is verified is an interface.
+ */
+ public SimpleVerifier(
+ final Type currentClass,
+ final Type currentSuperClass,
+ final List<Type> currentClassInterfaces,
+ final boolean isInterface)
+ {
+ this(ASM4,
+ currentClass,
+ currentSuperClass,
+ currentClassInterfaces,
+ isInterface);
+ }
+
+ protected SimpleVerifier(
+ final int api,
+ final Type currentClass,
+ final Type currentSuperClass,
+ final List<Type> currentClassInterfaces,
+ final boolean isInterface)
+ {
+ super(api);
+ this.currentClass = currentClass;
+ this.currentSuperClass = currentSuperClass;
+ this.currentClassInterfaces = currentClassInterfaces;
+ this.isInterface = isInterface;
+ }
+
+ /**
+ * Set the <code>ClassLoader</code> which will be used to load referenced
+ * classes. This is useful if you are verifying multiple interdependent
+ * classes.
+ *
+ * @param loader a <code>ClassLoader</code> to use
+ */
+ public void setClassLoader(final ClassLoader loader) {
+ this.loader = loader;
+ }
+
+ @Override
+ public BasicValue newValue(final Type type) {
+ if (type == null) {
+ return BasicValue.UNINITIALIZED_VALUE;
+ }
+
+ boolean isArray = type.getSort() == Type.ARRAY;
+ if (isArray) {
+ switch (type.getElementType().getSort()) {
+ case Type.BOOLEAN:
+ case Type.CHAR:
+ case Type.BYTE:
+ case Type.SHORT:
+ return new BasicValue(type);
+ }
+ }
+
+ BasicValue v = super.newValue(type);
+ if (BasicValue.REFERENCE_VALUE.equals(v)) {
+ if (isArray) {
+ v = newValue(type.getElementType());
+ String desc = v.getType().getDescriptor();
+ for (int i = 0; i < type.getDimensions(); ++i) {
+ desc = '[' + desc;
+ }
+ v = new BasicValue(Type.getType(desc));
+ } else {
+ v = new BasicValue(type);
+ }
+ }
+ return v;
+ }
+
+ @Override
+ protected boolean isArrayValue(final BasicValue value) {
+ Type t = value.getType();
+ return t != null
+ && ("Lnull;".equals(t.getDescriptor()) || t.getSort() == Type.ARRAY);
+ }
+
+ @Override
+ protected BasicValue getElementValue(final BasicValue objectArrayValue)
+ throws AnalyzerException
+ {
+ Type arrayType = objectArrayValue.getType();
+ if (arrayType != null) {
+ if (arrayType.getSort() == Type.ARRAY) {
+ return newValue(Type.getType(arrayType.getDescriptor()
+ .substring(1)));
+ } else if ("Lnull;".equals(arrayType.getDescriptor())) {
+ return objectArrayValue;
+ }
+ }
+ throw new Error("Internal error");
+ }
+
+ @Override
+ protected boolean isSubTypeOf(final BasicValue value, final BasicValue expected) {
+ Type expectedType = expected.getType();
+ Type type = value.getType();
+ switch (expectedType.getSort()) {
+ case Type.INT:
+ case Type.FLOAT:
+ case Type.LONG:
+ case Type.DOUBLE:
+ return type.equals(expectedType);
+ case Type.ARRAY:
+ case Type.OBJECT:
+ if ("Lnull;".equals(type.getDescriptor())) {
+ return true;
+ } else if (type.getSort() == Type.OBJECT
+ || type.getSort() == Type.ARRAY)
+ {
+ return isAssignableFrom(expectedType, type);
+ } else {
+ return false;
+ }
+ default:
+ throw new Error("Internal error");
+ }
+ }
+
+ @Override
+ public BasicValue merge(final BasicValue v, final BasicValue w) {
+ if (!v.equals(w)) {
+ Type t = v.getType();
+ Type u = w.getType();
+ if (t != null
+ && (t.getSort() == Type.OBJECT || t.getSort() == Type.ARRAY))
+ {
+ if (u != null
+ && (u.getSort() == Type.OBJECT || u.getSort() == Type.ARRAY))
+ {
+ if ("Lnull;".equals(t.getDescriptor())) {
+ return w;
+ }
+ if ("Lnull;".equals(u.getDescriptor())) {
+ return v;
+ }
+ if (isAssignableFrom(t, u)) {
+ return v;
+ }
+ if (isAssignableFrom(u, t)) {
+ return w;
+ }
+ // TODO case of array classes of the same dimension
+ // TODO should we look also for a common super interface?
+ // problem: there may be several possible common super
+ // interfaces
+ do {
+ if (t == null || isInterface(t)) {
+ return BasicValue.REFERENCE_VALUE;
+ }
+ t = getSuperClass(t);
+ if (isAssignableFrom(t, u)) {
+ return newValue(t);
+ }
+ } while (true);
+ }
+ }
+ return BasicValue.UNINITIALIZED_VALUE;
+ }
+ return v;
+ }
+
+ protected boolean isInterface(final Type t) {
+ if (currentClass != null && t.equals(currentClass)) {
+ return isInterface;
+ }
+ return getClass(t).isInterface();
+ }
+
+ protected Type getSuperClass(final Type t) {
+ if (currentClass != null && t.equals(currentClass)) {
+ return currentSuperClass;
+ }
+ Class<?> c = getClass(t).getSuperclass();
+ return c == null ? null : Type.getType(c);
+ }
+
+ protected boolean isAssignableFrom(final Type t, final Type u) {
+ if (t.equals(u)) {
+ return true;
+ }
+ if (currentClass != null && t.equals(currentClass)) {
+ if (getSuperClass(u) == null) {
+ return false;
+ } else {
+ if (isInterface) {
+ return u.getSort() == Type.OBJECT || u.getSort() == Type.ARRAY;
+ }
+ return isAssignableFrom(t, getSuperClass(u));
+ }
+ }
+ if (currentClass != null && u.equals(currentClass)) {
+ if (isAssignableFrom(t, currentSuperClass)) {
+ return true;
+ }
+ if (currentClassInterfaces != null) {
+ for (int i = 0; i < currentClassInterfaces.size(); ++i) {
+ Type v = currentClassInterfaces.get(i);
+ if (isAssignableFrom(t, v)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ Class<?> tc = getClass(t);
+ if (tc.isInterface()) {
+ tc = Object.class;
+ }
+ return tc.isAssignableFrom(getClass(u));
+ }
+
+ protected Class<?> getClass(final Type t) {
+ try {
+ if (t.getSort() == Type.ARRAY) {
+ return Class.forName(t.getDescriptor().replace('/', '.'),
+ false,
+ loader);
+ }
+ return Class.forName(t.getClassName(), false, loader);
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e.toString());
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
new file mode 100644
index 0000000..d11be3a
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -0,0 +1,163 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.AbstractSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+/**
+ * A set of at most two elements.
+ *
+ * @author Eric Bruneton
+ */
+class SmallSet<E> extends AbstractSet<E> implements Iterator<E> {
+
+ // if e1 is null, e2 must be null; otherwise e2 must be different from e1
+
+ E e1, e2;
+
+ static final <T> Set<T> emptySet() {
+ return new SmallSet<T>(null, null);
+ }
+
+ SmallSet(final E e1, final E e2) {
+ this.e1 = e1;
+ this.e2 = e2;
+ }
+
+ // -------------------------------------------------------------------------
+ // Implementation of inherited abstract methods
+ // -------------------------------------------------------------------------
+
+ @Override
+ public Iterator<E> iterator() {
+ return new SmallSet<E>(e1, e2);
+ }
+
+ @Override
+ public int size() {
+ return e1 == null ? 0 : (e2 == null ? 1 : 2);
+ }
+
+ // -------------------------------------------------------------------------
+ // Implementation of the Iterator interface
+ // -------------------------------------------------------------------------
+
+ public boolean hasNext() {
+ return e1 != null;
+ }
+
+ public E next() {
+ if (e1 == null) {
+ throw new NoSuchElementException();
+ }
+ E e = e1;
+ e1 = e2;
+ e2 = null;
+ return e;
+ }
+
+ public void remove() {
+ }
+
+ // -------------------------------------------------------------------------
+ // Utility methods
+ // -------------------------------------------------------------------------
+
+ Set<E> union(final SmallSet<E> s) {
+ if ((s.e1 == e1 && s.e2 == e2) || (s.e1 == e2 && s.e2 == e1)) {
+ return this; // if the two sets are equal, return this
+ }
+ if (s.e1 == null) {
+ return this; // if s is empty, return this
+ }
+ if (e1 == null) {
+ return s; // if this is empty, return s
+ }
+ if (s.e2 == null) { // s contains exactly one element
+ if (e2 == null) {
+ return new SmallSet<E>(e1, s.e1); // necessarily e1 != s.e1
+ } else if (s.e1 == e1 || s.e1 == e2) { // s is included in this
+ return this;
+ }
+ }
+ if (e2 == null) { // this contains exactly one element
+ // if (s.e2 == null) { // cannot happen
+ // return new SmallSet(e1, s.e1); // necessarily e1 != s.e1
+ // } else
+ if (e1 == s.e1 || e1 == s.e2) { // this in included in s
+ return s;
+ }
+ }
+ // here we know that there are at least 3 distinct elements
+ HashSet<E> r = new HashSet<E>(4);
+ r.add(e1);
+ if (e2 != null) {
+ r.add(e2);
+ }
+ r.add(s.e1);
+ if (s.e2 != null) {
+ r.add(s.e2);
+ }
+ return r;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
new file mode 100644
index 0000000..131f656
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
@@ -0,0 +1,235 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+import jdk.internal.org.objectweb.asm.tree.FieldInsnNode;
+import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import jdk.internal.org.objectweb.asm.tree.LdcInsnNode;
+import jdk.internal.org.objectweb.asm.tree.MethodInsnNode;
+
+/**
+ * An {@link Interpreter} for {@link SourceValue} values.
+ *
+ * @author Eric Bruneton
+ */
+public class SourceInterpreter extends Interpreter<SourceValue> implements
+ Opcodes
+{
+
+ public SourceInterpreter() {
+ super(ASM4);
+ }
+
+ protected SourceInterpreter(final int api) {
+ super(api);
+ }
+
+ @Override
+ public SourceValue newValue(final Type type) {
+ if (type == Type.VOID_TYPE) {
+ return null;
+ }
+ return new SourceValue(type == null ? 1 : type.getSize());
+ }
+
+ @Override
+ public SourceValue newOperation(final AbstractInsnNode insn) {
+ int size;
+ switch (insn.getOpcode()) {
+ case LCONST_0:
+ case LCONST_1:
+ case DCONST_0:
+ case DCONST_1:
+ size = 2;
+ break;
+ case LDC:
+ Object cst = ((LdcInsnNode) insn).cst;
+ size = cst instanceof Long || cst instanceof Double ? 2 : 1;
+ break;
+ case GETSTATIC:
+ size = Type.getType(((FieldInsnNode) insn).desc).getSize();
+ break;
+ default:
+ size = 1;
+ }
+ return new SourceValue(size, insn);
+ }
+
+ @Override
+ public SourceValue copyOperation(final AbstractInsnNode insn, final SourceValue value) {
+ return new SourceValue(value.getSize(), insn);
+ }
+
+ @Override
+ public SourceValue unaryOperation(final AbstractInsnNode insn, final SourceValue value)
+ {
+ int size;
+ switch (insn.getOpcode()) {
+ case LNEG:
+ case DNEG:
+ case I2L:
+ case I2D:
+ case L2D:
+ case F2L:
+ case F2D:
+ case D2L:
+ size = 2;
+ break;
+ case GETFIELD:
+ size = Type.getType(((FieldInsnNode) insn).desc).getSize();
+ break;
+ default:
+ size = 1;
+ }
+ return new SourceValue(size, insn);
+ }
+
+ @Override
+ public SourceValue binaryOperation(
+ final AbstractInsnNode insn,
+ final SourceValue value1,
+ final SourceValue value2)
+ {
+ int size;
+ switch (insn.getOpcode()) {
+ case LALOAD:
+ case DALOAD:
+ case LADD:
+ case DADD:
+ case LSUB:
+ case DSUB:
+ case LMUL:
+ case DMUL:
+ case LDIV:
+ case DDIV:
+ case LREM:
+ case DREM:
+ case LSHL:
+ case LSHR:
+ case LUSHR:
+ case LAND:
+ case LOR:
+ case LXOR:
+ size = 2;
+ break;
+ default:
+ size = 1;
+ }
+ return new SourceValue(size, insn);
+ }
+
+ @Override
+ public SourceValue ternaryOperation(
+ final AbstractInsnNode insn,
+ final SourceValue value1,
+ final SourceValue value2,
+ final SourceValue value3)
+ {
+ return new SourceValue(1, insn);
+ }
+
+ @Override
+ public SourceValue naryOperation(final AbstractInsnNode insn, final List<? extends SourceValue> values) {
+ int size;
+ int opcode = insn.getOpcode();
+ if (opcode == MULTIANEWARRAY) {
+ size = 1;
+ } else {
+ String desc = (opcode == INVOKEDYNAMIC)?
+ ((InvokeDynamicInsnNode) insn).desc:
+ ((MethodInsnNode) insn).desc;
+ size = Type.getReturnType(desc).getSize();
+ }
+ return new SourceValue(size, insn);
+ }
+
+ @Override
+ public void returnOperation(
+ final AbstractInsnNode insn,
+ final SourceValue value,
+ final SourceValue expected)
+ {
+ }
+
+ @Override
+ public SourceValue merge(final SourceValue d, final SourceValue w) {
+ if (d.insns instanceof SmallSet && w.insns instanceof SmallSet) {
+ Set<AbstractInsnNode> s = ((SmallSet<AbstractInsnNode>) d.insns).union((SmallSet<AbstractInsnNode>) w.insns);
+ if (s == d.insns && d.size == w.size) {
+ return d;
+ } else {
+ return new SourceValue(Math.min(d.size, w.size), s);
+ }
+ }
+ if (d.size != w.size || !d.insns.containsAll(w.insns)) {
+ HashSet<AbstractInsnNode> s = new HashSet<AbstractInsnNode>();
+ s.addAll(d.insns);
+ s.addAll(w.insns);
+ return new SourceValue(Math.min(d.size, w.size), s);
+ }
+ return d;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
new file mode 100644
index 0000000..344a329
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
@@ -0,0 +1,126 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.Set;
+
+import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
+
+/**
+ * A {@link Value} that is represented by its type in a two types type system.
+ * This type system distinguishes the ONEWORD and TWOWORDS types.
+ *
+ * @author Eric Bruneton
+ */
+public class SourceValue implements Value {
+
+ /**
+ * The size of this value.
+ */
+ public final int size;
+
+ /**
+ * The instructions that can produce this value. For example, for the Java
+ * code below, the instructions that can produce the value of <tt>i</tt>
+ * at line 5 are the txo ISTORE instructions at line 1 and 3:
+ *
+ * <pre>
+ * 1: i = 0;
+ * 2: if (...) {
+ * 3: i = 1;
+ * 4: }
+ * 5: return i;
+ * </pre>
+ *
+ * This field is a set of {@link AbstractInsnNode} objects.
+ */
+ public final Set<AbstractInsnNode> insns;
+
+ public SourceValue(final int size) {
+ this(size, SmallSet.<AbstractInsnNode>emptySet());
+ }
+
+ public SourceValue(final int size, final AbstractInsnNode insn) {
+ this.size = size;
+ this.insns = new SmallSet<AbstractInsnNode>(insn, null);
+ }
+
+ public SourceValue(final int size, final Set<AbstractInsnNode> insns) {
+ this.size = size;
+ this.insns = insns;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ @Override
+ public boolean equals(final Object value) {
+ if (!(value instanceof SourceValue)) {
+ return false;
+ }
+ SourceValue v = (SourceValue) value;
+ return size == v.size && insns.equals(v.insns);
+ }
+
+ @Override
+ public int hashCode() {
+ return insns.hashCode();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
new file mode 100644
index 0000000..670e232
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -0,0 +1,122 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.tree.JumpInsnNode;
+import jdk.internal.org.objectweb.asm.tree.LabelNode;
+
+/**
+ * A method subroutine (corresponds to a JSR instruction).
+ *
+ * @author Eric Bruneton
+ */
+class Subroutine {
+
+ LabelNode start;
+
+ boolean[] access;
+
+ List<JumpInsnNode> callers;
+
+ private Subroutine() {
+ }
+
+ Subroutine(
+ final LabelNode start,
+ final int maxLocals,
+ final JumpInsnNode caller)
+ {
+ this.start = start;
+ this.access = new boolean[maxLocals];
+ this.callers = new ArrayList<JumpInsnNode>();
+ callers.add(caller);
+ }
+
+ public Subroutine copy() {
+ Subroutine result = new Subroutine();
+ result.start = start;
+ result.access = new boolean[access.length];
+ System.arraycopy(access, 0, result.access, 0, access.length);
+ result.callers = new ArrayList<JumpInsnNode>(callers);
+ return result;
+ }
+
+ public boolean merge(final Subroutine subroutine) throws AnalyzerException {
+ boolean changes = false;
+ for (int i = 0; i < access.length; ++i) {
+ if (subroutine.access[i] && !access[i]) {
+ access[i] = true;
+ changes = true;
+ }
+ }
+ if (subroutine.start == start) {
+ for (int i = 0; i < subroutine.callers.size(); ++i) {
+ JumpInsnNode caller = subroutine.callers.get(i);
+ if (!callers.contains(caller)) {
+ callers.add(caller);
+ changes = true;
+ }
+ }
+ }
+ return changes;
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
new file mode 100644
index 0000000..b7adf48
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
@@ -0,0 +1,74 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.tree.analysis;
+
+/**
+ * An immutable symbolic value for semantic interpretation of bytecode.
+ *
+ * @author Eric Bruneton
+ */
+public interface Value {
+
+ /**
+ * Returns the size of this value in words.
+ *
+ * @return either 1 or 2.
+ */
+ int getSize();
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
new file mode 100644
index 0000000..86f7a61
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
@@ -0,0 +1,82 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Label;
+
+/**
+ * An {@link jdk.internal.org.objectweb.asm.Attribute Attribute} that can print the ASM code
+ * to create an equivalent attribute.
+ *
+ * @author Eugene Kuleshov
+ */
+public interface ASMifiable {
+
+ /**
+ * Prints the ASM code to create an attribute equal to this attribute.
+ *
+ * @param buf a buffer used for printing Java code.
+ * @param varName name of the variable in a printed code used to store
+ * attribute instance.
+ * @param labelNames map of label instances to their names.
+ */
+ void asmify(StringBuffer buf, String varName, Map<Label, String> labelNames);
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
new file mode 100644
index 0000000..86cbedd
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
@@ -0,0 +1,1268 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * A {@link Printer} that prints the ASM code to generate the classes if visits.
+ *
+ * @author Eric Bruneton
+ */
+public class ASMifier extends Printer {
+
+ /**
+ * The name of the visitor variable in the produced code.
+ */
+ protected final String name;
+
+ /**
+ * Identifier of the annotation visitor variable in the produced code.
+ */
+ protected final int id;
+
+ /**
+ * The label names. This map associates String values to Label keys. It is
+ * used only in ASMifierMethodVisitor.
+ */
+ protected Map<Label, String> labelNames;
+
+ /**
+ * Pseudo access flag used to distinguish class access flags.
+ */
+ private static final int ACCESS_CLASS = 262144;
+
+ /**
+ * Pseudo access flag used to distinguish field access flags.
+ */
+ private static final int ACCESS_FIELD = 524288;
+
+ /**
+ * Pseudo access flag used to distinguish inner class flags.
+ */
+ private static final int ACCESS_INNER = 1048576;
+
+ /**
+ * Constructs a new {@link ASMifier}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the
+ * {@link #ASMifier(int, String, int)} version.
+ */
+ public ASMifier() {
+ this(Opcodes.ASM4, "cw", 0);
+ }
+
+ /**
+ * Constructs a new {@link ASMifier}.
+ *
+ * @param api the ASM API version implemented by this class. Must be one of
+ * {@link Opcodes#ASM4}.
+ * @param name the name of the visitor variable in the produced code.
+ * @param id identifier of the annotation visitor variable in the produced
+ * code.
+ */
+ protected ASMifier(final int api, final String name, final int id) {
+ super(api);
+ this.name = name;
+ this.id = id;
+ }
+
+ /**
+ * Prints the ASM source code to generate the given class to the standard
+ * output. <p> Usage: ASMifier [-debug] <binary
+ * class name or class file name>
+ *
+ * @param args the command line arguments.
+ *
+ * @throws Exception if the class cannot be found, or if an IO exception
+ * occurs.
+ */
+ public static void main(final String[] args) throws Exception {
+ int i = 0;
+ int flags = ClassReader.SKIP_DEBUG;
+
+ boolean ok = true;
+ if (args.length < 1 || args.length > 2) {
+ ok = false;
+ }
+ if (ok && "-debug".equals(args[0])) {
+ i = 1;
+ flags = 0;
+ if (args.length != 2) {
+ ok = false;
+ }
+ }
+ if (!ok) {
+ System.err.println("Prints the ASM code to generate the given class.");
+ System.err.println("Usage: ASMifier [-debug] "
+ + "<fully qualified class name or class file name>");
+ return;
+ }
+ ClassReader cr;
+ if (args[i].endsWith(".class") || args[i].indexOf('\\') > -1
+ || args[i].indexOf('/') > -1)
+ {
+ cr = new ClassReader(new FileInputStream(args[i]));
+ } else {
+ cr = new ClassReader(args[i]);
+ }
+ cr.accept(new TraceClassVisitor(null,
+ new ASMifier(),
+ new PrintWriter(System.out)), flags);
+ }
+
+ // ------------------------------------------------------------------------
+ // Classes
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ String simpleName;
+ int n = name.lastIndexOf('/');
+ if (n == -1) {
+ simpleName = name;
+ } else {
+ text.add("package asm." + name.substring(0, n).replace('/', '.')
+ + ";\n");
+ simpleName = name.substring(n + 1);
+ }
+ text.add("import java.util.*;\n");
+ text.add("import jdk.internal.org.objectweb.asm.*;\n");
+ text.add("import jdk.internal.org.objectweb.asm.attrs.*;\n");
+ text.add("public class " + simpleName + "Dump implements Opcodes {\n\n");
+ text.add("public static byte[] dump () throws Exception {\n\n");
+ text.add("ClassWriter cw = new ClassWriter(0);\n");
+ text.add("FieldVisitor fv;\n");
+ text.add("MethodVisitor mv;\n");
+ text.add("AnnotationVisitor av0;\n\n");
+
+ buf.setLength(0);
+ buf.append("cw.visit(");
+ switch (version) {
+ case Opcodes.V1_1:
+ buf.append("V1_1");
+ break;
+ case Opcodes.V1_2:
+ buf.append("V1_2");
+ break;
+ case Opcodes.V1_3:
+ buf.append("V1_3");
+ break;
+ case Opcodes.V1_4:
+ buf.append("V1_4");
+ break;
+ case Opcodes.V1_5:
+ buf.append("V1_5");
+ break;
+ case Opcodes.V1_6:
+ buf.append("V1_6");
+ break;
+ case Opcodes.V1_7:
+ buf.append("V1_7");
+ break;
+ default:
+ buf.append(version);
+ break;
+ }
+ buf.append(", ");
+ appendAccess(access | ACCESS_CLASS);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(signature);
+ buf.append(", ");
+ appendConstant(superName);
+ buf.append(", ");
+ if (interfaces != null && interfaces.length > 0) {
+ buf.append("new String[] {");
+ for (int i = 0; i < interfaces.length; ++i) {
+ buf.append(i == 0 ? " " : ", ");
+ appendConstant(interfaces[i]);
+ }
+ buf.append(" }");
+ } else {
+ buf.append("null");
+ }
+ buf.append(");\n\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitSource(final String file, final String debug) {
+ buf.setLength(0);
+ buf.append("cw.visitSource(");
+ appendConstant(file);
+ buf.append(", ");
+ appendConstant(debug);
+ buf.append(");\n\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append("cw.visitOuterClass(");
+ appendConstant(owner);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(");\n\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public ASMifier visitClassAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public void visitClassAttribute(final Attribute attr) {
+ visitAttribute(attr);
+ }
+
+ @Override
+ public void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ buf.setLength(0);
+ buf.append("cw.visitInnerClass(");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(outerName);
+ buf.append(", ");
+ appendConstant(innerName);
+ buf.append(", ");
+ appendAccess(access | ACCESS_INNER);
+ buf.append(");\n\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public ASMifier visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ buf.setLength(0);
+ buf.append("{\n");
+ buf.append("fv = cw.visitField(");
+ appendAccess(access | ACCESS_FIELD);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(", ");
+ appendConstant(signature);
+ buf.append(", ");
+ appendConstant(value);
+ buf.append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("fv", 0);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public ASMifier visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ buf.setLength(0);
+ buf.append("{\n");
+ buf.append("mv = cw.visitMethod(");
+ appendAccess(access);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(", ");
+ appendConstant(signature);
+ buf.append(", ");
+ if (exceptions != null && exceptions.length > 0) {
+ buf.append("new String[] {");
+ for (int i = 0; i < exceptions.length; ++i) {
+ buf.append(i == 0 ? " " : ", ");
+ appendConstant(exceptions[i]);
+ }
+ buf.append(" }");
+ } else {
+ buf.append("null");
+ }
+ buf.append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("mv", 0);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public void visitClassEnd() {
+ text.add("cw.visitEnd();\n\n");
+ text.add("return cw.toByteArray();\n");
+ text.add("}\n");
+ text.add("}\n");
+ }
+
+ // ------------------------------------------------------------------------
+ // Annotations
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(final String name, final Object value) {
+ buf.setLength(0);
+ buf.append("av").append(id).append(".visit(");
+ appendConstant(buf, name);
+ buf.append(", ");
+ appendConstant(buf, value);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ buf.setLength(0);
+ buf.append("av").append(id).append(".visitEnum(");
+ appendConstant(buf, name);
+ buf.append(", ");
+ appendConstant(buf, desc);
+ buf.append(", ");
+ appendConstant(buf, value);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public ASMifier visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append("{\n");
+ buf.append("AnnotationVisitor av").append(id + 1).append(" = av");
+ buf.append(id).append(".visitAnnotation(");
+ appendConstant(buf, name);
+ buf.append(", ");
+ appendConstant(buf, desc);
+ buf.append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("av", id + 1);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public ASMifier visitArray(final String name) {
+ buf.setLength(0);
+ buf.append("{\n");
+ buf.append("AnnotationVisitor av").append(id + 1).append(" = av");
+ buf.append(id).append(".visitArray(");
+ appendConstant(buf, name);
+ buf.append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("av", id + 1);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public void visitAnnotationEnd() {
+ buf.setLength(0);
+ buf.append("av").append(id).append(".visitEnd();\n");
+ text.add(buf.toString());
+ }
+
+ // ------------------------------------------------------------------------
+ // Fields
+ // ------------------------------------------------------------------------
+
+ @Override
+ public ASMifier visitFieldAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public void visitFieldAttribute(final Attribute attr) {
+ visitAttribute(attr);
+ }
+
+ @Override
+ public void visitFieldEnd() {
+ buf.setLength(0);
+ buf.append(name).append(".visitEnd();\n");
+ text.add(buf.toString());
+ }
+
+ // ------------------------------------------------------------------------
+ // Methods
+ // ------------------------------------------------------------------------
+
+ @Override
+ public ASMifier visitAnnotationDefault() {
+ buf.setLength(0);
+ buf.append("{\n")
+ .append("av0 = ")
+ .append(name)
+ .append(".visitAnnotationDefault();\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("av", 0);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public ASMifier visitMethodAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public ASMifier visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ buf.setLength(0);
+ buf.append("{\n")
+ .append("av0 = ").append(name).append(".visitParameterAnnotation(")
+ .append(parameter)
+ .append(", ");
+ appendConstant(desc);
+ buf.append(", ").append(visible).append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("av", 0);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ @Override
+ public void visitMethodAttribute(final Attribute attr) {
+ visitAttribute(attr);
+ }
+
+ @Override
+ public void visitCode() {
+ text.add(name + ".visitCode();\n");
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ buf.setLength(0);
+ switch (type) {
+ case Opcodes.F_NEW:
+ case Opcodes.F_FULL:
+ declareFrameTypes(nLocal, local);
+ declareFrameTypes(nStack, stack);
+ if (type == Opcodes.F_NEW) {
+ buf.append(name).append(".visitFrame(Opcodes.F_NEW, ");
+ } else {
+ buf.append(name).append(".visitFrame(Opcodes.F_FULL, ");
+ }
+ buf.append(nLocal).append(", new Object[] {");
+ appendFrameTypes(nLocal, local);
+ buf.append("}, ").append(nStack).append(", new Object[] {");
+ appendFrameTypes(nStack, stack);
+ buf.append('}');
+ break;
+ case Opcodes.F_APPEND:
+ declareFrameTypes(nLocal, local);
+ buf.append(name).append(".visitFrame(Opcodes.F_APPEND,")
+ .append(nLocal)
+ .append(", new Object[] {");
+ appendFrameTypes(nLocal, local);
+ buf.append("}, 0, null");
+ break;
+ case Opcodes.F_CHOP:
+ buf.append(name).append(".visitFrame(Opcodes.F_CHOP,")
+ .append(nLocal)
+ .append(", null, 0, null");
+ break;
+ case Opcodes.F_SAME:
+ buf.append(name).append(".visitFrame(Opcodes.F_SAME, 0, null, 0, null");
+ break;
+ case Opcodes.F_SAME1:
+ declareFrameTypes(1, stack);
+ buf.append(name).append(".visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {");
+ appendFrameTypes(1, stack);
+ buf.append('}');
+ break;
+ }
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ buf.setLength(0);
+ buf.append(name).append(".visitInsn(").append(OPCODES[opcode]).append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ buf.setLength(0);
+ buf.append(name)
+ .append(".visitIntInsn(")
+ .append(OPCODES[opcode])
+ .append(", ")
+ .append(opcode == Opcodes.NEWARRAY
+ ? TYPES[operand]
+ : Integer.toString(operand))
+ .append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ buf.setLength(0);
+ buf.append(name)
+ .append(".visitVarInsn(")
+ .append(OPCODES[opcode])
+ .append(", ")
+ .append(var)
+ .append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ buf.setLength(0);
+ buf.append(name).append(".visitTypeInsn(").append(OPCODES[opcode]).append(", ");
+ appendConstant(type);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append(this.name).append(".visitFieldInsn(").append(OPCODES[opcode]).append(", ");
+ appendConstant(owner);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append(this.name).append(".visitMethodInsn(").append(OPCODES[opcode]).append(", ");
+ appendConstant(owner);
+ buf.append(", ");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ buf.setLength(0);
+ buf.append(this.name).append(".visitInvokeDynamicInsn(");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(", ");
+ appendConstant(bsm);
+ buf.append(", new Object[]{");
+ for (int i = 0; i < bsmArgs.length; ++i) {
+ appendConstant(bsmArgs[i]);
+ if (i != bsmArgs.length - 1) {
+ buf.append(", ");
+ }
+ }
+ buf.append("});\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ buf.setLength(0);
+ declareLabel(label);
+ buf.append(name).append(".visitJumpInsn(").append(OPCODES[opcode]).append(", ");
+ appendLabel(label);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ buf.setLength(0);
+ declareLabel(label);
+ buf.append(name).append(".visitLabel(");
+ appendLabel(label);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ buf.setLength(0);
+ buf.append(name).append(".visitLdcInsn(");
+ appendConstant(cst);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ buf.setLength(0);
+ buf.append(name)
+ .append(".visitIincInsn(")
+ .append(var)
+ .append(", ")
+ .append(increment)
+ .append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ buf.setLength(0);
+ for (int i = 0; i < labels.length; ++i) {
+ declareLabel(labels[i]);
+ }
+ declareLabel(dflt);
+
+ buf.append(name)
+ .append(".visitTableSwitchInsn(")
+ .append(min)
+ .append(", ")
+ .append(max)
+ .append(", ");
+ appendLabel(dflt);
+ buf.append(", new Label[] {");
+ for (int i = 0; i < labels.length; ++i) {
+ buf.append(i == 0 ? " " : ", ");
+ appendLabel(labels[i]);
+ }
+ buf.append(" });\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ buf.setLength(0);
+ for (int i = 0; i < labels.length; ++i) {
+ declareLabel(labels[i]);
+ }
+ declareLabel(dflt);
+
+ buf.append(name).append(".visitLookupSwitchInsn(");
+ appendLabel(dflt);
+ buf.append(", new int[] {");
+ for (int i = 0; i < keys.length; ++i) {
+ buf.append(i == 0 ? " " : ", ").append(keys[i]);
+ }
+ buf.append(" }, new Label[] {");
+ for (int i = 0; i < labels.length; ++i) {
+ buf.append(i == 0 ? " " : ", ");
+ appendLabel(labels[i]);
+ }
+ buf.append(" });\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ buf.setLength(0);
+ buf.append(name).append(".visitMultiANewArrayInsn(");
+ appendConstant(desc);
+ buf.append(", ").append(dims).append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ buf.setLength(0);
+ declareLabel(start);
+ declareLabel(end);
+ declareLabel(handler);
+ buf.append(name).append(".visitTryCatchBlock(");
+ appendLabel(start);
+ buf.append(", ");
+ appendLabel(end);
+ buf.append(", ");
+ appendLabel(handler);
+ buf.append(", ");
+ appendConstant(type);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ buf.setLength(0);
+ buf.append(this.name).append(".visitLocalVariable(");
+ appendConstant(name);
+ buf.append(", ");
+ appendConstant(desc);
+ buf.append(", ");
+ appendConstant(signature);
+ buf.append(", ");
+ appendLabel(start);
+ buf.append(", ");
+ appendLabel(end);
+ buf.append(", ").append(index).append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ buf.setLength(0);
+ buf.append(name).append(".visitLineNumber(").append(line).append(", ");
+ appendLabel(start);
+ buf.append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ buf.setLength(0);
+ buf.append(name)
+ .append(".visitMaxs(")
+ .append(maxStack)
+ .append(", ")
+ .append(maxLocals)
+ .append(");\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMethodEnd() {
+ buf.setLength(0);
+ buf.append(name).append(".visitEnd();\n");
+ text.add(buf.toString());
+ }
+
+ // ------------------------------------------------------------------------
+ // Common methods
+ // ------------------------------------------------------------------------
+
+ public ASMifier visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ buf.setLength(0);
+ buf.append("{\n")
+ .append("av0 = ")
+ .append(name)
+ .append(".visitAnnotation(");
+ appendConstant(desc);
+ buf.append(", ").append(visible).append(");\n");
+ text.add(buf.toString());
+ ASMifier a = createASMifier("av", 0);
+ text.add(a.getText());
+ text.add("}\n");
+ return a;
+ }
+
+ public void visitAttribute(final Attribute attr) {
+ buf.setLength(0);
+ buf.append("// ATTRIBUTE ").append(attr.type).append('\n');
+ if (attr instanceof ASMifiable) {
+ if (labelNames == null) {
+ labelNames = new HashMap<Label, String>();
+ }
+ buf.append("{\n");
+ ((ASMifiable) attr).asmify(buf, "attr", labelNames);
+ buf.append(name).append(".visitAttribute(attr);\n");
+ buf.append("}\n");
+ }
+ text.add(buf.toString());
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ protected ASMifier createASMifier(final String name, final int id) {
+ return new ASMifier(Opcodes.ASM4, name, id);
+ }
+
+ /**
+ * Appends a string representation of the given access modifiers to {@link
+ * #buf buf}.
+ *
+ * @param access some access modifiers.
+ */
+ void appendAccess(final int access) {
+ boolean first = true;
+ if ((access & Opcodes.ACC_PUBLIC) != 0) {
+ buf.append("ACC_PUBLIC");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_PRIVATE) != 0) {
+ buf.append("ACC_PRIVATE");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_PROTECTED) != 0) {
+ buf.append("ACC_PROTECTED");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_FINAL) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_FINAL");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_STATIC) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_STATIC");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_SYNCHRONIZED) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ if ((access & ACCESS_CLASS) == 0) {
+ buf.append("ACC_SYNCHRONIZED");
+ } else {
+ buf.append("ACC_SUPER");
+ }
+ first = false;
+ }
+ if ((access & Opcodes.ACC_VOLATILE) != 0
+ && (access & ACCESS_FIELD) != 0)
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_VOLATILE");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_BRIDGE) != 0 && (access & ACCESS_CLASS) == 0
+ && (access & ACCESS_FIELD) == 0)
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_BRIDGE");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_VARARGS) != 0 && (access & ACCESS_CLASS) == 0
+ && (access & ACCESS_FIELD) == 0)
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_VARARGS");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_TRANSIENT) != 0
+ && (access & ACCESS_FIELD) != 0)
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_TRANSIENT");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_NATIVE) != 0 && (access & ACCESS_CLASS) == 0
+ && (access & ACCESS_FIELD) == 0)
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_NATIVE");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_ENUM) != 0
+ && ((access & ACCESS_CLASS) != 0
+ || (access & ACCESS_FIELD) != 0 || (access & ACCESS_INNER) != 0))
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_ENUM");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_ANNOTATION) != 0
+ && ((access & ACCESS_CLASS) != 0 || (access & ACCESS_INNER) != 0))
+ {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_ANNOTATION");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_ABSTRACT");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_INTERFACE) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_INTERFACE");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_STRICT) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_STRICT");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_SYNTHETIC");
+ first = false;
+ }
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ if (!first) {
+ buf.append(" + ");
+ }
+ buf.append("ACC_DEPRECATED");
+ first = false;
+ }
+ if (first) {
+ buf.append('0');
+ }
+ }
+
+ /**
+ * Appends a string representation of the given constant to the given
+ * buffer.
+ *
+ * @param cst an {@link Integer}, {@link Float}, {@link Long},
+ * {@link Double} or {@link String} object. May be <tt>null</tt>.
+ */
+ protected void appendConstant(final Object cst) {
+ appendConstant(buf, cst);
+ }
+
+ /**
+ * Appends a string representation of the given constant to the given
+ * buffer.
+ *
+ * @param buf a string buffer.
+ * @param cst an {@link Integer}, {@link Float}, {@link Long},
+ * {@link Double} or {@link String} object. May be <tt>null</tt>.
+ */
+ static void appendConstant(final StringBuffer buf, final Object cst) {
+ if (cst == null) {
+ buf.append("null");
+ } else if (cst instanceof String) {
+ appendString(buf, (String) cst);
+ } else if (cst instanceof Type) {
+ buf.append("Type.getType(\"");
+ buf.append(((Type) cst).getDescriptor());
+ buf.append("\")");
+ } else if (cst instanceof Handle) {
+ buf.append("new Handle(");
+ Handle h = (Handle) cst;
+ buf.append("Opcodes.").append(HANDLE_TAG[h.getTag()]).append(", \"");
+ buf.append(h.getOwner()).append("\", \"");
+ buf.append(h.getName()).append("\", \"");
+ buf.append(h.getDesc()).append("\")");
+ } else if (cst instanceof Byte) {
+ buf.append("new Byte((byte)").append(cst).append(')');
+ } else if (cst instanceof Boolean) {
+ buf.append(((Boolean) cst).booleanValue() ? "Boolean.TRUE" : "Boolean.FALSE");
+ } else if (cst instanceof Short) {
+ buf.append("new Short((short)").append(cst).append(')');
+ } else if (cst instanceof Character) {
+ int c = ((Character) cst).charValue();
+ buf.append("new Character((char)").append(c).append(')');
+ } else if (cst instanceof Integer) {
+ buf.append("new Integer(").append(cst).append(')');
+ } else if (cst instanceof Float) {
+ buf.append("new Float(\"").append(cst).append("\")");
+ } else if (cst instanceof Long) {
+ buf.append("new Long(").append(cst).append("L)");
+ } else if (cst instanceof Double) {
+ buf.append("new Double(\"").append(cst).append("\")");
+ } else if (cst instanceof byte[]) {
+ byte[] v = (byte[]) cst;
+ buf.append("new byte[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]);
+ }
+ buf.append('}');
+ } else if (cst instanceof boolean[]) {
+ boolean[] v = (boolean[]) cst;
+ buf.append("new boolean[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]);
+ }
+ buf.append('}');
+ } else if (cst instanceof short[]) {
+ short[] v = (short[]) cst;
+ buf.append("new short[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append("(short)").append(v[i]);
+ }
+ buf.append('}');
+ } else if (cst instanceof char[]) {
+ char[] v = (char[]) cst;
+ buf.append("new char[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",")
+ .append("(char)")
+ .append((int) v[i]);
+ }
+ buf.append('}');
+ } else if (cst instanceof int[]) {
+ int[] v = (int[]) cst;
+ buf.append("new int[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]);
+ }
+ buf.append('}');
+ } else if (cst instanceof long[]) {
+ long[] v = (long[]) cst;
+ buf.append("new long[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]).append('L');
+ }
+ buf.append('}');
+ } else if (cst instanceof float[]) {
+ float[] v = (float[]) cst;
+ buf.append("new float[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]).append('f');
+ }
+ buf.append('}');
+ } else if (cst instanceof double[]) {
+ double[] v = (double[]) cst;
+ buf.append("new double[] {");
+ for (int i = 0; i < v.length; i++) {
+ buf.append(i == 0 ? "" : ",").append(v[i]).append('d');
+ }
+ buf.append('}');
+ }
+ }
+
+ private void declareFrameTypes(final int n, final Object[] o) {
+ for (int i = 0; i < n; ++i) {
+ if (o[i] instanceof Label) {
+ declareLabel((Label) o[i]);
+ }
+ }
+ }
+
+ private void appendFrameTypes(final int n, final Object[] o) {
+ for (int i = 0; i < n; ++i) {
+ if (i > 0) {
+ buf.append(", ");
+ }
+ if (o[i] instanceof String) {
+ appendConstant(o[i]);
+ } else if (o[i] instanceof Integer) {
+ switch (((Integer) o[i]).intValue()) {
+ case 0:
+ buf.append("Opcodes.TOP");
+ break;
+ case 1:
+ buf.append("Opcodes.INTEGER");
+ break;
+ case 2:
+ buf.append("Opcodes.FLOAT");
+ break;
+ case 3:
+ buf.append("Opcodes.DOUBLE");
+ break;
+ case 4:
+ buf.append("Opcodes.LONG");
+ break;
+ case 5:
+ buf.append("Opcodes.NULL");
+ break;
+ case 6:
+ buf.append("Opcodes.UNINITIALIZED_THIS");
+ break;
+ }
+ } else {
+ appendLabel((Label) o[i]);
+ }
+ }
+ }
+
+ /**
+ * Appends a declaration of the given label to {@link #buf buf}. This
+ * declaration is of the form "Label lXXX = new Label();". Does nothing if
+ * the given label has already been declared.
+ *
+ * @param l a label.
+ */
+ protected void declareLabel(final Label l) {
+ if (labelNames == null) {
+ labelNames = new HashMap<Label, String>();
+ }
+ String name = labelNames.get(l);
+ if (name == null) {
+ name = "l" + labelNames.size();
+ labelNames.put(l, name);
+ buf.append("Label ").append(name).append(" = new Label();\n");
+ }
+ }
+
+ /**
+ * Appends the name of the given label to {@link #buf buf}. The given label
+ * <i>must</i> already have a name. One way to ensure this is to always
+ * call {@link #declareLabel declared} before calling this method.
+ *
+ * @param l a label.
+ */
+ protected void appendLabel(final Label l) {
+ buf.append(labelNames.get(l));
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
new file mode 100644
index 0000000..eacb35d
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
@@ -0,0 +1,171 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * An {@link AnnotationVisitor} that checks that its methods are properly used.
+ *
+ * @author Eric Bruneton
+ */
+public class CheckAnnotationAdapter extends AnnotationVisitor {
+
+ private final boolean named;
+
+ private boolean end;
+
+ public CheckAnnotationAdapter(final AnnotationVisitor av) {
+ this(av, true);
+ }
+
+ CheckAnnotationAdapter(final AnnotationVisitor av, final boolean named) {
+ super(Opcodes.ASM4, av);
+ this.named = named;
+ }
+
+ @Override
+ public void visit(final String name, final Object value) {
+ checkEnd();
+ checkName(name);
+ if (!(value instanceof Byte || value instanceof Boolean
+ || value instanceof Character || value instanceof Short
+ || value instanceof Integer || value instanceof Long
+ || value instanceof Float || value instanceof Double
+ || value instanceof String || value instanceof Type
+ || value instanceof byte[] || value instanceof boolean[]
+ || value instanceof char[] || value instanceof short[]
+ || value instanceof int[] || value instanceof long[]
+ || value instanceof float[] || value instanceof double[]))
+ {
+ throw new IllegalArgumentException("Invalid annotation value");
+ }
+ if (value instanceof Type) {
+ int sort = ((Type) value).getSort();
+ if (sort != Type.OBJECT && sort != Type.ARRAY) {
+ throw new IllegalArgumentException("Invalid annotation value");
+ }
+ }
+ if (av != null) {
+ av.visit(name, value);
+ }
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ checkEnd();
+ checkName(name);
+ CheckMethodAdapter.checkDesc(desc, false);
+ if (value == null) {
+ throw new IllegalArgumentException("Invalid enum value");
+ }
+ if (av != null) {
+ av.visitEnum(name, desc, value);
+ }
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ checkEnd();
+ checkName(name);
+ CheckMethodAdapter.checkDesc(desc, false);
+ return new CheckAnnotationAdapter(av == null
+ ? null
+ : av.visitAnnotation(name, desc));
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(final String name) {
+ checkEnd();
+ checkName(name);
+ return new CheckAnnotationAdapter(av == null
+ ? null
+ : av.visitArray(name), false);
+ }
+
+ @Override
+ public void visitEnd() {
+ checkEnd();
+ end = true;
+ if (av != null) {
+ av.visitEnd();
+ }
+ }
+
+ private void checkEnd() {
+ if (end) {
+ throw new IllegalStateException("Cannot call a visit method after visitEnd has been called");
+ }
+ }
+
+ private void checkName(final String name) {
+ if (named && name == null) {
+ throw new IllegalArgumentException("Annotation value name must not be null");
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
new file mode 100644
index 0000000..59fb514
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
@@ -0,0 +1,632 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.ClassNode;
+import jdk.internal.org.objectweb.asm.tree.MethodNode;
+import jdk.internal.org.objectweb.asm.tree.analysis.Analyzer;
+import jdk.internal.org.objectweb.asm.tree.analysis.BasicValue;
+import jdk.internal.org.objectweb.asm.tree.analysis.Frame;
+import jdk.internal.org.objectweb.asm.tree.analysis.SimpleVerifier;
+
+/**
+ * A {@link ClassVisitor} that checks that its methods are properly used. More
+ * precisely this class adapter checks each method call individually, based
+ * <i>only</i> on its arguments, but does <i>not</i> check the <i>sequence</i>
+ * of method calls. For example, the invalid sequence
+ * <tt>visitField(ACC_PUBLIC, "i", "I", null)</tt> <tt>visitField(ACC_PUBLIC,
+ * "i", "D", null)</tt>
+ * will <i>not</i> be detected by this class adapter.
+ *
+ * <p><code>CheckClassAdapter</code> can be also used to verify bytecode
+ * transformations in order to make sure transformed bytecode is sane. For
+ * example:
+ *
+ * <pre>
+ * InputStream is = ...; // get bytes for the source class
+ * ClassReader cr = new ClassReader(is);
+ * ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS);
+ * ClassVisitor cv = new <b>MyClassAdapter</b>(new CheckClassAdapter(cw));
+ * cr.accept(cv, 0);
+ *
+ * StringWriter sw = new StringWriter();
+ * PrintWriter pw = new PrintWriter(sw);
+ * CheckClassAdapter.verify(new ClassReader(cw.toByteArray()), false, pw);
+ * assertTrue(sw.toString(), sw.toString().length()==0);
+ * </pre>
+ *
+ * Above code runs transformed bytecode trough the
+ * <code>CheckClassAdapter</code>. It won't be exactly the same verification
+ * as JVM does, but it run data flow analysis for the code of each method and
+ * checks that expectations are met for each method instruction.
+ *
+ * <p>If method bytecode has errors, assertion text will show the erroneous
+ * instruction number and dump of the failed method with information about
+ * locals and stack slot for each instruction. For example (format is -
+ * insnNumber locals : stack):
+ *
+ * <pre>
+ * jdk.internal.org.objectweb.asm.tree.analysis.AnalyzerException: Error at instruction 71: Expected I, but found .
+ * at jdk.internal.org.objectweb.asm.tree.analysis.Analyzer.analyze(Analyzer.java:289)
+ * at jdk.internal.org.objectweb.asm.util.CheckClassAdapter.verify(CheckClassAdapter.java:135)
+ * ...
+ * remove()V
+ * 00000 LinkedBlockingQueue$Itr . . . . . . . . :
+ * ICONST_0
+ * 00001 LinkedBlockingQueue$Itr . . . . . . . . : I
+ * ISTORE 2
+ * 00001 LinkedBlockingQueue$Itr <b>.</b> I . . . . . . :
+ * ...
+ *
+ * 00071 LinkedBlockingQueue$Itr <b>.</b> I . . . . . . :
+ * ILOAD 1
+ * 00072 <b>?</b>
+ * INVOKESPECIAL java/lang/Integer.<init> (I)V
+ * ...
+ * </pre>
+ *
+ * In the above output you can see that variable 1 loaded by
+ * <code>ILOAD 1</code> instruction at position <code>00071</code> is not
+ * initialized. You can also see that at the beginning of the method (code
+ * inserted by the transformation) variable 2 is initialized.
+ *
+ * <p>Note that when used like that, <code>CheckClassAdapter.verify()</code>
+ * can trigger additional class loading, because it is using
+ * <code>SimpleVerifier</code>.
+ *
+ * @author Eric Bruneton
+ */
+public class CheckClassAdapter extends ClassVisitor {
+
+ /**
+ * The class version number.
+ */
+ private int version;
+
+ /**
+ * <tt>true</tt> if the visit method has been called.
+ */
+ private boolean start;
+
+ /**
+ * <tt>true</tt> if the visitSource method has been called.
+ */
+ private boolean source;
+
+ /**
+ * <tt>true</tt> if the visitOuterClass method has been called.
+ */
+ private boolean outer;
+
+ /**
+ * <tt>true</tt> if the visitEnd method has been called.
+ */
+ private boolean end;
+
+ /**
+ * The already visited labels. This map associate Integer values to Label
+ * keys.
+ */
+ private Map<Label, Integer> labels;
+
+ /**
+ * <tt>true</tt> if the method code must be checked with a BasicVerifier.
+ */
+ private boolean checkDataFlow;
+
+ /**
+ * Checks a given class. <p> Usage: CheckClassAdapter <binary
+ * class name or class file name>
+ *
+ * @param args the command line arguments.
+ *
+ * @throws Exception if the class cannot be found, or if an IO exception
+ * occurs.
+ */
+ public static void main(final String[] args) throws Exception {
+ if (args.length != 1) {
+ System.err.println("Verifies the given class.");
+ System.err.println("Usage: CheckClassAdapter "
+ + "<fully qualified class name or class file name>");
+ return;
+ }
+ ClassReader cr;
+ if (args[0].endsWith(".class")) {
+ cr = new ClassReader(new FileInputStream(args[0]));
+ } else {
+ cr = new ClassReader(args[0]);
+ }
+
+ verify(cr, false, new PrintWriter(System.err));
+ }
+
+ /**
+ * Checks a given class.
+ *
+ * @param cr a <code>ClassReader</code> that contains bytecode for the
+ * analysis.
+ * @param loader a <code>ClassLoader</code> which will be used to load
+ * referenced classes. This is useful if you are verifiying multiple
+ * interdependent classes.
+ * @param dump true if bytecode should be printed out not only when errors
+ * are found.
+ * @param pw write where results going to be printed
+ */
+ public static void verify(
+ final ClassReader cr,
+ final ClassLoader loader,
+ final boolean dump,
+ final PrintWriter pw)
+ {
+ ClassNode cn = new ClassNode();
+ cr.accept(new CheckClassAdapter(cn, false), ClassReader.SKIP_DEBUG);
+
+ Type syperType = cn.superName == null
+ ? null
+ : Type.getObjectType(cn.superName);
+ List<MethodNode> methods = cn.methods;
+
+ List<Type> interfaces = new ArrayList<Type>();
+ for (Iterator<String> i = cn.interfaces.iterator(); i.hasNext();) {
+ interfaces.add(Type.getObjectType(i.next().toString()));
+ }
+
+ for (int i = 0; i < methods.size(); ++i) {
+ MethodNode method = methods.get(i);
+ SimpleVerifier verifier = new SimpleVerifier(Type.getObjectType(cn.name),
+ syperType,
+ interfaces,
+ (cn.access & Opcodes.ACC_INTERFACE) != 0);
+ Analyzer<BasicValue> a = new Analyzer<BasicValue>(verifier);
+ if (loader != null) {
+ verifier.setClassLoader(loader);
+ }
+ try {
+ a.analyze(cn.name, method);
+ if (!dump) {
+ continue;
+ }
+ } catch (Exception e) {
+ e.printStackTrace(pw);
+ }
+ printAnalyzerResult(method, a, pw);
+ }
+ pw.flush();
+ }
+
+ /**
+ * Checks a given class
+ *
+ * @param cr a <code>ClassReader</code> that contains bytecode for the
+ * analysis.
+ * @param dump true if bytecode should be printed out not only when errors
+ * are found.
+ * @param pw write where results going to be printed
+ */
+ public static void verify(
+ final ClassReader cr,
+ final boolean dump,
+ final PrintWriter pw)
+ {
+ verify(cr, null, dump, pw);
+ }
+
+ static void printAnalyzerResult(
+ MethodNode method,
+ Analyzer<BasicValue> a,
+ final PrintWriter pw)
+ {
+ Frame<BasicValue>[] frames = a.getFrames();
+ Textifier t = new Textifier();
+ TraceMethodVisitor mv = new TraceMethodVisitor(t);
+
+ pw.println(method.name + method.desc);
+ for (int j = 0; j < method.instructions.size(); ++j) {
+ method.instructions.get(j).accept(mv);
+
+ StringBuffer s = new StringBuffer();
+ Frame<BasicValue> f = frames[j];
+ if (f == null) {
+ s.append('?');
+ } else {
+ for (int k = 0; k < f.getLocals(); ++k) {
+ s.append(getShortName(f.getLocal(k).toString()))
+ .append(' ');
+ }
+ s.append(" : ");
+ for (int k = 0; k < f.getStackSize(); ++k) {
+ s.append(getShortName(f.getStack(k).toString()))
+ .append(' ');
+ }
+ }
+ while (s.length() < method.maxStack + method.maxLocals + 1) {
+ s.append(' ');
+ }
+ pw.print(Integer.toString(j + 100000).substring(1));
+ pw.print(" " + s + " : " + t.text.get(t.text.size() - 1));
+ }
+ for (int j = 0; j < method.tryCatchBlocks.size(); ++j) {
+ method.tryCatchBlocks.get(j).accept(mv);
+ pw.print(" " + t.text.get(t.text.size() - 1));
+ }
+ pw.println();
+ }
+
+ private static String getShortName(final String name) {
+ int n = name.lastIndexOf('/');
+ int k = name.length();
+ if (name.charAt(k - 1) == ';') {
+ k--;
+ }
+ return n == -1 ? name : name.substring(n + 1, k);
+ }
+
+ /**
+ * Constructs a new {@link CheckClassAdapter}. <i>Subclasses must not use
+ * this constructor</i>. Instead, they must use the
+ * {@link #CheckClassAdapter(int, ClassVisitor, boolean)} version.
+ *
+ * @param cv the class visitor to which this adapter must delegate calls.
+ */
+ public CheckClassAdapter(final ClassVisitor cv) {
+ this(cv, true);
+ }
+
+ /**
+ * Constructs a new {@link CheckClassAdapter}. <i>Subclasses must not use
+ * this constructor</i>. Instead, they must use the
+ * {@link #CheckClassAdapter(int, ClassVisitor, boolean)} version.
+ *
+ * @param cv the class visitor to which this adapter must delegate calls.
+ * @param checkDataFlow <tt>true</tt> to perform basic data flow checks, or
+ * <tt>false</tt> to not perform any data flow check (see
+ * {@link CheckMethodAdapter}). This option requires valid maxLocals
+ * and maxStack values.
+ */
+ public CheckClassAdapter(final ClassVisitor cv, final boolean checkDataFlow)
+ {
+ this(Opcodes.ASM4, cv, checkDataFlow);
+ }
+
+ /**
+ * Constructs a new {@link CheckClassAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param cv the class visitor to which this adapter must delegate calls.
+ * @param checkDataFlow <tt>true</tt> to perform basic data flow checks, or
+ * <tt>false</tt> to not perform any data flow check (see
+ * {@link CheckMethodAdapter}). This option requires valid maxLocals
+ * and maxStack values.
+ */
+ protected CheckClassAdapter(
+ final int api,
+ final ClassVisitor cv,
+ final boolean checkDataFlow)
+ {
+ super(api, cv);
+ this.labels = new HashMap<Label, Integer>();
+ this.checkDataFlow = checkDataFlow;
+ }
+
+ // ------------------------------------------------------------------------
+ // Implementation of the ClassVisitor interface
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ if (start) {
+ throw new IllegalStateException("visit must be called only once");
+ }
+ start = true;
+ checkState();
+ checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL
+ + Opcodes.ACC_SUPER + Opcodes.ACC_INTERFACE
+ + Opcodes.ACC_ABSTRACT + Opcodes.ACC_SYNTHETIC
+ + Opcodes.ACC_ANNOTATION + Opcodes.ACC_ENUM
+ + Opcodes.ACC_DEPRECATED
+ + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ if (name == null || !name.endsWith("package-info")) {
+ CheckMethodAdapter.checkInternalName(name, "class name");
+ }
+ if ("java/lang/Object".equals(name)) {
+ if (superName != null) {
+ throw new IllegalArgumentException("The super class name of the Object class must be 'null'");
+ }
+ } else {
+ CheckMethodAdapter.checkInternalName(superName, "super class name");
+ }
+ if (signature != null) {
+ CheckMethodAdapter.checkClassSignature(signature);
+ }
+ if ((access & Opcodes.ACC_INTERFACE) != 0) {
+ if (!"java/lang/Object".equals(superName)) {
+ throw new IllegalArgumentException("The super class name of interfaces must be 'java/lang/Object'");
+ }
+ }
+ if (interfaces != null) {
+ for (int i = 0; i < interfaces.length; ++i) {
+ CheckMethodAdapter.checkInternalName(interfaces[i],
+ "interface name at index " + i);
+ }
+ }
+ this.version = version;
+ super.visit(version, access, name, signature, superName, interfaces);
+ }
+
+ @Override
+ public void visitSource(final String file, final String debug) {
+ checkState();
+ if (source) {
+ throw new IllegalStateException("visitSource can be called only once.");
+ }
+ source = true;
+ super.visitSource(file, debug);
+ }
+
+ @Override
+ public void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ checkState();
+ if (outer) {
+ throw new IllegalStateException("visitOuterClass can be called only once.");
+ }
+ outer = true;
+ if (owner == null) {
+ throw new IllegalArgumentException("Illegal outer class owner");
+ }
+ if (desc != null) {
+ CheckMethodAdapter.checkMethodDesc(desc);
+ }
+ super.visitOuterClass(owner, name, desc);
+ }
+
+ @Override
+ public void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ checkState();
+ CheckMethodAdapter.checkInternalName(name, "class name");
+ if (outerName != null) {
+ CheckMethodAdapter.checkInternalName(outerName, "outer class name");
+ }
+ if (innerName != null) {
+ CheckMethodAdapter.checkIdentifier(innerName, "inner class name");
+ }
+ checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+ + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+ + Opcodes.ACC_FINAL + Opcodes.ACC_INTERFACE
+ + Opcodes.ACC_ABSTRACT + Opcodes.ACC_SYNTHETIC
+ + Opcodes.ACC_ANNOTATION + Opcodes.ACC_ENUM);
+ super.visitInnerClass(name, outerName, innerName, access);
+ }
+
+ @Override
+ public FieldVisitor visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ checkState();
+ checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+ + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+ + Opcodes.ACC_FINAL + Opcodes.ACC_VOLATILE
+ + Opcodes.ACC_TRANSIENT + Opcodes.ACC_SYNTHETIC
+ + Opcodes.ACC_ENUM + Opcodes.ACC_DEPRECATED
+ + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ CheckMethodAdapter.checkUnqualifiedName(version, name, "field name");
+ CheckMethodAdapter.checkDesc(desc, false);
+ if (signature != null) {
+ CheckMethodAdapter.checkFieldSignature(signature);
+ }
+ if (value != null) {
+ CheckMethodAdapter.checkConstant(value);
+ }
+ FieldVisitor av = super.visitField(access, name, desc, signature, value);
+ return new CheckFieldAdapter(av);
+ }
+
+ @Override
+ public MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ checkState();
+ checkAccess(access, Opcodes.ACC_PUBLIC + Opcodes.ACC_PRIVATE
+ + Opcodes.ACC_PROTECTED + Opcodes.ACC_STATIC
+ + Opcodes.ACC_FINAL + Opcodes.ACC_SYNCHRONIZED
+ + Opcodes.ACC_BRIDGE + Opcodes.ACC_VARARGS + Opcodes.ACC_NATIVE
+ + Opcodes.ACC_ABSTRACT + Opcodes.ACC_STRICT
+ + Opcodes.ACC_SYNTHETIC + Opcodes.ACC_DEPRECATED
+ + 0x40000); // ClassWriter.ACC_SYNTHETIC_ATTRIBUTE
+ CheckMethodAdapter.checkMethodIdentifier(version, name, "method name");
+ CheckMethodAdapter.checkMethodDesc(desc);
+ if (signature != null) {
+ CheckMethodAdapter.checkMethodSignature(signature);
+ }
+ if (exceptions != null) {
+ for (int i = 0; i < exceptions.length; ++i) {
+ CheckMethodAdapter.checkInternalName(exceptions[i],
+ "exception name at index " + i);
+ }
+ }
+ CheckMethodAdapter cma;
+ if (checkDataFlow) {
+ cma = new CheckMethodAdapter(access,
+ name,
+ desc,
+ super.visitMethod(access, name, desc, signature, exceptions),
+ labels);
+ } else {
+ cma = new CheckMethodAdapter(super.visitMethod(access,
+ name,
+ desc,
+ signature,
+ exceptions), labels);
+ }
+ cma.version = version;
+ return cma;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ checkState();
+ CheckMethodAdapter.checkDesc(desc, false);
+ return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ checkState();
+ if (attr == null) {
+ throw new IllegalArgumentException("Invalid attribute (must not be null)");
+ }
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public void visitEnd() {
+ checkState();
+ end = true;
+ super.visitEnd();
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Checks that the visit method has been called and that visitEnd has not
+ * been called.
+ */
+ private void checkState() {
+ if (!start) {
+ throw new IllegalStateException("Cannot visit member before visit has been called.");
+ }
+ if (end) {
+ throw new IllegalStateException("Cannot visit member after visitEnd has been called.");
+ }
+ }
+
+ /**
+ * Checks that the given access flags do not contain invalid flags. This
+ * method also checks that mutually incompatible flags are not set
+ * simultaneously.
+ *
+ * @param access the access flags to be checked
+ * @param possibleAccess the valid access flags.
+ */
+ static void checkAccess(final int access, final int possibleAccess) {
+ if ((access & ~possibleAccess) != 0) {
+ throw new IllegalArgumentException("Invalid access flags: "
+ + access);
+ }
+ int pub = (access & Opcodes.ACC_PUBLIC) == 0 ? 0 : 1;
+ int pri = (access & Opcodes.ACC_PRIVATE) == 0 ? 0 : 1;
+ int pro = (access & Opcodes.ACC_PROTECTED) == 0 ? 0 : 1;
+ if (pub + pri + pro > 1) {
+ throw new IllegalArgumentException("public private and protected are mutually exclusive: "
+ + access);
+ }
+ int fin = (access & Opcodes.ACC_FINAL) == 0 ? 0 : 1;
+ int abs = (access & Opcodes.ACC_ABSTRACT) == 0 ? 0 : 1;
+ if (fin + abs > 1) {
+ throw new IllegalArgumentException("final and abstract are mutually exclusive: "
+ + access);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
new file mode 100644
index 0000000..868991e
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
@@ -0,0 +1,126 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} that checks that its methods are properly used.
+ */
+public class CheckFieldAdapter extends FieldVisitor {
+
+ private boolean end;
+
+ /**
+ * Constructs a new {@link CheckFieldAdapter}. <i>Subclasses must not use
+ * this constructor</i>. Instead, they must use the
+ * {@link #CheckFieldAdapter(int, FieldVisitor)} version.
+ *
+ * @param fv the field visitor to which this adapter must delegate calls.
+ */
+ public CheckFieldAdapter(final FieldVisitor fv) {
+ this(Opcodes.ASM4, fv);
+ }
+
+ /**
+ * Constructs a new {@link CheckFieldAdapter}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param fv the field visitor to which this adapter must delegate calls.
+ */
+ protected CheckFieldAdapter(final int api, final FieldVisitor fv) {
+ super(api, fv);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ checkEnd();
+ CheckMethodAdapter.checkDesc(desc, false);
+ return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ checkEnd();
+ if (attr == null) {
+ throw new IllegalArgumentException("Invalid attribute (must not be null)");
+ }
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public void visitEnd() {
+ checkEnd();
+ end = true;
+ super.visitEnd();
+ }
+
+ private void checkEnd() {
+ if (end) {
+ throw new IllegalStateException("Cannot call a visit method after visitEnd has been called");
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
new file mode 100644
index 0000000..51e9262
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -0,0 +1,1697 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.tree.MethodNode;
+import jdk.internal.org.objectweb.asm.tree.analysis.Analyzer;
+import jdk.internal.org.objectweb.asm.tree.analysis.BasicValue;
+import jdk.internal.org.objectweb.asm.tree.analysis.BasicVerifier;
+
+/**
+ * A {@link MethodVisitor} that checks that its methods are properly used. More
+ * precisely this method adapter checks each instruction individually, i.e.,
+ * each visit method checks some preconditions based <i>only</i> on its
+ * arguments - such as the fact that the given opcode is correct for a given
+ * visit method. This adapter can also perform some basic data flow checks (more
+ * precisely those that can be performed without the full class hierarchy - see
+ * {@link jdk.internal.org.objectweb.asm.tree.analysis.BasicVerifier}). For instance in a
+ * method whose signature is <tt>void m ()</tt>, the invalid instruction
+ * IRETURN, or the invalid sequence IADD L2I will be detected if the data flow
+ * checks are enabled. These checks are enabled by using the
+ * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)} constructor.
+ * They are not performed if any other constructor is used.
+ *
+ * @author Eric Bruneton
+ */
+public class CheckMethodAdapter extends MethodVisitor {
+
+ /**
+ * The class version number.
+ */
+ public int version;
+
+ /**
+ * <tt>true</tt> if the visitCode method has been called.
+ */
+ private boolean startCode;
+
+ /**
+ * <tt>true</tt> if the visitMaxs method has been called.
+ */
+ private boolean endCode;
+
+ /**
+ * <tt>true</tt> if the visitEnd method has been called.
+ */
+ private boolean endMethod;
+
+ /**
+ * Number of visited instructions.
+ */
+ private int insnCount;
+
+ /**
+ * The already visited labels. This map associate Integer values to pseudo
+ * code offsets.
+ */
+ private final Map<Label, Integer> labels;
+
+ /**
+ * The labels used in this method. Every used label must be visited with
+ * visitLabel before the end of the method (i.e. should be in #labels).
+ */
+ private Set<Label> usedLabels;
+
+ /**
+ * The exception handler ranges. Each pair of list element contains the
+ * start and end labels of an exception handler block.
+ */
+ private List<Label> handlers;
+
+ /**
+ * Code of the visit method to be used for each opcode.
+ */
+ private static final int[] TYPE;
+
+ /**
+ * The Label.status field.
+ */
+ private static Field labelStatusField;
+
+ static {
+ String s = "BBBBBBBBBBBBBBBBCCIAADDDDDAAAAAAAAAAAAAAAAAAAABBBBBBBBDD"
+ + "DDDAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
+ + "BBBBBBBBBBBBBBBBBBBJBBBBBBBBBBBBBBBBBBBBHHHHHHHHHHHHHHHHD"
+ + "KLBBBBBBFFFFGGGGAECEBBEEBBAMHHAA";
+ TYPE = new int[s.length()];
+ for (int i = 0; i < TYPE.length; ++i) {
+ TYPE[i] = s.charAt(i) - 'A' - 1;
+ }
+ }
+
+ // code to generate the above string
+ // public static void main (String[] args) {
+ // int[] TYPE = new int[] {
+ // 0, //NOP
+ // 0, //ACONST_NULL
+ // 0, //ICONST_M1
+ // 0, //ICONST_0
+ // 0, //ICONST_1
+ // 0, //ICONST_2
+ // 0, //ICONST_3
+ // 0, //ICONST_4
+ // 0, //ICONST_5
+ // 0, //LCONST_0
+ // 0, //LCONST_1
+ // 0, //FCONST_0
+ // 0, //FCONST_1
+ // 0, //FCONST_2
+ // 0, //DCONST_0
+ // 0, //DCONST_1
+ // 1, //BIPUSH
+ // 1, //SIPUSH
+ // 7, //LDC
+ // -1, //LDC_W
+ // -1, //LDC2_W
+ // 2, //ILOAD
+ // 2, //LLOAD
+ // 2, //FLOAD
+ // 2, //DLOAD
+ // 2, //ALOAD
+ // -1, //ILOAD_0
+ // -1, //ILOAD_1
+ // -1, //ILOAD_2
+ // -1, //ILOAD_3
+ // -1, //LLOAD_0
+ // -1, //LLOAD_1
+ // -1, //LLOAD_2
+ // -1, //LLOAD_3
+ // -1, //FLOAD_0
+ // -1, //FLOAD_1
+ // -1, //FLOAD_2
+ // -1, //FLOAD_3
+ // -1, //DLOAD_0
+ // -1, //DLOAD_1
+ // -1, //DLOAD_2
+ // -1, //DLOAD_3
+ // -1, //ALOAD_0
+ // -1, //ALOAD_1
+ // -1, //ALOAD_2
+ // -1, //ALOAD_3
+ // 0, //IALOAD
+ // 0, //LALOAD
+ // 0, //FALOAD
+ // 0, //DALOAD
+ // 0, //AALOAD
+ // 0, //BALOAD
+ // 0, //CALOAD
+ // 0, //SALOAD
+ // 2, //ISTORE
+ // 2, //LSTORE
+ // 2, //FSTORE
+ // 2, //DSTORE
+ // 2, //ASTORE
+ // -1, //ISTORE_0
+ // -1, //ISTORE_1
+ // -1, //ISTORE_2
+ // -1, //ISTORE_3
+ // -1, //LSTORE_0
+ // -1, //LSTORE_1
+ // -1, //LSTORE_2
+ // -1, //LSTORE_3
+ // -1, //FSTORE_0
+ // -1, //FSTORE_1
+ // -1, //FSTORE_2
+ // -1, //FSTORE_3
+ // -1, //DSTORE_0
+ // -1, //DSTORE_1
+ // -1, //DSTORE_2
+ // -1, //DSTORE_3
+ // -1, //ASTORE_0
+ // -1, //ASTORE_1
+ // -1, //ASTORE_2
+ // -1, //ASTORE_3
+ // 0, //IASTORE
+ // 0, //LASTORE
+ // 0, //FASTORE
+ // 0, //DASTORE
+ // 0, //AASTORE
+ // 0, //BASTORE
+ // 0, //CASTORE
+ // 0, //SASTORE
+ // 0, //POP
+ // 0, //POP2
+ // 0, //DUP
+ // 0, //DUP_X1
+ // 0, //DUP_X2
+ // 0, //DUP2
+ // 0, //DUP2_X1
+ // 0, //DUP2_X2
+ // 0, //SWAP
+ // 0, //IADD
+ // 0, //LADD
+ // 0, //FADD
+ // 0, //DADD
+ // 0, //ISUB
+ // 0, //LSUB
+ // 0, //FSUB
+ // 0, //DSUB
+ // 0, //IMUL
+ // 0, //LMUL
+ // 0, //FMUL
+ // 0, //DMUL
+ // 0, //IDIV
+ // 0, //LDIV
+ // 0, //FDIV
+ // 0, //DDIV
+ // 0, //IREM
+ // 0, //LREM
+ // 0, //FREM
+ // 0, //DREM
+ // 0, //INEG
+ // 0, //LNEG
+ // 0, //FNEG
+ // 0, //DNEG
+ // 0, //ISHL
+ // 0, //LSHL
+ // 0, //ISHR
+ // 0, //LSHR
+ // 0, //IUSHR
+ // 0, //LUSHR
+ // 0, //IAND
+ // 0, //LAND
+ // 0, //IOR
+ // 0, //LOR
+ // 0, //IXOR
+ // 0, //LXOR
+ // 8, //IINC
+ // 0, //I2L
+ // 0, //I2F
+ // 0, //I2D
+ // 0, //L2I
+ // 0, //L2F
+ // 0, //L2D
+ // 0, //F2I
+ // 0, //F2L
+ // 0, //F2D
+ // 0, //D2I
+ // 0, //D2L
+ // 0, //D2F
+ // 0, //I2B
+ // 0, //I2C
+ // 0, //I2S
+ // 0, //LCMP
+ // 0, //FCMPL
+ // 0, //FCMPG
+ // 0, //DCMPL
+ // 0, //DCMPG
+ // 6, //IFEQ
+ // 6, //IFNE
+ // 6, //IFLT
+ // 6, //IFGE
+ // 6, //IFGT
+ // 6, //IFLE
+ // 6, //IF_ICMPEQ
+ // 6, //IF_ICMPNE
+ // 6, //IF_ICMPLT
+ // 6, //IF_ICMPGE
+ // 6, //IF_ICMPGT
+ // 6, //IF_ICMPLE
+ // 6, //IF_ACMPEQ
+ // 6, //IF_ACMPNE
+ // 6, //GOTO
+ // 6, //JSR
+ // 2, //RET
+ // 9, //TABLESWITCH
+ // 10, //LOOKUPSWITCH
+ // 0, //IRETURN
+ // 0, //LRETURN
+ // 0, //FRETURN
+ // 0, //DRETURN
+ // 0, //ARETURN
+ // 0, //RETURN
+ // 4, //GETSTATIC
+ // 4, //PUTSTATIC
+ // 4, //GETFIELD
+ // 4, //PUTFIELD
+ // 5, //INVOKEVIRTUAL
+ // 5, //INVOKESPECIAL
+ // 5, //INVOKESTATIC
+ // 5, //INVOKEINTERFACE
+ // -1, //INVOKEDYNAMIC
+ // 3, //NEW
+ // 1, //NEWARRAY
+ // 3, //ANEWARRAY
+ // 0, //ARRAYLENGTH
+ // 0, //ATHROW
+ // 3, //CHECKCAST
+ // 3, //INSTANCEOF
+ // 0, //MONITORENTER
+ // 0, //MONITOREXIT
+ // -1, //WIDE
+ // 11, //MULTIANEWARRAY
+ // 6, //IFNULL
+ // 6, //IFNONNULL
+ // -1, //GOTO_W
+ // -1 //JSR_W
+ // };
+ // for (int i = 0; i < TYPE.length; ++i) {
+ // System.out.print((char)(TYPE[i] + 1 + 'A'));
+ // }
+ // System.out.println();
+ // }
+
+ /**
+ * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+ * will not perform any data flow check (see
+ * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+ * <i>Subclasses must not use this constructor</i>. Instead, they must use
+ * the {@link #CheckMethodAdapter(int, MethodVisitor, Map)} version.
+ *
+ * @param mv the method visitor to which this adapter must delegate calls.
+ */
+ public CheckMethodAdapter(final MethodVisitor mv) {
+ this(mv, new HashMap<Label, Integer>());
+ }
+
+ /**
+ * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+ * will not perform any data flow check (see
+ * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+ * <i>Subclasses must not use this constructor</i>. Instead, they must use
+ * the {@link #CheckMethodAdapter(int, MethodVisitor, Map)} version.
+ *
+ * @param mv the method visitor to which this adapter must delegate calls.
+ * @param labels a map of already visited labels (in other methods).
+ */
+ public CheckMethodAdapter(
+ final MethodVisitor mv,
+ final Map<Label, Integer> labels)
+ {
+ this(Opcodes.ASM4, mv, labels);
+ }
+
+ /**
+ * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+ * will not perform any data flow check (see
+ * {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
+ *
+ * @param mv the method visitor to which this adapter must delegate calls.
+ * @param labels a map of already visited labels (in other methods).
+ */
+ protected CheckMethodAdapter(
+ final int api,
+ final MethodVisitor mv,
+ final Map<Label, Integer> labels)
+ {
+ super(api, mv);
+ this.labels = labels;
+ this.usedLabels = new HashSet<Label>();
+ this.handlers = new ArrayList<Label>();
+ }
+
+ /**
+ * Constructs a new {@link CheckMethodAdapter} object. This method adapter
+ * will perform basic data flow checks. For instance in a method whose
+ * signature is <tt>void m ()</tt>, the invalid instruction IRETURN, or the
+ * invalid sequence IADD L2I will be detected.
+ *
+ * @param access the method's access flags.
+ * @param name the method's name.
+ * @param desc the method's descriptor (see {@link Type Type}).
+ * @param cmv the method visitor to which this adapter must delegate calls.
+ * @param labels a map of already visited labels (in other methods).
+ */
+ public CheckMethodAdapter(
+ final int access,
+ final String name,
+ final String desc,
+ final MethodVisitor cmv,
+ final Map<Label, Integer> labels)
+ {
+ this(new MethodNode(access, name, desc, null, null) {
+ @Override
+ public void visitEnd() {
+ Analyzer<BasicValue> a = new Analyzer<BasicValue>(new BasicVerifier());
+ try {
+ a.analyze("dummy", this);
+ } catch (Exception e) {
+ if (e instanceof IndexOutOfBoundsException
+ && maxLocals == 0 && maxStack == 0)
+ {
+ throw new RuntimeException("Data flow checking option requires valid, non zero maxLocals and maxStack values.");
+ }
+ e.printStackTrace();
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw, true);
+ CheckClassAdapter.printAnalyzerResult(this, a, pw);
+ pw.close();
+ throw new RuntimeException(e.getMessage() + ' '
+ + sw.toString());
+ }
+ accept(cmv);
+ }
+ },
+ labels);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ checkEndMethod();
+ checkDesc(desc, false);
+ return new CheckAnnotationAdapter(super.visitAnnotation(desc, visible));
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotationDefault() {
+ checkEndMethod();
+ return new CheckAnnotationAdapter(super.visitAnnotationDefault(), false);
+ }
+
+ @Override
+ public AnnotationVisitor visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ checkEndMethod();
+ checkDesc(desc, false);
+ return new CheckAnnotationAdapter(super.visitParameterAnnotation(parameter,
+ desc,
+ visible));
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ checkEndMethod();
+ if (attr == null) {
+ throw new IllegalArgumentException("Invalid attribute (must not be null)");
+ }
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public void visitCode() {
+ startCode = true;
+ super.visitCode();
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ int mLocal;
+ int mStack;
+ switch (type) {
+ case Opcodes.F_NEW:
+ case Opcodes.F_FULL:
+ mLocal = Integer.MAX_VALUE;
+ mStack = Integer.MAX_VALUE;
+ break;
+
+ case Opcodes.F_SAME:
+ mLocal = 0;
+ mStack = 0;
+ break;
+
+ case Opcodes.F_SAME1:
+ mLocal = 0;
+ mStack = 1;
+ break;
+
+ case Opcodes.F_APPEND:
+ case Opcodes.F_CHOP:
+ mLocal = 3;
+ mStack = 0;
+ break;
+
+ default:
+ throw new IllegalArgumentException("Invalid frame type " + type);
+ }
+
+ if (nLocal > mLocal) {
+ throw new IllegalArgumentException("Invalid nLocal=" + nLocal
+ + " for frame type " + type);
+ }
+ if (nStack > mStack) {
+ throw new IllegalArgumentException("Invalid nStack=" + nStack
+ + " for frame type " + type);
+ }
+
+ if (type != Opcodes.F_CHOP) {
+ if (nLocal > 0 && (local == null || local.length < nLocal)) {
+ throw new IllegalArgumentException("Array local[] is shorter than nLocal");
+ }
+ for (int i = 0; i < nLocal; ++i) {
+ checkFrameValue(local[i]);
+ }
+ }
+ if (nStack > 0 && (stack == null || stack.length < nStack)) {
+ throw new IllegalArgumentException("Array stack[] is shorter than nStack");
+ }
+ for (int i = 0; i < nStack; ++i) {
+ checkFrameValue(stack[i]);
+ }
+
+ super.visitFrame(type, nLocal, local, nStack, stack);
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 0);
+ super.visitInsn(opcode);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 1);
+ switch (opcode) {
+ case Opcodes.BIPUSH:
+ checkSignedByte(operand, "Invalid operand");
+ break;
+ case Opcodes.SIPUSH:
+ checkSignedShort(operand, "Invalid operand");
+ break;
+ // case Constants.NEWARRAY:
+ default:
+ if (operand < Opcodes.T_BOOLEAN || operand > Opcodes.T_LONG) {
+ throw new IllegalArgumentException("Invalid operand (must be an array type code T_...): "
+ + operand);
+ }
+ }
+ super.visitIntInsn(opcode, operand);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 2);
+ checkUnsignedShort(var, "Invalid variable index");
+ super.visitVarInsn(opcode, var);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 3);
+ checkInternalName(type, "type");
+ if (opcode == Opcodes.NEW && type.charAt(0) == '[') {
+ throw new IllegalArgumentException("NEW cannot be used to create arrays: "
+ + type);
+ }
+ super.visitTypeInsn(opcode, type);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 4);
+ checkInternalName(owner, "owner");
+ checkUnqualifiedName(version, name, "name");
+ checkDesc(desc, false);
+ super.visitFieldInsn(opcode, owner, name, desc);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 5);
+ checkMethodIdentifier(version, name, "name");
+ checkInternalName(owner, "owner");
+ checkMethodDesc(desc);
+ super.visitMethodInsn(opcode, owner, name, desc);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ checkStartCode();
+ checkEndCode();
+ checkMethodIdentifier(version, name, "name");
+ checkMethodDesc(desc);
+ if (bsm.getTag() != Opcodes.H_INVOKESTATIC
+ && bsm.getTag() != Opcodes.H_NEWINVOKESPECIAL)
+ {
+ throw new IllegalArgumentException("invalid handle tag "
+ + bsm.getTag());
+ }
+ for (int i = 0; i < bsmArgs.length; i++) {
+ checkLDCConstant(bsmArgs[i]);
+ }
+ super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ checkStartCode();
+ checkEndCode();
+ checkOpcode(opcode, 6);
+ checkLabel(label, false, "label");
+ checkNonDebugLabel(label);
+ super.visitJumpInsn(opcode, label);
+ usedLabels.add(label);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ checkStartCode();
+ checkEndCode();
+ checkLabel(label, false, "label");
+ if (labels.get(label) != null) {
+ throw new IllegalArgumentException("Already visited label");
+ }
+ labels.put(label, new Integer(insnCount));
+ super.visitLabel(label);
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ checkStartCode();
+ checkEndCode();
+ checkLDCConstant(cst);
+ super.visitLdcInsn(cst);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ checkStartCode();
+ checkEndCode();
+ checkUnsignedShort(var, "Invalid variable index");
+ checkSignedShort(increment, "Invalid increment");
+ super.visitIincInsn(var, increment);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ checkStartCode();
+ checkEndCode();
+ if (max < min) {
+ throw new IllegalArgumentException("Max = " + max
+ + " must be greater than or equal to min = " + min);
+ }
+ checkLabel(dflt, false, "default label");
+ checkNonDebugLabel(dflt);
+ if (labels == null || labels.length != max - min + 1) {
+ throw new IllegalArgumentException("There must be max - min + 1 labels");
+ }
+ for (int i = 0; i < labels.length; ++i) {
+ checkLabel(labels[i], false, "label at index " + i);
+ checkNonDebugLabel(labels[i]);
+ }
+ super.visitTableSwitchInsn(min, max, dflt, labels);
+ for (int i = 0; i < labels.length; ++i) {
+ usedLabels.add(labels[i]);
+ }
+ ++insnCount;
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ checkEndCode();
+ checkStartCode();
+ checkLabel(dflt, false, "default label");
+ checkNonDebugLabel(dflt);
+ if (keys == null || labels == null || keys.length != labels.length) {
+ throw new IllegalArgumentException("There must be the same number of keys and labels");
+ }
+ for (int i = 0; i < labels.length; ++i) {
+ checkLabel(labels[i], false, "label at index " + i);
+ checkNonDebugLabel(labels[i]);
+ }
+ super.visitLookupSwitchInsn(dflt, keys, labels);
+ usedLabels.add(dflt);
+ for (int i = 0; i < labels.length; ++i) {
+ usedLabels.add(labels[i]);
+ }
+ ++insnCount;
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ checkStartCode();
+ checkEndCode();
+ checkDesc(desc, false);
+ if (desc.charAt(0) != '[') {
+ throw new IllegalArgumentException("Invalid descriptor (must be an array type descriptor): "
+ + desc);
+ }
+ if (dims < 1) {
+ throw new IllegalArgumentException("Invalid dimensions (must be greater than 0): "
+ + dims);
+ }
+ if (dims > desc.lastIndexOf('[') + 1) {
+ throw new IllegalArgumentException("Invalid dimensions (must not be greater than dims(desc)): "
+ + dims);
+ }
+ super.visitMultiANewArrayInsn(desc, dims);
+ ++insnCount;
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ checkStartCode();
+ checkEndCode();
+ checkLabel(start, false, "start label");
+ checkLabel(end, false, "end label");
+ checkLabel(handler, false, "handler label");
+ checkNonDebugLabel(start);
+ checkNonDebugLabel(end);
+ checkNonDebugLabel(handler);
+ if (labels.get(start) != null || labels.get(end) != null
+ || labels.get(handler) != null)
+ {
+ throw new IllegalStateException("Try catch blocks must be visited before their labels");
+ }
+ if (type != null) {
+ checkInternalName(type, "type");
+ }
+ super.visitTryCatchBlock(start, end, handler, type);
+ handlers.add(start);
+ handlers.add(end);
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ checkStartCode();
+ checkEndCode();
+ checkUnqualifiedName(version, name, "name");
+ checkDesc(desc, false);
+ checkLabel(start, true, "start label");
+ checkLabel(end, true, "end label");
+ checkUnsignedShort(index, "Invalid variable index");
+ int s = labels.get(start).intValue();
+ int e = labels.get(end).intValue();
+ if (e < s) {
+ throw new IllegalArgumentException("Invalid start and end labels (end must be greater than start)");
+ }
+ super.visitLocalVariable(name, desc, signature, start, end, index);
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ checkStartCode();
+ checkEndCode();
+ checkUnsignedShort(line, "Invalid line number");
+ checkLabel(start, true, "start label");
+ super.visitLineNumber(line, start);
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ checkStartCode();
+ checkEndCode();
+ endCode = true;
+ for (Label l : usedLabels) {
+ if (labels.get(l) == null) {
+ throw new IllegalStateException("Undefined label used");
+ }
+ }
+ for (int i = 0; i < handlers.size(); ) {
+ Integer start = labels.get(handlers.get(i++));
+ Integer end = labels.get(handlers.get(i++));
+ if (start == null || end == null) {
+ throw new IllegalStateException("Undefined try catch block labels");
+ }
+ if (end.intValue() <= start.intValue()) {
+ throw new IllegalStateException("Emty try catch block handler range");
+ }
+ }
+ checkUnsignedShort(maxStack, "Invalid max stack");
+ checkUnsignedShort(maxLocals, "Invalid max locals");
+ super.visitMaxs(maxStack, maxLocals);
+ }
+
+ @Override
+ public void visitEnd() {
+ checkEndMethod();
+ endMethod = true;
+ super.visitEnd();
+ }
+
+ // -------------------------------------------------------------------------
+
+ /**
+ * Checks that the visitCode method has been called.
+ */
+ void checkStartCode() {
+ if (!startCode) {
+ throw new IllegalStateException("Cannot visit instructions before visitCode has been called.");
+ }
+ }
+
+ /**
+ * Checks that the visitMaxs method has not been called.
+ */
+ void checkEndCode() {
+ if (endCode) {
+ throw new IllegalStateException("Cannot visit instructions after visitMaxs has been called.");
+ }
+ }
+
+ /**
+ * Checks that the visitEnd method has not been called.
+ */
+ void checkEndMethod() {
+ if (endMethod) {
+ throw new IllegalStateException("Cannot visit elements after visitEnd has been called.");
+ }
+ }
+
+ /**
+ * Checks a stack frame value.
+ *
+ * @param value the value to be checked.
+ */
+ void checkFrameValue(final Object value) {
+ if (value == Opcodes.TOP || value == Opcodes.INTEGER
+ || value == Opcodes.FLOAT || value == Opcodes.LONG
+ || value == Opcodes.DOUBLE || value == Opcodes.NULL
+ || value == Opcodes.UNINITIALIZED_THIS)
+ {
+ return;
+ }
+ if (value instanceof String) {
+ checkInternalName((String) value, "Invalid stack frame value");
+ return;
+ }
+ if (!(value instanceof Label)) {
+ throw new IllegalArgumentException("Invalid stack frame value: "
+ + value);
+ } else {
+ usedLabels.add((Label) value);
+ }
+ }
+
+ /**
+ * Checks that the type of the given opcode is equal to the given type.
+ *
+ * @param opcode the opcode to be checked.
+ * @param type the expected opcode type.
+ */
+ static void checkOpcode(final int opcode, final int type) {
+ if (opcode < 0 || opcode > 199 || TYPE[opcode] != type) {
+ throw new IllegalArgumentException("Invalid opcode: " + opcode);
+ }
+ }
+
+ /**
+ * Checks that the given value is a signed byte.
+ *
+ * @param value the value to be checked.
+ * @param msg an message to be used in case of error.
+ */
+ static void checkSignedByte(final int value, final String msg) {
+ if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
+ throw new IllegalArgumentException(msg
+ + " (must be a signed byte): " + value);
+ }
+ }
+
+ /**
+ * Checks that the given value is a signed short.
+ *
+ * @param value the value to be checked.
+ * @param msg an message to be used in case of error.
+ */
+ static void checkSignedShort(final int value, final String msg) {
+ if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
+ throw new IllegalArgumentException(msg
+ + " (must be a signed short): " + value);
+ }
+ }
+
+ /**
+ * Checks that the given value is an unsigned short.
+ *
+ * @param value the value to be checked.
+ * @param msg an message to be used in case of error.
+ */
+ static void checkUnsignedShort(final int value, final String msg) {
+ if (value < 0 || value > 65535) {
+ throw new IllegalArgumentException(msg
+ + " (must be an unsigned short): " + value);
+ }
+ }
+
+ /**
+ * Checks that the given value is an {@link Integer}, a{@link Float}, a
+ * {@link Long}, a {@link Double} or a {@link String}.
+ *
+ * @param cst the value to be checked.
+ */
+ static void checkConstant(final Object cst) {
+ if (!(cst instanceof Integer) && !(cst instanceof Float)
+ && !(cst instanceof Long) && !(cst instanceof Double)
+ && !(cst instanceof String))
+ {
+ throw new IllegalArgumentException("Invalid constant: " + cst);
+ }
+ }
+
+ void checkLDCConstant(final Object cst) {
+ if (cst instanceof Type) {
+ int s = ((Type) cst).getSort();
+ if (s != Type.OBJECT && s != Type.ARRAY && s != Type.METHOD) {
+ throw new IllegalArgumentException("Illegal LDC constant value");
+ }
+ if (s != Type.METHOD && (version & 0xFFFF) < Opcodes.V1_5) {
+ throw new IllegalArgumentException("ldc of a constant class requires at least version 1.5");
+ }
+ if (s == Type.METHOD && (version & 0xFFFF) < Opcodes.V1_7) {
+ throw new IllegalArgumentException("ldc of a method type requires at least version 1.7");
+ }
+ } else if (cst instanceof Handle) {
+ if ((version & 0xFFFF) < Opcodes.V1_7) {
+ throw new IllegalArgumentException("ldc of a handle requires at least version 1.7");
+ }
+ int tag = ((Handle) cst).getTag();
+ if (tag < Opcodes.H_GETFIELD || tag > Opcodes.H_INVOKEINTERFACE) {
+ throw new IllegalArgumentException("invalid handle tag "
+ + tag);
+ }
+ } else {
+ checkConstant(cst);
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid unqualified name.
+ *
+ * @param version the class version.
+ * @param name the string to be checked.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkUnqualifiedName(
+ int version,
+ final String name,
+ final String msg)
+ {
+ if ((version & 0xFFFF) < Opcodes.V1_5) {
+ checkIdentifier(name, msg);
+ } else {
+ for (int i = 0; i < name.length(); ++i) {
+ if (".;[/".indexOf(name.charAt(i)) != -1) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must be a valid unqualified name): " + name);
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid Java identifier.
+ *
+ * @param name the string to be checked.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkIdentifier(final String name, final String msg) {
+ checkIdentifier(name, 0, -1, msg);
+ }
+
+ /**
+ * Checks that the given substring is a valid Java identifier.
+ *
+ * @param name the string to be checked.
+ * @param start index of the first character of the identifier (inclusive).
+ * @param end index of the last character of the identifier (exclusive). -1
+ * is equivalent to <tt>name.length()</tt> if name is not
+ * <tt>null</tt>.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkIdentifier(
+ final String name,
+ final int start,
+ final int end,
+ final String msg)
+ {
+ if (name == null || (end == -1 ? name.length() <= start : end <= start))
+ {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must not be null or empty)");
+ }
+ if (!Character.isJavaIdentifierStart(name.charAt(start))) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must be a valid Java identifier): " + name);
+ }
+ int max = end == -1 ? name.length() : end;
+ for (int i = start + 1; i < max; ++i) {
+ if (!Character.isJavaIdentifierPart(name.charAt(i))) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must be a valid Java identifier): " + name);
+ }
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid Java identifier or is equal to
+ * '<init>' or '<clinit>'.
+ *
+ * @param version the class version.
+ * @param name the string to be checked.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkMethodIdentifier(
+ int version,
+ final String name,
+ final String msg)
+ {
+ if (name == null || name.length() == 0) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must not be null or empty)");
+ }
+ if ("<init>".equals(name) || "<clinit>".equals(name)) {
+ return;
+ }
+ if ((version & 0xFFFF) >= Opcodes.V1_5) {
+ for (int i = 0; i < name.length(); ++i) {
+ if (".;[/<>".indexOf(name.charAt(i)) != -1) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must be a valid unqualified name): " + name);
+ }
+ }
+ return;
+ }
+ if (!Character.isJavaIdentifierStart(name.charAt(0))) {
+ throw new IllegalArgumentException("Invalid "
+ + msg
+ + " (must be a '<init>', '<clinit>' or a valid Java identifier): "
+ + name);
+ }
+ for (int i = 1; i < name.length(); ++i) {
+ if (!Character.isJavaIdentifierPart(name.charAt(i))) {
+ throw new IllegalArgumentException("Invalid "
+ + msg
+ + " (must be '<init>' or '<clinit>' or a valid Java identifier): "
+ + name);
+ }
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid internal class name.
+ *
+ * @param name the string to be checked.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkInternalName(final String name, final String msg) {
+ if (name == null || name.length() == 0) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must not be null or empty)");
+ }
+ if (name.charAt(0) == '[') {
+ checkDesc(name, false);
+ } else {
+ checkInternalName(name, 0, -1, msg);
+ }
+ }
+
+ /**
+ * Checks that the given substring is a valid internal class name.
+ *
+ * @param name the string to be checked.
+ * @param start index of the first character of the identifier (inclusive).
+ * @param end index of the last character of the identifier (exclusive). -1
+ * is equivalent to <tt>name.length()</tt> if name is not
+ * <tt>null</tt>.
+ * @param msg a message to be used in case of error.
+ */
+ static void checkInternalName(
+ final String name,
+ final int start,
+ final int end,
+ final String msg)
+ {
+ int max = end == -1 ? name.length() : end;
+ try {
+ int begin = start;
+ int slash;
+ do {
+ slash = name.indexOf('/', begin + 1);
+ if (slash == -1 || slash > max) {
+ slash = max;
+ }
+ checkIdentifier(name, begin, slash, null);
+ begin = slash + 1;
+ } while (slash != max);
+ } catch (IllegalArgumentException _) {
+ throw new IllegalArgumentException("Invalid "
+ + msg
+ + " (must be a fully qualified class name in internal form): "
+ + name);
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid type descriptor.
+ *
+ * @param desc the string to be checked.
+ * @param canBeVoid <tt>true</tt> if <tt>V</tt> can be considered valid.
+ */
+ static void checkDesc(final String desc, final boolean canBeVoid) {
+ int end = checkDesc(desc, 0, canBeVoid);
+ if (end != desc.length()) {
+ throw new IllegalArgumentException("Invalid descriptor: " + desc);
+ }
+ }
+
+ /**
+ * Checks that a the given substring is a valid type descriptor.
+ *
+ * @param desc the string to be checked.
+ * @param start index of the first character of the identifier (inclusive).
+ * @param canBeVoid <tt>true</tt> if <tt>V</tt> can be considered valid.
+ * @return the index of the last character of the type decriptor, plus one.
+ */
+ static int checkDesc(
+ final String desc,
+ final int start,
+ final boolean canBeVoid)
+ {
+ if (desc == null || start >= desc.length()) {
+ throw new IllegalArgumentException("Invalid type descriptor (must not be null or empty)");
+ }
+ int index;
+ switch (desc.charAt(start)) {
+ case 'V':
+ if (canBeVoid) {
+ return start + 1;
+ } else {
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ case 'F':
+ case 'J':
+ case 'D':
+ return start + 1;
+ case '[':
+ index = start + 1;
+ while (index < desc.length() && desc.charAt(index) == '[') {
+ ++index;
+ }
+ if (index < desc.length()) {
+ return checkDesc(desc, index, false);
+ } else {
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ case 'L':
+ index = desc.indexOf(';', start);
+ if (index == -1 || index - start < 2) {
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ try {
+ checkInternalName(desc, start + 1, index, null);
+ } catch (IllegalArgumentException _) {
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ return index + 1;
+ default:
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ }
+
+ /**
+ * Checks that the given string is a valid method descriptor.
+ *
+ * @param desc the string to be checked.
+ */
+ static void checkMethodDesc(final String desc) {
+ if (desc == null || desc.length() == 0) {
+ throw new IllegalArgumentException("Invalid method descriptor (must not be null or empty)");
+ }
+ if (desc.charAt(0) != '(' || desc.length() < 3) {
+ throw new IllegalArgumentException("Invalid descriptor: " + desc);
+ }
+ int start = 1;
+ if (desc.charAt(start) != ')') {
+ do {
+ if (desc.charAt(start) == 'V') {
+ throw new IllegalArgumentException("Invalid descriptor: "
+ + desc);
+ }
+ start = checkDesc(desc, start, false);
+ } while (start < desc.length() && desc.charAt(start) != ')');
+ }
+ start = checkDesc(desc, start + 1, true);
+ if (start != desc.length()) {
+ throw new IllegalArgumentException("Invalid descriptor: " + desc);
+ }
+ }
+
+ /**
+ * Checks a class signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ */
+ static void checkClassSignature(final String signature) {
+ // ClassSignature:
+ // FormalTypeParameters? ClassTypeSignature ClassTypeSignature*
+
+ int pos = 0;
+ if (getChar(signature, 0) == '<') {
+ pos = checkFormalTypeParameters(signature, pos);
+ }
+ pos = checkClassTypeSignature(signature, pos);
+ while (getChar(signature, pos) == 'L') {
+ pos = checkClassTypeSignature(signature, pos);
+ }
+ if (pos != signature.length()) {
+ throw new IllegalArgumentException(signature + ": error at index "
+ + pos);
+ }
+ }
+
+ /**
+ * Checks a method signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ */
+ static void checkMethodSignature(final String signature) {
+ // MethodTypeSignature:
+ // FormalTypeParameters? ( TypeSignature* ) ( TypeSignature | V ) (
+ // ^ClassTypeSignature | ^TypeVariableSignature )*
+
+ int pos = 0;
+ if (getChar(signature, 0) == '<') {
+ pos = checkFormalTypeParameters(signature, pos);
+ }
+ pos = checkChar('(', signature, pos);
+ while ("ZCBSIFJDL[T".indexOf(getChar(signature, pos)) != -1) {
+ pos = checkTypeSignature(signature, pos);
+ }
+ pos = checkChar(')', signature, pos);
+ if (getChar(signature, pos) == 'V') {
+ ++pos;
+ } else {
+ pos = checkTypeSignature(signature, pos);
+ }
+ while (getChar(signature, pos) == '^') {
+ ++pos;
+ if (getChar(signature, pos) == 'L') {
+ pos = checkClassTypeSignature(signature, pos);
+ } else {
+ pos = checkTypeVariableSignature(signature, pos);
+ }
+ }
+ if (pos != signature.length()) {
+ throw new IllegalArgumentException(signature + ": error at index "
+ + pos);
+ }
+ }
+
+ /**
+ * Checks a field signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ */
+ static void checkFieldSignature(final String signature) {
+ int pos = checkFieldTypeSignature(signature, 0);
+ if (pos != signature.length()) {
+ throw new IllegalArgumentException(signature + ": error at index "
+ + pos);
+ }
+ }
+
+ /**
+ * Checks the formal type parameters of a class or method signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkFormalTypeParameters(final String signature, int pos)
+ {
+ // FormalTypeParameters:
+ // < FormalTypeParameter+ >
+
+ pos = checkChar('<', signature, pos);
+ pos = checkFormalTypeParameter(signature, pos);
+ while (getChar(signature, pos) != '>') {
+ pos = checkFormalTypeParameter(signature, pos);
+ }
+ return pos + 1;
+ }
+
+ /**
+ * Checks a formal type parameter of a class or method signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkFormalTypeParameter(final String signature, int pos)
+ {
+ // FormalTypeParameter:
+ // Identifier : FieldTypeSignature? (: FieldTypeSignature)*
+
+ pos = checkIdentifier(signature, pos);
+ pos = checkChar(':', signature, pos);
+ if ("L[T".indexOf(getChar(signature, pos)) != -1) {
+ pos = checkFieldTypeSignature(signature, pos);
+ }
+ while (getChar(signature, pos) == ':') {
+ pos = checkFieldTypeSignature(signature, pos + 1);
+ }
+ return pos;
+ }
+
+ /**
+ * Checks a field type signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkFieldTypeSignature(final String signature, int pos)
+ {
+ // FieldTypeSignature:
+ // ClassTypeSignature | ArrayTypeSignature | TypeVariableSignature
+ //
+ // ArrayTypeSignature:
+ // [ TypeSignature
+
+ switch (getChar(signature, pos)) {
+ case 'L':
+ return checkClassTypeSignature(signature, pos);
+ case '[':
+ return checkTypeSignature(signature, pos + 1);
+ default:
+ return checkTypeVariableSignature(signature, pos);
+ }
+ }
+
+ /**
+ * Checks a class type signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkClassTypeSignature(final String signature, int pos)
+ {
+ // ClassTypeSignature:
+ // L Identifier ( / Identifier )* TypeArguments? ( . Identifier
+ // TypeArguments? )* ;
+
+ pos = checkChar('L', signature, pos);
+ pos = checkIdentifier(signature, pos);
+ while (getChar(signature, pos) == '/') {
+ pos = checkIdentifier(signature, pos + 1);
+ }
+ if (getChar(signature, pos) == '<') {
+ pos = checkTypeArguments(signature, pos);
+ }
+ while (getChar(signature, pos) == '.') {
+ pos = checkIdentifier(signature, pos + 1);
+ if (getChar(signature, pos) == '<') {
+ pos = checkTypeArguments(signature, pos);
+ }
+ }
+ return checkChar(';', signature, pos);
+ }
+
+ /**
+ * Checks the type arguments in a class type signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkTypeArguments(final String signature, int pos) {
+ // TypeArguments:
+ // < TypeArgument+ >
+
+ pos = checkChar('<', signature, pos);
+ pos = checkTypeArgument(signature, pos);
+ while (getChar(signature, pos) != '>') {
+ pos = checkTypeArgument(signature, pos);
+ }
+ return pos + 1;
+ }
+
+ /**
+ * Checks a type argument in a class type signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkTypeArgument(final String signature, int pos) {
+ // TypeArgument:
+ // * | ( ( + | - )? FieldTypeSignature )
+
+ char c = getChar(signature, pos);
+ if (c == '*') {
+ return pos + 1;
+ } else if (c == '+' || c == '-') {
+ pos++;
+ }
+ return checkFieldTypeSignature(signature, pos);
+ }
+
+ /**
+ * Checks a type variable signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkTypeVariableSignature(
+ final String signature,
+ int pos)
+ {
+ // TypeVariableSignature:
+ // T Identifier ;
+
+ pos = checkChar('T', signature, pos);
+ pos = checkIdentifier(signature, pos);
+ return checkChar(';', signature, pos);
+ }
+
+ /**
+ * Checks a type signature.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkTypeSignature(final String signature, int pos) {
+ // TypeSignature:
+ // Z | C | B | S | I | F | J | D | FieldTypeSignature
+
+ switch (getChar(signature, pos)) {
+ case 'Z':
+ case 'C':
+ case 'B':
+ case 'S':
+ case 'I':
+ case 'F':
+ case 'J':
+ case 'D':
+ return pos + 1;
+ default:
+ return checkFieldTypeSignature(signature, pos);
+ }
+ }
+
+ /**
+ * Checks an identifier.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkIdentifier(final String signature, int pos) {
+ if (!Character.isJavaIdentifierStart(getChar(signature, pos))) {
+ throw new IllegalArgumentException(signature
+ + ": identifier expected at index " + pos);
+ }
+ ++pos;
+ while (Character.isJavaIdentifierPart(getChar(signature, pos))) {
+ ++pos;
+ }
+ return pos;
+ }
+
+ /**
+ * Checks a single character.
+ *
+ * @param signature a string containing the signature that must be checked.
+ * @param pos index of first character to be checked.
+ * @return the index of the first character after the checked part.
+ */
+ private static int checkChar(final char c, final String signature, int pos)
+ {
+ if (getChar(signature, pos) == c) {
+ return pos + 1;
+ }
+ throw new IllegalArgumentException(signature + ": '" + c
+ + "' expected at index " + pos);
+ }
+
+ /**
+ * Returns the signature car at the given index.
+ *
+ * @param signature a signature.
+ * @param pos an index in signature.
+ * @return the character at the given index, or 0 if there is no such
+ * character.
+ */
+ private static char getChar(final String signature, int pos) {
+ return pos < signature.length() ? signature.charAt(pos) : (char) 0;
+ }
+
+ /**
+ * Checks that the given label is not null. This method can also check that
+ * the label has been visited.
+ *
+ * @param label the label to be checked.
+ * @param checkVisited <tt>true</tt> to check that the label has been
+ * visited.
+ * @param msg a message to be used in case of error.
+ */
+ void checkLabel(
+ final Label label,
+ final boolean checkVisited,
+ final String msg)
+ {
+ if (label == null) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must not be null)");
+ }
+ if (checkVisited && labels.get(label) == null) {
+ throw new IllegalArgumentException("Invalid " + msg
+ + " (must be visited first)");
+ }
+ }
+
+ /**
+ * Checks that the given label is not a label used only for debug purposes.
+ *
+ * @param label the label to be checked.
+ */
+ private static void checkNonDebugLabel(final Label label) {
+ Field f = getLabelStatusField();
+ int status = 0;
+ try {
+ status = f == null ? 0 : ((Integer) f.get(label)).intValue();
+ } catch (IllegalAccessException e) {
+ throw new Error("Internal error");
+ }
+ if ((status & 0x01) != 0) {
+ throw new IllegalArgumentException("Labels used for debug info cannot be reused for control flow");
+ }
+ }
+
+ /**
+ * Returns the Field object corresponding to the Label.status field.
+ *
+ * @return the Field object corresponding to the Label.status field.
+ */
+ private static Field getLabelStatusField() {
+ if (labelStatusField == null) {
+ labelStatusField = getLabelField("a");
+ if (labelStatusField == null) {
+ labelStatusField = getLabelField("status");
+ }
+ }
+ return labelStatusField;
+ }
+
+ /**
+ * Returns the field of the Label class whose name is given.
+ *
+ * @param name a field name.
+ * @return the field of the Label class whose name is given, or null.
+ */
+ private static Field getLabelField(final String name) {
+ try {
+ Field f = Label.class.getDeclaredField(name);
+ f.setAccessible(true);
+ return f;
+ } catch (NoSuchFieldException e) {
+ return null;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
new file mode 100644
index 0000000..9aa009e
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
@@ -0,0 +1,358 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} that checks that its methods are properly used.
+ *
+ * @author Eric Bruneton
+ */
+public class CheckSignatureAdapter extends SignatureVisitor {
+
+ /**
+ * Type to be used to check class signatures. See
+ * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}.
+ */
+ public static final int CLASS_SIGNATURE = 0;
+
+ /**
+ * Type to be used to check method signatures. See
+ * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}.
+ */
+ public static final int METHOD_SIGNATURE = 1;
+
+ /**
+ * Type to be used to check type signatures.See
+ * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}.
+ */
+ public static final int TYPE_SIGNATURE = 2;
+
+ private static final int EMPTY = 1;
+
+ private static final int FORMAL = 2;
+
+ private static final int BOUND = 4;
+
+ private static final int SUPER = 8;
+
+ private static final int PARAM = 16;
+
+ private static final int RETURN = 32;
+
+ private static final int SIMPLE_TYPE = 64;
+
+ private static final int CLASS_TYPE = 128;
+
+ private static final int END = 256;
+
+ /**
+ * Type of the signature to be checked.
+ */
+ private final int type;
+
+ /**
+ * State of the automaton used to check the order of method calls.
+ */
+ private int state;
+
+ /**
+ * <tt>true</tt> if the checked type signature can be 'V'.
+ */
+ private boolean canBeVoid;
+
+ /**
+ * The visitor to which this adapter must delegate calls. May be
+ * <tt>null</tt>.
+ */
+ private final SignatureVisitor sv;
+
+ /**
+ * Creates a new {@link CheckSignatureAdapter} object. <i>Subclasses must
+ * not use this constructor</i>. Instead, they must use the
+ * {@link #CheckSignatureAdapter(int, int, SignatureVisitor)} version.
+ *
+ * @param type the type of signature to be checked. See
+ * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and
+ * {@link #TYPE_SIGNATURE}.
+ * @param sv the visitor to which this adapter must delegate calls. May be
+ * <tt>null</tt>.
+ */
+ public CheckSignatureAdapter(final int type, final SignatureVisitor sv) {
+ this(Opcodes.ASM4, type, sv);
+ }
+
+ /**
+ * Creates a new {@link CheckSignatureAdapter} object.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ * @param type the type of signature to be checked. See
+ * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and
+ * {@link #TYPE_SIGNATURE}.
+ * @param sv the visitor to which this adapter must delegate calls. May be
+ * <tt>null</tt>.
+ */
+ protected CheckSignatureAdapter(
+ final int api,
+ final int type,
+ final SignatureVisitor sv)
+ {
+ super(api);
+ this.type = type;
+ this.state = EMPTY;
+ this.sv = sv;
+ }
+
+ // class and method signatures
+
+ @Override
+ public void visitFormalTypeParameter(final String name) {
+ if (type == TYPE_SIGNATURE
+ || (state != EMPTY && state != FORMAL && state != BOUND))
+ {
+ throw new IllegalStateException();
+ }
+ CheckMethodAdapter.checkIdentifier(name, "formal type parameter");
+ state = FORMAL;
+ if (sv != null) {
+ sv.visitFormalTypeParameter(name);
+ }
+ }
+
+ @Override
+ public SignatureVisitor visitClassBound() {
+ if (state != FORMAL) {
+ throw new IllegalStateException();
+ }
+ state = BOUND;
+ SignatureVisitor v = sv == null ? null : sv.visitClassBound();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ @Override
+ public SignatureVisitor visitInterfaceBound() {
+ if (state != FORMAL && state != BOUND) {
+ throw new IllegalArgumentException();
+ }
+ SignatureVisitor v = sv == null ? null : sv.visitInterfaceBound();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ // class signatures
+
+ @Override
+ public SignatureVisitor visitSuperclass() {
+ if (type != CLASS_SIGNATURE || (state & (EMPTY | FORMAL | BOUND)) == 0)
+ {
+ throw new IllegalArgumentException();
+ }
+ state = SUPER;
+ SignatureVisitor v = sv == null ? null : sv.visitSuperclass();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ @Override
+ public SignatureVisitor visitInterface() {
+ if (state != SUPER) {
+ throw new IllegalStateException();
+ }
+ SignatureVisitor v = sv == null ? null : sv.visitInterface();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ // method signatures
+
+ @Override
+ public SignatureVisitor visitParameterType() {
+ if (type != METHOD_SIGNATURE
+ || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0)
+ {
+ throw new IllegalArgumentException();
+ }
+ state = PARAM;
+ SignatureVisitor v = sv == null ? null : sv.visitParameterType();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ @Override
+ public SignatureVisitor visitReturnType() {
+ if (type != METHOD_SIGNATURE
+ || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0)
+ {
+ throw new IllegalArgumentException();
+ }
+ state = RETURN;
+ SignatureVisitor v = sv == null ? null : sv.visitReturnType();
+ CheckSignatureAdapter cv = new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ cv.canBeVoid = true;
+ return cv;
+ }
+
+ @Override
+ public SignatureVisitor visitExceptionType() {
+ if (state != RETURN) {
+ throw new IllegalStateException();
+ }
+ SignatureVisitor v = sv == null ? null : sv.visitExceptionType();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ // type signatures
+
+ @Override
+ public void visitBaseType(final char descriptor) {
+ if (type != TYPE_SIGNATURE || state != EMPTY) {
+ throw new IllegalStateException();
+ }
+ if (descriptor == 'V') {
+ if (!canBeVoid) {
+ throw new IllegalArgumentException();
+ }
+ } else {
+ if ("ZCBSIFJD".indexOf(descriptor) == -1) {
+ throw new IllegalArgumentException();
+ }
+ }
+ state = SIMPLE_TYPE;
+ if (sv != null) {
+ sv.visitBaseType(descriptor);
+ }
+ }
+
+ @Override
+ public void visitTypeVariable(final String name) {
+ if (type != TYPE_SIGNATURE || state != EMPTY) {
+ throw new IllegalStateException();
+ }
+ CheckMethodAdapter.checkIdentifier(name, "type variable");
+ state = SIMPLE_TYPE;
+ if (sv != null) {
+ sv.visitTypeVariable(name);
+ }
+ }
+
+ @Override
+ public SignatureVisitor visitArrayType() {
+ if (type != TYPE_SIGNATURE || state != EMPTY) {
+ throw new IllegalStateException();
+ }
+ state = SIMPLE_TYPE;
+ SignatureVisitor v = sv == null ? null : sv.visitArrayType();
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ @Override
+ public void visitClassType(final String name) {
+ if (type != TYPE_SIGNATURE || state != EMPTY) {
+ throw new IllegalStateException();
+ }
+ CheckMethodAdapter.checkInternalName(name, "class name");
+ state = CLASS_TYPE;
+ if (sv != null) {
+ sv.visitClassType(name);
+ }
+ }
+
+ @Override
+ public void visitInnerClassType(final String name) {
+ if (state != CLASS_TYPE) {
+ throw new IllegalStateException();
+ }
+ CheckMethodAdapter.checkIdentifier(name, "inner class name");
+ if (sv != null) {
+ sv.visitInnerClassType(name);
+ }
+ }
+
+ @Override
+ public void visitTypeArgument() {
+ if (state != CLASS_TYPE) {
+ throw new IllegalStateException();
+ }
+ if (sv != null) {
+ sv.visitTypeArgument();
+ }
+ }
+
+ @Override
+ public SignatureVisitor visitTypeArgument(final char wildcard) {
+ if (state != CLASS_TYPE) {
+ throw new IllegalStateException();
+ }
+ if ("+-=".indexOf(wildcard) == -1) {
+ throw new IllegalArgumentException();
+ }
+ SignatureVisitor v = sv == null ? null : sv.visitTypeArgument(wildcard);
+ return new CheckSignatureAdapter(TYPE_SIGNATURE, v);
+ }
+
+ @Override
+ public void visitEnd() {
+ if (state != CLASS_TYPE) {
+ throw new IllegalStateException();
+ }
+ state = END;
+ if (sv != null) {
+ sv.visitEnd();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
new file mode 100644
index 0000000..b823eee
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
@@ -0,0 +1,587 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * An abstract converter from visit events to text.
+ *
+ * @author Eric Bruneton
+ */
+public abstract class Printer {
+
+ /**
+ * The names of the Java Virtual Machine opcodes.
+ */
+ public static final String[] OPCODES;
+
+ /**
+ * The names of the for <code>operand</code> parameter values of the
+ * {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitIntInsn} method when
+ * <code>opcode</code> is <code>NEWARRAY</code>.
+ */
+ public static final String[] TYPES;
+
+ /**
+ * The names of the <code>tag</code> field values for
+ * {@link jdk.internal.org.objectweb.asm.Handle}.
+ */
+ public static final String[] HANDLE_TAG;
+
+ static {
+ String s = "NOP,ACONST_NULL,ICONST_M1,ICONST_0,ICONST_1,ICONST_2,"
+ + "ICONST_3,ICONST_4,ICONST_5,LCONST_0,LCONST_1,FCONST_0,"
+ + "FCONST_1,FCONST_2,DCONST_0,DCONST_1,BIPUSH,SIPUSH,LDC,,,"
+ + "ILOAD,LLOAD,FLOAD,DLOAD,ALOAD,,,,,,,,,,,,,,,,,,,,,IALOAD,"
+ + "LALOAD,FALOAD,DALOAD,AALOAD,BALOAD,CALOAD,SALOAD,ISTORE,"
+ + "LSTORE,FSTORE,DSTORE,ASTORE,,,,,,,,,,,,,,,,,,,,,IASTORE,"
+ + "LASTORE,FASTORE,DASTORE,AASTORE,BASTORE,CASTORE,SASTORE,POP,"
+ + "POP2,DUP,DUP_X1,DUP_X2,DUP2,DUP2_X1,DUP2_X2,SWAP,IADD,LADD,"
+ + "FADD,DADD,ISUB,LSUB,FSUB,DSUB,IMUL,LMUL,FMUL,DMUL,IDIV,LDIV,"
+ + "FDIV,DDIV,IREM,LREM,FREM,DREM,INEG,LNEG,FNEG,DNEG,ISHL,LSHL,"
+ + "ISHR,LSHR,IUSHR,LUSHR,IAND,LAND,IOR,LOR,IXOR,LXOR,IINC,I2L,"
+ + "I2F,I2D,L2I,L2F,L2D,F2I,F2L,F2D,D2I,D2L,D2F,I2B,I2C,I2S,LCMP,"
+ + "FCMPL,FCMPG,DCMPL,DCMPG,IFEQ,IFNE,IFLT,IFGE,IFGT,IFLE,"
+ + "IF_ICMPEQ,IF_ICMPNE,IF_ICMPLT,IF_ICMPGE,IF_ICMPGT,IF_ICMPLE,"
+ + "IF_ACMPEQ,IF_ACMPNE,GOTO,JSR,RET,TABLESWITCH,LOOKUPSWITCH,"
+ + "IRETURN,LRETURN,FRETURN,DRETURN,ARETURN,RETURN,GETSTATIC,"
+ + "PUTSTATIC,GETFIELD,PUTFIELD,INVOKEVIRTUAL,INVOKESPECIAL,"
+ + "INVOKESTATIC,INVOKEINTERFACE,INVOKEDYNAMIC,NEW,NEWARRAY,"
+ + "ANEWARRAY,ARRAYLENGTH,ATHROW,CHECKCAST,INSTANCEOF,"
+ + "MONITORENTER,MONITOREXIT,,MULTIANEWARRAY,IFNULL,IFNONNULL,";
+ OPCODES = new String[200];
+ int i = 0;
+ int j = 0;
+ int l;
+ while ((l = s.indexOf(',', j)) > 0) {
+ OPCODES[i++] = j + 1 == l ? null : s.substring(j, l);
+ j = l + 1;
+ }
+
+ s = "T_BOOLEAN,T_CHAR,T_FLOAT,T_DOUBLE,T_BYTE,T_SHORT,T_INT,T_LONG,";
+ TYPES = new String[12];
+ j = 0;
+ i = 4;
+ while ((l = s.indexOf(',', j)) > 0) {
+ TYPES[i++] = s.substring(j, l);
+ j = l + 1;
+ }
+
+ s = "H_GETFIELD,H_GETSTATIC,H_PUTFIELD,H_PUTSTATIC,"
+ + "H_INVOKEVIRTUAL,H_INVOKESTATIC,H_INVOKESPECIAL,"
+ + "H_NEWINVOKESPECIAL,H_INVOKEINTERFACE,";
+ HANDLE_TAG = new String[10];
+ j = 0;
+ i = 1;
+ while ((l = s.indexOf(',', j)) > 0) {
+ HANDLE_TAG[i++] = s.substring(j, l);
+ j = l + 1;
+ }
+ }
+
+ /**
+ * The ASM API version implemented by this class. The value of this field
+ * must be one of {@link Opcodes#ASM4}.
+ */
+ protected final int api;
+
+ /**
+ * A buffer that can be used to create strings.
+ */
+ protected final StringBuffer buf;
+
+ /**
+ * The text to be printed. Since the code of methods is not necessarily
+ * visited in sequential order, one method after the other, but can be
+ * interlaced (some instructions from method one, then some instructions
+ * from method two, then some instructions from method one again...), it is
+ * not possible to print the visited instructions directly to a sequential
+ * stream. A class is therefore printed in a two steps process: a string
+ * tree is constructed during the visit, and printed to a sequential stream
+ * at the end of the visit. This string tree is stored in this field, as a
+ * string list that can contain other string lists, which can themselves
+ * contain other string lists, and so on.
+ */
+ public final List<Object> text;
+
+ /**
+ * Constructs a new {@link Printer}.
+ */
+ protected Printer(final int api) {
+ this.api = api;
+ this.buf = new StringBuffer();
+ this.text = new ArrayList<Object>();
+ }
+
+ /**
+ * Class header.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visit}.
+ */
+ public abstract void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces);
+
+ /**
+ * Class source.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitSource}.
+ */
+ public abstract void visitSource(final String file, final String debug);
+
+ /**
+ * Class outer class.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitOuterClass}.
+ */
+ public abstract void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc);
+
+ /**
+ * Class annotation.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitAnnotation}.
+ */
+ public abstract Printer visitClassAnnotation(
+ final String desc,
+ final boolean visible);
+
+ /**
+ * Class attribute.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitAttribute}.
+ */
+ public abstract void visitClassAttribute(final Attribute attr);
+
+ /**
+ * Class inner name.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitInnerClass}.
+ */
+ public abstract void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access);
+
+ /**
+ * Class field.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitField}.
+ */
+ public abstract Printer visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value);
+
+ /**
+ * Class method.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitMethod}.
+ */
+ public abstract Printer visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions);
+
+ /**
+ * Class end.
+ * See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitEnd}.
+ */
+ public abstract void visitClassEnd();
+
+ // ------------------------------------------------------------------------
+ // Annotations
+ // ------------------------------------------------------------------------
+
+ /**
+ * Annotation value.
+ * See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visit}.
+ */
+ public abstract void visit(final String name, final Object value);
+
+ /**
+ * Annotation enum value.
+ * See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitEnum}.
+ */
+ public abstract void visitEnum(
+ final String name,
+ final String desc,
+ final String value);
+
+ /**
+ * Nested annotation value.
+ * See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitAnnotation}.
+ */
+ public abstract Printer visitAnnotation(
+ final String name,
+ final String desc);
+
+ /**
+ * Annotation array value.
+ * See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitArray}.
+ */
+ public abstract Printer visitArray(final String name);
+
+ /**
+ * Annotation end.
+ * See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitEnd}.
+ */
+ public abstract void visitAnnotationEnd();
+
+ // ------------------------------------------------------------------------
+ // Fields
+ // ------------------------------------------------------------------------
+
+ /**
+ * Field annotation.
+ * See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitAnnotation}.
+ */
+ public abstract Printer visitFieldAnnotation(
+ final String desc,
+ final boolean visible);
+
+ /**
+ * Field attribute.
+ * See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitAttribute}.
+ */
+ public abstract void visitFieldAttribute(final Attribute attr);
+
+ /**
+ * Field end.
+ * See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitEnd}.
+ */
+ public abstract void visitFieldEnd();
+
+ // ------------------------------------------------------------------------
+ // Methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Method default annotation.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAnnotationDefault}.
+ */
+ public abstract Printer visitAnnotationDefault();
+
+ /**
+ * Method annotation.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAnnotation}.
+ */
+ public abstract Printer visitMethodAnnotation(
+ final String desc,
+ final boolean visible);
+
+ /**
+ * Method parameter annotation.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitParameterAnnotation}.
+ */
+ public abstract Printer visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible);
+
+ /**
+ * Method attribute.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAttribute}.
+ */
+ public abstract void visitMethodAttribute(final Attribute attr);
+
+ /**
+ * Method start.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitCode}.
+ */
+ public abstract void visitCode();
+
+ /**
+ * Method stack frame.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitFrame}.
+ */
+ public abstract void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitInsn}.
+ */
+ public abstract void visitInsn(final int opcode);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitIntInsn}.
+ */
+ public abstract void visitIntInsn(final int opcode, final int operand);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitVarInsn}.
+ */
+ public abstract void visitVarInsn(final int opcode, final int var);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTypeInsn}.
+ */
+ public abstract void visitTypeInsn(final int opcode, final String type);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitFieldInsn}.
+ */
+ public abstract void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMethodInsn}.
+ */
+ public abstract void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitInvokeDynamicInsn}.
+ */
+ public abstract void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitJumpInsn}.
+ */
+ public abstract void visitJumpInsn(final int opcode, final Label label);
+
+ /**
+ * Method label.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLabel}.
+ */
+ public abstract void visitLabel(final Label label);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLdcInsn}.
+ */
+ public abstract void visitLdcInsn(final Object cst);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitIincInsn}.
+ */
+ public abstract void visitIincInsn(final int var, final int increment);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTableSwitchInsn}.
+ */
+ public abstract void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLookupSwitchInsn}.
+ */
+ public abstract void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels);
+
+ /**
+ * Method instruction.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
+ */
+ public abstract void visitMultiANewArrayInsn(
+ final String desc,
+ final int dims);
+
+ /**
+ * Method exception handler.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTryCatchBlock}.
+ */
+ public abstract void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type);
+
+ /**
+ * Method debug info.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLocalVariable}.
+ */
+ public abstract void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index);
+
+ /**
+ * Method debug info.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLineNumber}.
+ */
+ public abstract void visitLineNumber(final int line, final Label start);
+
+ /**
+ * Method max stack and max locals.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMaxs}.
+ */
+ public abstract void visitMaxs(final int maxStack, final int maxLocals);
+
+ /**
+ * Method end.
+ * See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitEnd}.
+ */
+ public abstract void visitMethodEnd();
+
+ /**
+ * Returns the text constructed by this visitor.
+ *
+ * @return the text constructed by this visitor.
+ */
+ public List<Object> getText() {
+ return text;
+ }
+
+ /**
+ * Prints the text constructed by this visitor.
+ *
+ * @param pw the print writer to be used.
+ */
+ public void print(final PrintWriter pw) {
+ printList(pw, text);
+ }
+
+ /**
+ * Appends a quoted string to a given buffer.
+ *
+ * @param buf the buffer where the string must be added.
+ * @param s the string to be added.
+ */
+ public static void appendString(final StringBuffer buf, final String s) {
+ buf.append('\"');
+ for (int i = 0; i < s.length(); ++i) {
+ char c = s.charAt(i);
+ if (c == '\n') {
+ buf.append("\\n");
+ } else if (c == '\r') {
+ buf.append("\\r");
+ } else if (c == '\\') {
+ buf.append("\\\\");
+ } else if (c == '"') {
+ buf.append("\\\"");
+ } else if (c < 0x20 || c > 0x7f) {
+ buf.append("\\u");
+ if (c < 0x10) {
+ buf.append("000");
+ } else if (c < 0x100) {
+ buf.append("00");
+ } else if (c < 0x1000) {
+ buf.append('0');
+ }
+ buf.append(Integer.toString(c, 16));
+ } else {
+ buf.append(c);
+ }
+ }
+ buf.append('\"');
+ }
+
+ /**
+ * Prints the given string tree.
+ *
+ * @param pw the writer to be used to print the tree.
+ * @param l a string tree, i.e., a string list that can contain other string
+ * lists, and so on recursively.
+ */
+ static void printList(final PrintWriter pw, final List<?> l) {
+ for (int i = 0; i < l.size(); ++i) {
+ Object o = l.get(i);
+ if (o instanceof List) {
+ printList(pw, (List<?>) o);
+ } else {
+ pw.print(o.toString());
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
new file mode 100644
index 0000000..1a78998
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
@@ -0,0 +1,83 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Label;
+
+/**
+ * An {@link jdk.internal.org.objectweb.asm.Attribute Attribute} that can print a readable
+ * representation of itself.
+ *
+ * Implementations should construct readable output from an attribute data
+ * structure. Such representation could be used in unit test assertions.
+ *
+ * @author Eugene Kuleshov
+ */
+public interface Textifiable {
+
+ /**
+ * Build a human readable representation of this attribute.
+ *
+ * @param buf a buffer used for printing Java code.
+ * @param labelNames map of label instances to their names.
+ */
+ void textify(StringBuffer buf, Map<Label, String> labelNames);
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
new file mode 100644
index 0000000..b96d241
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
@@ -0,0 +1,1315 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.signature.SignatureReader;
+
+/**
+ * A {@link Printer} that prints a disassembled view of the classes it visits.
+ *
+ * @author Eric Bruneton
+ */
+public class Textifier extends Printer {
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for internal
+ * type names in bytecode notation.
+ */
+ public static final int INTERNAL_NAME = 0;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for field
+ * descriptors, formatted in bytecode notation
+ */
+ public static final int FIELD_DESCRIPTOR = 1;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for field
+ * signatures, formatted in bytecode notation
+ */
+ public static final int FIELD_SIGNATURE = 2;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for method
+ * descriptors, formatted in bytecode notation
+ */
+ public static final int METHOD_DESCRIPTOR = 3;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for method
+ * signatures, formatted in bytecode notation
+ */
+ public static final int METHOD_SIGNATURE = 4;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for class
+ * signatures, formatted in bytecode notation
+ */
+ public static final int CLASS_SIGNATURE = 5;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for field or
+ * method return value signatures, formatted in default Java notation
+ * (non-bytecode)
+ */
+ public static final int TYPE_DECLARATION = 6;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for class
+ * signatures, formatted in default Java notation (non-bytecode)
+ */
+ public static final int CLASS_DECLARATION = 7;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for method
+ * parameter signatures, formatted in default Java notation (non-bytecode)
+ */
+ public static final int PARAMETERS_DECLARATION = 8;
+
+ /**
+ * Constant used in {@link #appendDescriptor appendDescriptor} for handle
+ * descriptors, formatted in bytecode notation
+ */
+ public static final int HANDLE_DESCRIPTOR = 9;
+
+ /**
+ * Tab for class members.
+ */
+ protected String tab = " ";
+
+ /**
+ * Tab for bytecode instructions.
+ */
+ protected String tab2 = " ";
+
+ /**
+ * Tab for table and lookup switch instructions.
+ */
+ protected String tab3 = " ";
+
+ /**
+ * Tab for labels.
+ */
+ protected String ltab = " ";
+
+ /**
+ * The label names. This map associate String values to Label keys.
+ */
+ protected Map<Label, String> labelNames;
+
+ private int valueNumber = 0;
+
+ /**
+ * Constructs a new {@link Textifier}. <i>Subclasses must not use this
+ * constructor</i>. Instead, they must use the {@link #Textifier(int)}
+ * version.
+ */
+ public Textifier() {
+ this(Opcodes.ASM4);
+ }
+
+ /**
+ * Constructs a new {@link Textifier}.
+ *
+ * @param api the ASM API version implemented by this visitor. Must be one
+ * of {@link Opcodes#ASM4}.
+ */
+ protected Textifier(final int api) {
+ super(api);
+ }
+
+ /**
+ * Prints a disassembled view of the given class to the standard output. <p>
+ * Usage: Textifier [-debug] <binary class name or class
+ * file name >
+ *
+ * @param args the command line arguments.
+ *
+ * @throws Exception if the class cannot be found, or if an IO exception
+ * occurs.
+ */
+ public static void main(final String[] args) throws Exception {
+ int i = 0;
+ int flags = ClassReader.SKIP_DEBUG;
+
+ boolean ok = true;
+ if (args.length < 1 || args.length > 2) {
+ ok = false;
+ }
+ if (ok && "-debug".equals(args[0])) {
+ i = 1;
+ flags = 0;
+ if (args.length != 2) {
+ ok = false;
+ }
+ }
+ if (!ok) {
+ System.err.println("Prints a disassembled view of the given class.");
+ System.err.println("Usage: Textifier [-debug] "
+ + "<fully qualified class name or class file name>");
+ return;
+ }
+ ClassReader cr;
+ if (args[i].endsWith(".class") || args[i].indexOf('\\') > -1
+ || args[i].indexOf('/') > -1)
+ {
+ cr = new ClassReader(new FileInputStream(args[i]));
+ } else {
+ cr = new ClassReader(args[i]);
+ }
+ cr.accept(new TraceClassVisitor(new PrintWriter(System.out)),
+ flags);
+ }
+
+ // ------------------------------------------------------------------------
+ // Classes
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ int major = version & 0xFFFF;
+ int minor = version >>> 16;
+ buf.setLength(0);
+ buf.append("// class version ")
+ .append(major)
+ .append('.')
+ .append(minor)
+ .append(" (")
+ .append(version)
+ .append(")\n");
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ buf.append("// DEPRECATED\n");
+ }
+ buf.append("// access flags 0x").append(Integer.toHexString(access).toUpperCase()).append('\n');
+
+ appendDescriptor(CLASS_SIGNATURE, signature);
+ if (signature != null) {
+ TraceSignatureVisitor sv = new TraceSignatureVisitor(access);
+ SignatureReader r = new SignatureReader(signature);
+ r.accept(sv);
+ buf.append("// declaration: ")
+ .append(name)
+ .append(sv.getDeclaration())
+ .append('\n');
+ }
+
+ appendAccess(access & ~Opcodes.ACC_SUPER);
+ if ((access & Opcodes.ACC_ANNOTATION) != 0) {
+ buf.append("@interface ");
+ } else if ((access & Opcodes.ACC_INTERFACE) != 0) {
+ buf.append("interface ");
+ } else if ((access & Opcodes.ACC_ENUM) == 0) {
+ buf.append("class ");
+ }
+ appendDescriptor(INTERNAL_NAME, name);
+
+ if (superName != null && !"java/lang/Object".equals(superName)) {
+ buf.append(" extends ");
+ appendDescriptor(INTERNAL_NAME, superName);
+ buf.append(' ');
+ }
+ if (interfaces != null && interfaces.length > 0) {
+ buf.append(" implements ");
+ for (int i = 0; i < interfaces.length; ++i) {
+ appendDescriptor(INTERNAL_NAME, interfaces[i]);
+ buf.append(' ');
+ }
+ }
+ buf.append(" {\n\n");
+
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitSource(final String file, final String debug) {
+ buf.setLength(0);
+ if (file != null) {
+ buf.append(tab)
+ .append("// compiled from: ")
+ .append(file)
+ .append('\n');
+ }
+ if (debug != null) {
+ buf.append(tab)
+ .append("// debug info: ")
+ .append(debug)
+ .append('\n');
+ }
+ if (buf.length() > 0) {
+ text.add(buf.toString());
+ }
+ }
+
+ @Override
+ public void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append(tab).append("OUTERCLASS ");
+ appendDescriptor(INTERNAL_NAME, owner);
+ buf.append(' ');
+ if (name != null) {
+ buf.append(name).append(' ');
+ }
+ appendDescriptor(METHOD_DESCRIPTOR, desc);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public Textifier visitClassAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ text.add("\n");
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public void visitClassAttribute(final Attribute attr) {
+ text.add("\n");
+ visitAttribute(attr);
+ }
+
+ @Override
+ public void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ buf.setLength(0);
+ buf.append(tab).append("// access flags 0x");
+ buf.append(Integer.toHexString(access & ~Opcodes.ACC_SUPER).toUpperCase()).append('\n');
+ buf.append(tab);
+ appendAccess(access);
+ buf.append("INNERCLASS ");
+ appendDescriptor(INTERNAL_NAME, name);
+ buf.append(' ');
+ appendDescriptor(INTERNAL_NAME, outerName);
+ buf.append(' ');
+ appendDescriptor(INTERNAL_NAME, innerName);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public Textifier visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ buf.setLength(0);
+ buf.append('\n');
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ buf.append(tab).append("// DEPRECATED\n");
+ }
+ buf.append(tab).append("// access flags 0x").append(Integer.toHexString(access).toUpperCase()).append('\n');
+ if (signature != null) {
+ buf.append(tab);
+ appendDescriptor(FIELD_SIGNATURE, signature);
+
+ TraceSignatureVisitor sv = new TraceSignatureVisitor(0);
+ SignatureReader r = new SignatureReader(signature);
+ r.acceptType(sv);
+ buf.append(tab)
+ .append("// declaration: ")
+ .append(sv.getDeclaration())
+ .append('\n');
+ }
+
+ buf.append(tab);
+ appendAccess(access);
+
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append(' ').append(name);
+ if (value != null) {
+ buf.append(" = ");
+ if (value instanceof String) {
+ buf.append('\"').append(value).append('\"');
+ } else {
+ buf.append(value);
+ }
+ }
+
+ buf.append('\n');
+ text.add(buf.toString());
+
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ return t;
+ }
+
+ @Override
+ public Textifier visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ buf.setLength(0);
+ buf.append('\n');
+ if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+ buf.append(tab).append("// DEPRECATED\n");
+ }
+ buf.append(tab).append("// access flags 0x").append(Integer.toHexString(access).toUpperCase()).append('\n');
+
+ if (signature != null) {
+ buf.append(tab);
+ appendDescriptor(METHOD_SIGNATURE, signature);
+
+ TraceSignatureVisitor v = new TraceSignatureVisitor(0);
+ SignatureReader r = new SignatureReader(signature);
+ r.accept(v);
+ String genericDecl = v.getDeclaration();
+ String genericReturn = v.getReturnType();
+ String genericExceptions = v.getExceptions();
+
+ buf.append(tab)
+ .append("// declaration: ")
+ .append(genericReturn)
+ .append(' ')
+ .append(name)
+ .append(genericDecl);
+ if (genericExceptions != null) {
+ buf.append(" throws ").append(genericExceptions);
+ }
+ buf.append('\n');
+ }
+
+ buf.append(tab);
+ appendAccess(access);
+ if ((access & Opcodes.ACC_NATIVE) != 0) {
+ buf.append("native ");
+ }
+ if ((access & Opcodes.ACC_VARARGS) != 0) {
+ buf.append("varargs ");
+ }
+ if ((access & Opcodes.ACC_BRIDGE) != 0) {
+ buf.append("bridge ");
+ }
+
+ buf.append(name);
+ appendDescriptor(METHOD_DESCRIPTOR, desc);
+ if (exceptions != null && exceptions.length > 0) {
+ buf.append(" throws ");
+ for (int i = 0; i < exceptions.length; ++i) {
+ appendDescriptor(INTERNAL_NAME, exceptions[i]);
+ buf.append(' ');
+ }
+ }
+
+ buf.append('\n');
+ text.add(buf.toString());
+
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ return t;
+ }
+
+ @Override
+ public void visitClassEnd() {
+ text.add("}\n");
+ }
+
+ // ------------------------------------------------------------------------
+ // Annotations
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void visit(final String name, final Object value) {
+ buf.setLength(0);
+ appendComa(valueNumber++);
+
+ if (name != null) {
+ buf.append(name).append('=');
+ }
+
+ if (value instanceof String) {
+ visitString((String) value);
+ } else if (value instanceof Type) {
+ visitType((Type) value);
+ } else if (value instanceof Byte) {
+ visitByte(((Byte) value).byteValue());
+ } else if (value instanceof Boolean) {
+ visitBoolean(((Boolean) value).booleanValue());
+ } else if (value instanceof Short) {
+ visitShort(((Short) value).shortValue());
+ } else if (value instanceof Character) {
+ visitChar(((Character) value).charValue());
+ } else if (value instanceof Integer) {
+ visitInt(((Integer) value).intValue());
+ } else if (value instanceof Float) {
+ visitFloat(((Float) value).floatValue());
+ } else if (value instanceof Long) {
+ visitLong(((Long) value).longValue());
+ } else if (value instanceof Double) {
+ visitDouble(((Double) value).doubleValue());
+ } else if (value.getClass().isArray()) {
+ buf.append('{');
+ if (value instanceof byte[]) {
+ byte[] v = (byte[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitByte(v[i]);
+ }
+ } else if (value instanceof boolean[]) {
+ boolean[] v = (boolean[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitBoolean(v[i]);
+ }
+ } else if (value instanceof short[]) {
+ short[] v = (short[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitShort(v[i]);
+ }
+ } else if (value instanceof char[]) {
+ char[] v = (char[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitChar(v[i]);
+ }
+ } else if (value instanceof int[]) {
+ int[] v = (int[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitInt(v[i]);
+ }
+ } else if (value instanceof long[]) {
+ long[] v = (long[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitLong(v[i]);
+ }
+ } else if (value instanceof float[]) {
+ float[] v = (float[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitFloat(v[i]);
+ }
+ } else if (value instanceof double[]) {
+ double[] v = (double[]) value;
+ for (int i = 0; i < v.length; i++) {
+ appendComa(i);
+ visitDouble(v[i]);
+ }
+ }
+ buf.append('}');
+ }
+
+ text.add(buf.toString());
+ }
+
+ private void visitInt(final int value) {
+ buf.append(value);
+ }
+
+ private void visitLong(final long value) {
+ buf.append(value).append('L');
+ }
+
+ private void visitFloat(final float value) {
+ buf.append(value).append('F');
+ }
+
+ private void visitDouble(final double value) {
+ buf.append(value).append('D');
+ }
+
+ private void visitChar(final char value) {
+ buf.append("(char)").append((int) value);
+ }
+
+ private void visitShort(final short value) {
+ buf.append("(short)").append(value);
+ }
+
+ private void visitByte(final byte value) {
+ buf.append("(byte)").append(value);
+ }
+
+ private void visitBoolean(final boolean value) {
+ buf.append(value);
+ }
+
+ private void visitString(final String value) {
+ appendString(buf, value);
+ }
+
+ private void visitType(final Type value) {
+ buf.append(value.getClassName()).append(".class");
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ buf.setLength(0);
+ appendComa(valueNumber++);
+ if (name != null) {
+ buf.append(name).append('=');
+ }
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append('.').append(value);
+ text.add(buf.toString());
+ }
+
+ @Override
+ public Textifier visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ appendComa(valueNumber++);
+ if (name != null) {
+ buf.append(name).append('=');
+ }
+ buf.append('@');
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append('(');
+ text.add(buf.toString());
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ text.add(")");
+ return t;
+ }
+
+ @Override
+ public Textifier visitArray(
+ final String name)
+ {
+ buf.setLength(0);
+ appendComa(valueNumber++);
+ if (name != null) {
+ buf.append(name).append('=');
+ }
+ buf.append('{');
+ text.add(buf.toString());
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ text.add("}");
+ return t;
+ }
+
+ @Override
+ public void visitAnnotationEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Fields
+ // ------------------------------------------------------------------------
+
+ @Override
+ public Textifier visitFieldAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public void visitFieldAttribute(final Attribute attr) {
+ visitAttribute(attr);
+ }
+
+ @Override
+ public void visitFieldEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Methods
+ // ------------------------------------------------------------------------
+
+ @Override
+ public Textifier visitAnnotationDefault() {
+ text.add(tab2 + "default=");
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ text.add("\n");
+ return t;
+ }
+
+ @Override
+ public Textifier visitMethodAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ return visitAnnotation(desc, visible);
+ }
+
+ @Override
+ public Textifier visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append('@');
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append('(');
+ text.add(buf.toString());
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ text.add(visible ? ") // parameter " : ") // invisible, parameter ");
+ text.add(new Integer(parameter));
+ text.add("\n");
+ return t;
+ }
+
+ @Override
+ public void visitMethodAttribute(final Attribute attr) {
+ buf.setLength(0);
+ buf.append(tab).append("ATTRIBUTE ");
+ appendDescriptor(-1, attr.type);
+
+ if (attr instanceof Textifiable) {
+ ((Textifiable) attr).textify(buf, labelNames);
+ } else {
+ buf.append(" : unknown\n");
+ }
+
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitCode() {
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ buf.setLength(0);
+ buf.append(ltab);
+ buf.append("FRAME ");
+ switch (type) {
+ case Opcodes.F_NEW:
+ case Opcodes.F_FULL:
+ buf.append("FULL [");
+ appendFrameTypes(nLocal, local);
+ buf.append("] [");
+ appendFrameTypes(nStack, stack);
+ buf.append(']');
+ break;
+ case Opcodes.F_APPEND:
+ buf.append("APPEND [");
+ appendFrameTypes(nLocal, local);
+ buf.append(']');
+ break;
+ case Opcodes.F_CHOP:
+ buf.append("CHOP ").append(nLocal);
+ break;
+ case Opcodes.F_SAME:
+ buf.append("SAME");
+ break;
+ case Opcodes.F_SAME1:
+ buf.append("SAME1 ");
+ appendFrameTypes(1, stack);
+ break;
+ }
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ buf.setLength(0);
+ buf.append(tab2).append(OPCODES[opcode]).append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ buf.setLength(0);
+ buf.append(tab2)
+ .append(OPCODES[opcode])
+ .append(' ')
+ .append(opcode == Opcodes.NEWARRAY
+ ? TYPES[operand]
+ : Integer.toString(operand))
+ .append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ buf.setLength(0);
+ buf.append(tab2)
+ .append(OPCODES[opcode])
+ .append(' ')
+ .append(var)
+ .append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ buf.setLength(0);
+ buf.append(tab2).append(OPCODES[opcode]).append(' ');
+ appendDescriptor(INTERNAL_NAME, type);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append(OPCODES[opcode]).append(' ');
+ appendDescriptor(INTERNAL_NAME, owner);
+ buf.append('.').append(name).append(" : ");
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append(OPCODES[opcode]).append(' ');
+ appendDescriptor(INTERNAL_NAME, owner);
+ buf.append('.').append(name).append(' ');
+ appendDescriptor(METHOD_DESCRIPTOR, desc);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append("INVOKEDYNAMIC").append(' ');
+ buf.append(name);
+ appendDescriptor(METHOD_DESCRIPTOR, desc);
+ buf.append(" [");
+ appendHandle(bsm);
+ buf.append(tab3).append("// arguments:");
+ if(bsmArgs.length == 0) {
+ buf.append(" none");
+ } else {
+ buf.append('\n').append(tab3);
+ for(int i = 0; i < bsmArgs.length; i++) {
+ Object cst = bsmArgs[i];
+ if (cst instanceof String) {
+ Printer.appendString(buf, (String) cst);
+ } else if (cst instanceof Type) {
+ buf.append(((Type) cst).getDescriptor()).append(".class");
+ } else if (cst instanceof Handle) {
+ appendHandle((Handle) cst);
+ } else {
+ buf.append(cst);
+ }
+ buf.append(", ");
+ }
+ buf.setLength(buf.length() - 2);
+ }
+ buf.append('\n');
+ buf.append(tab2).append("]\n");
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ buf.setLength(0);
+ buf.append(tab2).append(OPCODES[opcode]).append(' ');
+ appendLabel(label);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ buf.setLength(0);
+ buf.append(ltab);
+ appendLabel(label);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ buf.setLength(0);
+ buf.append(tab2).append("LDC ");
+ if (cst instanceof String) {
+ Printer.appendString(buf, (String) cst);
+ } else if (cst instanceof Type) {
+ buf.append(((Type) cst).getDescriptor()).append(".class");
+ } else {
+ buf.append(cst);
+ }
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ buf.setLength(0);
+ buf.append(tab2)
+ .append("IINC ")
+ .append(var)
+ .append(' ')
+ .append(increment)
+ .append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append("TABLESWITCH\n");
+ for (int i = 0; i < labels.length; ++i) {
+ buf.append(tab3).append(min + i).append(": ");
+ appendLabel(labels[i]);
+ buf.append('\n');
+ }
+ buf.append(tab3).append("default: ");
+ appendLabel(dflt);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append("LOOKUPSWITCH\n");
+ for (int i = 0; i < labels.length; ++i) {
+ buf.append(tab3).append(keys[i]).append(": ");
+ appendLabel(labels[i]);
+ buf.append('\n');
+ }
+ buf.append(tab3).append("default: ");
+ appendLabel(dflt);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ buf.setLength(0);
+ buf.append(tab2).append("MULTIANEWARRAY ");
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append(' ').append(dims).append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append("TRYCATCHBLOCK ");
+ appendLabel(start);
+ buf.append(' ');
+ appendLabel(end);
+ buf.append(' ');
+ appendLabel(handler);
+ buf.append(' ');
+ appendDescriptor(INTERNAL_NAME, type);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ buf.setLength(0);
+ buf.append(tab2).append("LOCALVARIABLE ").append(name).append(' ');
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append(' ');
+ appendLabel(start);
+ buf.append(' ');
+ appendLabel(end);
+ buf.append(' ').append(index).append('\n');
+
+ if (signature != null) {
+ buf.append(tab2);
+ appendDescriptor(FIELD_SIGNATURE, signature);
+
+ TraceSignatureVisitor sv = new TraceSignatureVisitor(0);
+ SignatureReader r = new SignatureReader(signature);
+ r.acceptType(sv);
+ buf.append(tab2)
+ .append("// declaration: ")
+ .append(sv.getDeclaration())
+ .append('\n');
+ }
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ buf.setLength(0);
+ buf.append(tab2).append("LINENUMBER ").append(line).append(' ');
+ appendLabel(start);
+ buf.append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ buf.setLength(0);
+ buf.append(tab2).append("MAXSTACK = ").append(maxStack).append('\n');
+ text.add(buf.toString());
+
+ buf.setLength(0);
+ buf.append(tab2).append("MAXLOCALS = ").append(maxLocals).append('\n');
+ text.add(buf.toString());
+ }
+
+ @Override
+ public void visitMethodEnd() {
+ }
+
+ // ------------------------------------------------------------------------
+ // Common methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Prints a disassembled view of the given annotation.
+ *
+ * @param desc the class descriptor of the annotation class.
+ * @param visible <tt>true</tt> if the annotation is visible at runtime.
+ * @return a visitor to visit the annotation values.
+ */
+ public Textifier visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ buf.setLength(0);
+ buf.append(tab).append('@');
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ buf.append('(');
+ text.add(buf.toString());
+ Textifier t = createTextifier();
+ text.add(t.getText());
+ text.add(visible ? ")\n" : ") // invisible\n");
+ return t;
+ }
+
+ /**
+ * Prints a disassembled view of the given attribute.
+ *
+ * @param attr an attribute.
+ */
+ public void visitAttribute(final Attribute attr) {
+ buf.setLength(0);
+ buf.append(tab).append("ATTRIBUTE ");
+ appendDescriptor(-1, attr.type);
+
+ if (attr instanceof Textifiable) {
+ ((Textifiable) attr).textify(buf, null);
+ } else {
+ buf.append(" : unknown\n");
+ }
+
+ text.add(buf.toString());
+ }
+
+ // ------------------------------------------------------------------------
+ // Utility methods
+ // ------------------------------------------------------------------------
+
+ /**
+ * Creates a new TraceVisitor instance.
+ *
+ * @return a new TraceVisitor.
+ */
+ protected Textifier createTextifier() {
+ return new Textifier();
+ }
+
+ /**
+ * Appends an internal name, a type descriptor or a type signature to
+ * {@link #buf buf}.
+ *
+ * @param type indicates if desc is an internal name, a field descriptor, a
+ * method descriptor, a class signature, ...
+ * @param desc an internal name, type descriptor, or type signature. May be
+ * <tt>null</tt>.
+ */
+ protected void appendDescriptor(final int type, final String desc) {
+ if (type == CLASS_SIGNATURE || type == FIELD_SIGNATURE
+ || type == METHOD_SIGNATURE)
+ {
+ if (desc != null) {
+ buf.append("// signature ").append(desc).append('\n');
+ }
+ } else {
+ buf.append(desc);
+ }
+ }
+
+ /**
+ * Appends the name of the given label to {@link #buf buf}. Creates a new
+ * label name if the given label does not yet have one.
+ *
+ * @param l a label.
+ */
+ protected void appendLabel(final Label l) {
+ if (labelNames == null) {
+ labelNames = new HashMap<Label, String>();
+ }
+ String name = labelNames.get(l);
+ if (name == null) {
+ name = "L" + labelNames.size();
+ labelNames.put(l, name);
+ }
+ buf.append(name);
+ }
+
+ /**
+ * Appends the information about the given handle to {@link #buf buf}.
+ *
+ * @param h a handle, non null.
+ */
+ protected void appendHandle(final Handle h) {
+ buf.append('\n').append(tab3);
+ int tag = h.getTag();
+ buf.append("// handle kind 0x").append(Integer.toHexString(tag)).append(" : ");
+ switch (tag) {
+ case Opcodes.H_GETFIELD:
+ buf.append("GETFIELD");
+ break;
+ case Opcodes.H_GETSTATIC:
+ buf.append("GETSTATIC");
+ break;
+ case Opcodes.H_PUTFIELD:
+ buf.append("PUTFIELD");
+ break;
+ case Opcodes.H_PUTSTATIC:
+ buf.append("PUTSTATIC");
+ break;
+ case Opcodes.H_INVOKEINTERFACE:
+ buf.append("INVOKEINTERFACE");
+ break;
+ case Opcodes.H_INVOKESPECIAL:
+ buf.append("INVOKESPECIAL");
+ break;
+ case Opcodes.H_INVOKESTATIC:
+ buf.append("INVOKESTATIC");
+ break;
+ case Opcodes.H_INVOKEVIRTUAL:
+ buf.append("INVOKEVIRTUAL");
+ break;
+ case Opcodes.H_NEWINVOKESPECIAL:
+ buf.append("NEWINVOKESPECIAL");
+ break;
+ }
+ buf.append('\n');
+ buf.append(tab3);
+ appendDescriptor(INTERNAL_NAME, h.getOwner());
+ buf.append('.');
+ buf.append(h.getName());
+ buf.append('(');
+ appendDescriptor(HANDLE_DESCRIPTOR, h.getDesc());
+ buf.append(')').append('\n');
+ }
+
+ /**
+ * Appends a string representation of the given access modifiers to {@link
+ * #buf buf}.
+ *
+ * @param access some access modifiers.
+ */
+ private void appendAccess(final int access) {
+ if ((access & Opcodes.ACC_PUBLIC) != 0) {
+ buf.append("public ");
+ }
+ if ((access & Opcodes.ACC_PRIVATE) != 0) {
+ buf.append("private ");
+ }
+ if ((access & Opcodes.ACC_PROTECTED) != 0) {
+ buf.append("protected ");
+ }
+ if ((access & Opcodes.ACC_FINAL) != 0) {
+ buf.append("final ");
+ }
+ if ((access & Opcodes.ACC_STATIC) != 0) {
+ buf.append("static ");
+ }
+ if ((access & Opcodes.ACC_SYNCHRONIZED) != 0) {
+ buf.append("synchronized ");
+ }
+ if ((access & Opcodes.ACC_VOLATILE) != 0) {
+ buf.append("volatile ");
+ }
+ if ((access & Opcodes.ACC_TRANSIENT) != 0) {
+ buf.append("transient ");
+ }
+ if ((access & Opcodes.ACC_ABSTRACT) != 0) {
+ buf.append("abstract ");
+ }
+ if ((access & Opcodes.ACC_STRICT) != 0) {
+ buf.append("strictfp ");
+ }
+ if ((access & Opcodes.ACC_ENUM) != 0) {
+ buf.append("enum ");
+ }
+ }
+
+ private void appendComa(final int i) {
+ if (i != 0) {
+ buf.append(", ");
+ }
+ }
+
+ private void appendFrameTypes(final int n, final Object[] o) {
+ for (int i = 0; i < n; ++i) {
+ if (i > 0) {
+ buf.append(' ');
+ }
+ if (o[i] instanceof String) {
+ String desc = (String) o[i];
+ if (desc.startsWith("[")) {
+ appendDescriptor(FIELD_DESCRIPTOR, desc);
+ } else {
+ appendDescriptor(INTERNAL_NAME, desc);
+ }
+ } else if (o[i] instanceof Integer) {
+ switch (((Integer) o[i]).intValue()) {
+ case 0:
+ appendDescriptor(FIELD_DESCRIPTOR, "T");
+ break;
+ case 1:
+ appendDescriptor(FIELD_DESCRIPTOR, "I");
+ break;
+ case 2:
+ appendDescriptor(FIELD_DESCRIPTOR, "F");
+ break;
+ case 3:
+ appendDescriptor(FIELD_DESCRIPTOR, "D");
+ break;
+ case 4:
+ appendDescriptor(FIELD_DESCRIPTOR, "J");
+ break;
+ case 5:
+ appendDescriptor(FIELD_DESCRIPTOR, "N");
+ break;
+ case 6:
+ appendDescriptor(FIELD_DESCRIPTOR, "U");
+ break;
+ }
+ } else {
+ appendLabel((Label) o[i]);
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
new file mode 100644
index 0000000..a08a1a7
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -0,0 +1,125 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * An {@link AnnotationVisitor} that prints the annotations it visits with a
+ * {@link Printer}.
+ *
+ * @author Eric Bruneton
+ */
+public final class TraceAnnotationVisitor extends AnnotationVisitor {
+
+ private final Printer p;
+
+ public TraceAnnotationVisitor(final Printer p) {
+ this(null, p);
+ }
+
+ public TraceAnnotationVisitor(final AnnotationVisitor av, final Printer p) {
+ super(Opcodes.ASM4, av);
+ this.p = p;
+ }
+
+ @Override
+ public void visit(final String name, final Object value) {
+ p.visit(name, value);
+ super.visit(name, value);
+ }
+
+ @Override
+ public void visitEnum(
+ final String name,
+ final String desc,
+ final String value)
+ {
+ p.visitEnum(name, desc, value);
+ super.visitEnum(name, desc, value);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String name,
+ final String desc)
+ {
+ Printer p = this.p.visitAnnotation(name, desc);
+ AnnotationVisitor av = this.av == null
+ ? null
+ : this.av.visitAnnotation(name, desc);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(final String name) {
+ Printer p = this.p.visitArray(name);
+ AnnotationVisitor av = this.av == null
+ ? null
+ : this.av.visitArray(name);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public void visitEnd() {
+ p.visitAnnotationEnd();
+ super.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
new file mode 100644
index 0000000..fd2d66a
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
@@ -0,0 +1,262 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import java.io.PrintWriter;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link ClassVisitor} that prints the classes it visits with a
+ * {@link Printer}. This class visitor can be used in the middle of a class
+ * visitor chain to trace the class that is visited at a given point in this
+ * chain. This may be useful for debugging purposes. <p> The trace printed when
+ * visiting the <tt>Hello</tt> class is the following: <p> <blockquote>
+ *
+ * <pre> // class version 49.0 (49) // access flags 0x21 public class Hello {
+ *
+ * // compiled from: Hello.java
+ *
+ * // access flags 0x1 public <init> ()V ALOAD 0 INVOKESPECIAL
+ * java/lang/Object <init> ()V RETURN MAXSTACK = 1 MAXLOCALS = 1
+ *
+ * // access flags 0x9 public static main ([Ljava/lang/String;)V GETSTATIC
+ * java/lang/System out Ljava/io/PrintStream; LDC "hello"
+ * INVOKEVIRTUAL java/io/PrintStream println (Ljava/lang/String;)V RETURN
+ * MAXSTACK = 2 MAXLOCALS = 1 } </pre>
+ *
+ * </blockquote> where <tt>Hello</tt> is defined by: <p> <blockquote>
+ *
+ * <pre> public class Hello {
+ *
+ * public static void main(String[] args) {
+ * System.out.println("hello"); } } </pre>
+ *
+ * </blockquote>
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public final class TraceClassVisitor extends ClassVisitor {
+
+ /**
+ * The print writer to be used to print the class. May be null.
+ */
+ private final PrintWriter pw;
+
+ /**
+ * The object that actually converts visit events into text.
+ */
+ public final Printer p;
+
+ /**
+ * Constructs a new {@link TraceClassVisitor}.
+ *
+ * @param pw the print writer to be used to print the class.
+ */
+ public TraceClassVisitor(final PrintWriter pw) {
+ this(null, pw);
+ }
+
+ /**
+ * Constructs a new {@link TraceClassVisitor}.
+ *
+ * @param cv the {@link ClassVisitor} to which this visitor delegates calls.
+ * May be <tt>null</tt>.
+ * @param pw the print writer to be used to print the class.
+ */
+ public TraceClassVisitor(final ClassVisitor cv, final PrintWriter pw) {
+ this(cv, new Textifier(), pw);
+ }
+
+ /**
+ * Constructs a new {@link TraceClassVisitor}.
+ *
+ * @param cv the {@link ClassVisitor} to which this visitor delegates calls.
+ * May be <tt>null</tt>.
+ * @param p the object that actually converts visit events into text.
+ * @param pw the print writer to be used to print the class. May be null if
+ * you simply want to use the result via
+ * {@link Printer#getText()}, instead of printing it.
+ */
+ public TraceClassVisitor(
+ final ClassVisitor cv,
+ final Printer p,
+ final PrintWriter pw)
+ {
+ super(Opcodes.ASM4, cv);
+ this.pw = pw;
+ this.p = p;
+ }
+
+ @Override
+ public void visit(
+ final int version,
+ final int access,
+ final String name,
+ final String signature,
+ final String superName,
+ final String[] interfaces)
+ {
+ p.visit(version, access, name, signature, superName, interfaces);
+ super.visit(version, access, name, signature, superName, interfaces);
+ }
+
+ @Override
+ public void visitSource(final String file, final String debug) {
+ p.visitSource(file, debug);
+ super.visitSource(file, debug);
+ }
+
+ @Override
+ public void visitOuterClass(
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ p.visitOuterClass(owner, name, desc);
+ super.visitOuterClass(owner, name, desc);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ Printer p = this.p.visitClassAnnotation(desc, visible);
+ AnnotationVisitor av = cv == null ? null : cv.visitAnnotation(desc,
+ visible);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ p.visitClassAttribute(attr);
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public void visitInnerClass(
+ final String name,
+ final String outerName,
+ final String innerName,
+ final int access)
+ {
+ p.visitInnerClass(name, outerName, innerName, access);
+ super.visitInnerClass(name, outerName, innerName, access);
+ }
+
+ @Override
+ public FieldVisitor visitField(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final Object value)
+ {
+ Printer p = this.p.visitField(access,
+ name,
+ desc,
+ signature,
+ value);
+ FieldVisitor fv = cv == null ? null : cv.visitField(access,
+ name,
+ desc,
+ signature,
+ value);
+ return new TraceFieldVisitor(fv, p);
+ }
+
+ @Override
+ public MethodVisitor visitMethod(
+ final int access,
+ final String name,
+ final String desc,
+ final String signature,
+ final String[] exceptions)
+ {
+ Printer p = this.p.visitMethod(access,
+ name,
+ desc,
+ signature,
+ exceptions);
+ MethodVisitor mv = cv == null ? null : cv.visitMethod(access,
+ name,
+ desc,
+ signature,
+ exceptions);
+ return new TraceMethodVisitor(mv, p);
+ }
+
+ @Override
+ public void visitEnd() {
+ p.visitClassEnd();
+ if (pw != null) {
+ p.print(pw);
+ pw.flush();
+ }
+ super.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
new file mode 100644
index 0000000..2b4d8cb
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -0,0 +1,108 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link FieldVisitor} that prints the fields it visits with a
+ * {@link Printer}.
+ *
+ * @author Eric Bruneton
+ */
+public final class TraceFieldVisitor extends FieldVisitor {
+
+ public final Printer p;
+
+ public TraceFieldVisitor(final Printer p) {
+ this(null, p);
+ }
+
+ public TraceFieldVisitor(final FieldVisitor fv, final Printer p) {
+ super(Opcodes.ASM4, fv);
+ this.p = p;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ Printer p = this.p.visitFieldAnnotation(desc, visible);
+ AnnotationVisitor av = fv == null ? null : fv.visitAnnotation(desc,
+ visible);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ p.visitFieldAttribute(attr);
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public void visitEnd() {
+ p.visitFieldEnd();
+ super.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
new file mode 100644
index 0000000..c40964c
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -0,0 +1,294 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * Copyright (c) 2011 Google
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A {@link MethodVisitor} that prints the methods it visits with a
+ * {@link Printer}.
+ *
+ * @author Eric Bruneton
+ */
+public final class TraceMethodVisitor extends MethodVisitor {
+
+ public final Printer p;
+
+ public TraceMethodVisitor(final Printer p) {
+ this(null, p);
+ }
+
+ public TraceMethodVisitor(final MethodVisitor mv, final Printer p) {
+ super(Opcodes.ASM4, mv);
+ this.p = p;
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(
+ final String desc,
+ final boolean visible)
+ {
+ Printer p = this.p.visitMethodAnnotation(desc, visible);
+ AnnotationVisitor av = mv == null ? null : mv.visitAnnotation(desc,
+ visible);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public void visitAttribute(final Attribute attr) {
+ p.visitMethodAttribute(attr);
+ super.visitAttribute(attr);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotationDefault() {
+ Printer p = this.p.visitAnnotationDefault();
+ AnnotationVisitor av = mv == null ? null : mv.visitAnnotationDefault();
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public AnnotationVisitor visitParameterAnnotation(
+ final int parameter,
+ final String desc,
+ final boolean visible)
+ {
+ Printer p = this.p.visitParameterAnnotation(parameter,
+ desc,
+ visible);
+ AnnotationVisitor av = mv == null
+ ? null
+ : mv.visitParameterAnnotation(parameter, desc, visible);
+ return new TraceAnnotationVisitor(av, p);
+ }
+
+ @Override
+ public void visitCode() {
+ p.visitCode();
+ super.visitCode();
+ }
+
+ @Override
+ public void visitFrame(
+ final int type,
+ final int nLocal,
+ final Object[] local,
+ final int nStack,
+ final Object[] stack)
+ {
+ p.visitFrame(type, nLocal, local, nStack, stack);
+ super.visitFrame(type, nLocal, local, nStack, stack);
+ }
+
+ @Override
+ public void visitInsn(final int opcode) {
+ p.visitInsn(opcode);
+ super.visitInsn(opcode);
+ }
+
+ @Override
+ public void visitIntInsn(final int opcode, final int operand) {
+ p.visitIntInsn(opcode, operand);
+ super.visitIntInsn(opcode, operand);
+ }
+
+ @Override
+ public void visitVarInsn(final int opcode, final int var) {
+ p.visitVarInsn(opcode, var);
+ super.visitVarInsn(opcode, var);
+ }
+
+ @Override
+ public void visitTypeInsn(final int opcode, final String type) {
+ p.visitTypeInsn(opcode, type);
+ super.visitTypeInsn(opcode, type);
+ }
+
+ @Override
+ public void visitFieldInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ p.visitFieldInsn(opcode, owner, name, desc);
+ super.visitFieldInsn(opcode, owner, name, desc);
+ }
+
+ @Override
+ public void visitMethodInsn(
+ final int opcode,
+ final String owner,
+ final String name,
+ final String desc)
+ {
+ p.visitMethodInsn(opcode, owner, name, desc);
+ super.visitMethodInsn(opcode, owner, name, desc);
+ }
+
+ @Override
+ public void visitInvokeDynamicInsn(
+ String name,
+ String desc,
+ Handle bsm,
+ Object... bsmArgs)
+ {
+ p.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs);
+ }
+
+ @Override
+ public void visitJumpInsn(final int opcode, final Label label) {
+ p.visitJumpInsn(opcode, label);
+ super.visitJumpInsn(opcode, label);
+ }
+
+ @Override
+ public void visitLabel(final Label label) {
+ p.visitLabel(label);
+ super.visitLabel(label);
+ }
+
+ @Override
+ public void visitLdcInsn(final Object cst) {
+ p.visitLdcInsn(cst);
+ super.visitLdcInsn(cst);
+ }
+
+ @Override
+ public void visitIincInsn(final int var, final int increment) {
+ p.visitIincInsn(var, increment);
+ super.visitIincInsn(var, increment);
+ }
+
+ @Override
+ public void visitTableSwitchInsn(
+ final int min,
+ final int max,
+ final Label dflt,
+ final Label... labels)
+ {
+ p.visitTableSwitchInsn(min, max, dflt, labels);
+ super.visitTableSwitchInsn(min, max, dflt, labels);
+ }
+
+ @Override
+ public void visitLookupSwitchInsn(
+ final Label dflt,
+ final int[] keys,
+ final Label[] labels)
+ {
+ p.visitLookupSwitchInsn(dflt, keys, labels);
+ super.visitLookupSwitchInsn(dflt, keys, labels);
+ }
+
+ @Override
+ public void visitMultiANewArrayInsn(final String desc, final int dims) {
+ p.visitMultiANewArrayInsn(desc, dims);
+ super.visitMultiANewArrayInsn(desc, dims);
+ }
+
+ @Override
+ public void visitTryCatchBlock(
+ final Label start,
+ final Label end,
+ final Label handler,
+ final String type)
+ {
+ p.visitTryCatchBlock(start, end, handler, type);
+ super.visitTryCatchBlock(start, end, handler, type);
+ }
+
+ @Override
+ public void visitLocalVariable(
+ final String name,
+ final String desc,
+ final String signature,
+ final Label start,
+ final Label end,
+ final int index)
+ {
+ p.visitLocalVariable(name, desc, signature, start, end, index);
+ super.visitLocalVariable(name, desc, signature, start, end, index);
+ }
+
+ @Override
+ public void visitLineNumber(final int line, final Label start) {
+ p.visitLineNumber(line, start);
+ super.visitLineNumber(line, start);
+ }
+
+ @Override
+ public void visitMaxs(final int maxStack, final int maxLocals) {
+ p.visitMaxs(maxStack, maxLocals);
+ super.visitMaxs(maxStack, maxLocals);
+ }
+
+ @Override
+ public void visitEnd() {
+ p.visitMethodEnd();
+ super.visitEnd();
+ }
+}
diff --git a/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
new file mode 100644
index 0000000..8244bcf
--- /dev/null
+++ b/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -0,0 +1,347 @@
+/*
+ * 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2011 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jdk.internal.org.objectweb.asm.util;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+
+/**
+ * A {@link SignatureVisitor} that prints a disassembled view of the signature
+ * it visits.
+ *
+ * @author Eugene Kuleshov
+ * @author Eric Bruneton
+ */
+public final class TraceSignatureVisitor extends SignatureVisitor {
+
+ private final StringBuffer declaration;
+
+ private boolean isInterface;
+
+ private boolean seenFormalParameter;
+
+ private boolean seenInterfaceBound;
+
+ private boolean seenParameter;
+
+ private boolean seenInterface;
+
+ private StringBuffer returnType;
+
+ private StringBuffer exceptions;
+
+ /**
+ * Stack used to keep track of class types that have arguments. Each element
+ * of this stack is a boolean encoded in one bit. The top of the stack is
+ * the lowest order bit. Pushing false = *2, pushing true = *2+1, popping =
+ * /2.
+ */
+ private int argumentStack;
+
+ /**
+ * Stack used to keep track of array class types. Each element of this stack
+ * is a boolean encoded in one bit. The top of the stack is the lowest order
+ * bit. Pushing false = *2, pushing true = *2+1, popping = /2.
+ */
+ private int arrayStack;
+
+ private String separator = "";
+
+ public TraceSignatureVisitor(final int access) {
+ super(Opcodes.ASM4);
+ isInterface = (access & Opcodes.ACC_INTERFACE) != 0;
+ this.declaration = new StringBuffer();
+ }
+
+ private TraceSignatureVisitor(final StringBuffer buf) {
+ super(Opcodes.ASM4);
+ this.declaration = buf;
+ }
+
+ @Override
+ public void visitFormalTypeParameter(final String name) {
+ declaration.append(seenFormalParameter ? ", " : "<").append(name);
+ seenFormalParameter = true;
+ seenInterfaceBound = false;
+ }
+
+ @Override
+ public SignatureVisitor visitClassBound() {
+ separator = " extends ";
+ startType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterfaceBound() {
+ separator = seenInterfaceBound ? ", " : " extends ";
+ seenInterfaceBound = true;
+ startType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitSuperclass() {
+ endFormals();
+ separator = " extends ";
+ startType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitInterface() {
+ separator = seenInterface ? ", " : isInterface
+ ? " extends "
+ : " implements ";
+ seenInterface = true;
+ startType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitParameterType() {
+ endFormals();
+ if (seenParameter) {
+ declaration.append(", ");
+ } else {
+ seenParameter = true;
+ declaration.append('(');
+ }
+ startType();
+ return this;
+ }
+
+ @Override
+ public SignatureVisitor visitReturnType() {
+ endFormals();
+ if (seenParameter) {
+ seenParameter = false;
+ } else {
+ declaration.append('(');
+ }
+ declaration.append(')');
+ returnType = new StringBuffer();
+ return new TraceSignatureVisitor(returnType);
+ }
+
+ @Override
+ public SignatureVisitor visitExceptionType() {
+ if (exceptions == null) {
+ exceptions = new StringBuffer();
+ } else {
+ exceptions.append(", ");
+ }
+ // startType();
+ return new TraceSignatureVisitor(exceptions);
+ }
+
+ @Override
+ public void visitBaseType(final char descriptor) {
+ switch (descriptor) {
+ case 'V':
+ declaration.append("void");
+ break;
+ case 'B':
+ declaration.append("byte");
+ break;
+ case 'J':
+ declaration.append("long");
+ break;
+ case 'Z':
+ declaration.append("boolean");
+ break;
+ case 'I':
+ declaration.append("int");
+ break;
+ case 'S':
+ declaration.append("short");
+ break;
+ case 'C':
+ declaration.append("char");
+ break;
+ case 'F':
+ declaration.append("float");
+ break;
+ // case 'D':
+ default:
+ declaration.append("double");
+ break;
+ }
+ endType();
+ }
+
+ @Override
+ public void visitTypeVariable(final String name) {
+ declaration.append(name);
+ endType();
+ }
+
+ @Override
+ public SignatureVisitor visitArrayType() {
+ startType();
+ arrayStack |= 1;
+ return this;
+ }
+
+ @Override
+ public void visitClassType(final String name) {
+ if ("java/lang/Object".equals(name)) {
+ // Map<java.lang.Object,java.util.List>
+ // or
+ // abstract public V get(Object key); (seen in Dictionary.class)
+ // should have Object
+ // but java.lang.String extends java.lang.Object is unnecessary
+ boolean needObjectClass = argumentStack % 2 != 0 || seenParameter;
+ if (needObjectClass) {
+ declaration.append(separator).append(name.replace('/', '.'));
+ }
+ } else {
+ declaration.append(separator).append(name.replace('/', '.'));
+ }
+ separator = "";
+ argumentStack *= 2;
+ }
+
+ @Override
+ public void visitInnerClassType(final String name) {
+ if (argumentStack % 2 != 0) {
+ declaration.append('>');
+ }
+ argumentStack /= 2;
+ declaration.append('.');
+ declaration.append(separator).append(name.replace('/', '.'));
+ separator = "";
+ argumentStack *= 2;
+ }
+
+ @Override
+ public void visitTypeArgument() {
+ if (argumentStack % 2 == 0) {
+ ++argumentStack;
+ declaration.append('<');
+ } else {
+ declaration.append(", ");
+ }
+ declaration.append('?');
+ }
+
+ @Override
+ public SignatureVisitor visitTypeArgument(final char tag) {
+ if (argumentStack % 2 == 0) {
+ ++argumentStack;
+ declaration.append('<');
+ } else {
+ declaration.append(", ");
+ }
+
+ if (tag == EXTENDS) {
+ declaration.append("? extends ");
+ } else if (tag == SUPER) {
+ declaration.append("? super ");
+ }
+
+ startType();
+ return this;
+ }
+
+ @Override
+ public void visitEnd() {
+ if (argumentStack % 2 != 0) {
+ declaration.append('>');
+ }
+ argumentStack /= 2;
+ endType();
+ }
+
+ public String getDeclaration() {
+ return declaration.toString();
+ }
+
+ public String getReturnType() {
+ return returnType == null ? null : returnType.toString();
+ }
+
+ public String getExceptions() {
+ return exceptions == null ? null : exceptions.toString();
+ }
+
+ // -----------------------------------------------
+
+ private void endFormals() {
+ if (seenFormalParameter) {
+ declaration.append('>');
+ seenFormalParameter = false;
+ }
+ }
+
+ private void startType() {
+ arrayStack *= 2;
+ }
+
+ private void endType() {
+ if (arrayStack % 2 == 0) {
+ arrayStack /= 2;
+ } else {
+ while (arrayStack % 2 != 0) {
+ arrayStack /= 2;
+ declaration.append("[]");
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java b/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java
index 3005a45..32624b4 100644
--- a/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java
+++ b/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -73,74 +73,14 @@
public class AnonymousClassLoader {
final Class<?> hostClass;
- // Note: Do not refactor the calls to checkHostClass unless you
- // also adjust this constant:
- private static int CHC_CALLERS = 3;
-
- public AnonymousClassLoader() {
- this.hostClass = checkHostClass(null);
- }
- public AnonymousClassLoader(Class<?> hostClass) {
- this.hostClass = checkHostClass(hostClass);
+ // Privileged constructor.
+ private AnonymousClassLoader(Class<?> hostClass) {
+ this.hostClass = hostClass;
}
- private static Class<?> getTopLevelClass(Class<?> clazz) {
- for(Class<?> outer = clazz.getDeclaringClass(); outer != null;
- outer = outer.getDeclaringClass()) {
- clazz = outer;
- }
- return clazz;
- }
-
- private static Class<?> checkHostClass(Class<?> hostClass) {
- // called only from the constructor
- // does a context-sensitive check on caller class
- // CC[0..3] = {Reflection, this.checkHostClass, this.<init>, caller}
- Class<?> caller = sun.reflect.Reflection.getCallerClass(CHC_CALLERS);
-
- if (caller == null) {
- // called from the JVM directly
- if (hostClass == null)
- return AnonymousClassLoader.class; // anything central will do
- return hostClass;
- }
-
- if (hostClass == null)
- hostClass = caller; // default value is caller itself
-
- // anonymous class will access hostClass on behalf of caller
- Class<?> callee = hostClass;
-
- if (caller == callee)
- // caller can always nominate itself to grant caller's own access rights
- return hostClass;
-
- // normalize caller and callee to their top-level classes:
- caller = getTopLevelClass(caller);
- callee = getTopLevelClass(callee);
- if (caller == callee)
- return caller;
-
- ClassLoader callerCL = caller.getClassLoader();
- if (callerCL == null) {
- // caller is trusted code, so accept the proposed hostClass
- return hostClass;
- }
-
- // %%% should do something with doPrivileged, because trusted
- // code should have a way to execute on behalf of
- // partially-trusted clients
-
- // Does the caller have the right to access the private
- // members of the callee? If not, raise an error.
- final int ACC_PRIVATE = 2;
- try {
- sun.reflect.Reflection.ensureMemberAccess(caller, callee, null, ACC_PRIVATE);
- } catch (IllegalAccessException ee) {
- throw new IllegalArgumentException(ee);
- }
-
- return hostClass;
+ public static AnonymousClassLoader make(sun.misc.Unsafe unsafe, Class<?> hostClass) {
+ if (unsafe == null) throw new NullPointerException();
+ return new AnonymousClassLoader(hostClass);
}
public Class<?> loadClass(byte[] classFile) {
@@ -249,7 +189,7 @@
private static int fakeNameCounter = 99999;
// ignore two warnings on this line:
- static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+ private static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
// preceding line requires that this class be on the boot class path
static private final Method defineAnonymousClass;
diff --git a/jdk/src/share/classes/sun/invoke/util/ValueConversions.java b/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
index bf8d033..0342080 100644
--- a/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
+++ b/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -522,12 +522,18 @@
static {
MethodHandle mh = null;
try {
- java.lang.reflect.Method m = MethodHandles.class
+ final java.lang.reflect.Method m = MethodHandles.class
.getDeclaredMethod("collectArguments",
MethodHandle.class, int.class, MethodHandle.class);
- m.setAccessible(true);
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+ m.setAccessible(true);
+ return null;
+ }
+ });
mh = IMPL_LOOKUP.unreflect(m);
- } catch (ReflectiveOperationException | SecurityException ex) {
+ } catch (ReflectiveOperationException ex) {
throw newInternalError(ex);
}
COLLECT_ARGUMENTS = mh;
diff --git a/jdk/src/share/classes/sun/misc/Service.java b/jdk/src/share/classes/sun/misc/Service.java
index 37d39b4..d74abbd 100644
--- a/jdk/src/share/classes/sun/misc/Service.java
+++ b/jdk/src/share/classes/sun/misc/Service.java
@@ -284,12 +284,20 @@
}
String cn = nextName;
nextName = null;
+ Class<?> c = null;
try {
- return service.cast(Class.forName(cn, true, loader).newInstance());
+ c = Class.forName(cn, false, loader);
} catch (ClassNotFoundException x) {
fail(service,
"Provider " + cn + " not found");
- } catch (Exception x) {
+ }
+ if (!service.isAssignableFrom(c)) {
+ fail(service,
+ "Provider " + cn + " not a subtype");
+ }
+ try {
+ return service.cast(c.newInstance());
+ } catch (Throwable x) {
fail(service,
"Provider " + cn + " could not be instantiated: " + x,
x);
diff --git a/jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java b/jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java
deleted file mode 100644
index 0347063..0000000
--- a/jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * 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 sun.net.www.protocol.gopher;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import sun.net.www.*;
-import sun.net.NetworkClient;
-import java.net.URL;
-import java.net.URLStreamHandler;
-
-import sun.security.action.GetBooleanAction;
-
-/** Class to maintain the state of a gopher fetch and handle the protocol */
-public class GopherClient extends NetworkClient implements Runnable {
-
- /* The following three data members are left in for binary
- * backwards-compatibility. Unfortunately, HotJava sets them directly
- * when it wants to change the settings. The new design has us not
- * cache these, so this is unnecessary, but eliminating the data members
- * would break HJB 1.1 under JDK 1.2.
- *
- * These data members are not used, and their values are meaningless.
- * REMIND: Take them out for JDK 2.0!
- */
-
- /**
- * @deprecated
- */
- @Deprecated
- public static boolean useGopherProxy;
-
- /**
- * @deprecated
- */
- @Deprecated
- public static String gopherProxyHost;
-
- /**
- * @deprecated
- */
- @Deprecated
- public static int gopherProxyPort;
-
-
- static {
- useGopherProxy = java.security.AccessController.doPrivileged(
- new sun.security.action.GetBooleanAction("gopherProxySet"))
- .booleanValue();
-
- gopherProxyHost = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("gopherProxyHost"));
-
- gopherProxyPort = java.security.AccessController.doPrivileged(
- new sun.security.action.GetIntegerAction("gopherProxyPort", 80))
- .intValue();
- }
-
- PipedOutputStream os;
- URL u;
- int gtype;
- String gkey;
- sun.net.www.URLConnection connection;
-
- GopherClient(sun.net.www.URLConnection connection) {
- this.connection = connection;
- }
-
- /**
- * @return true if gopher connections should go through a proxy, according
- * to system properties.
- */
- public static boolean getUseGopherProxy() {
- return java.security.AccessController.doPrivileged(
- new GetBooleanAction("gopherProxySet")).booleanValue();
- }
-
- /**
- * @return the proxy host to use, or null if nothing is set.
- */
- public static String getGopherProxyHost() {
- String host = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("gopherProxyHost"));
- if ("".equals(host)) {
- host = null;
- }
- return host;
- }
-
- /**
- * @return the proxy port to use. Will default reasonably.
- */
- public static int getGopherProxyPort() {
- return java.security.AccessController.doPrivileged(
- new sun.security.action.GetIntegerAction("gopherProxyPort", 80))
- .intValue();
- }
-
- /** Given a url, setup to fetch the gopher document it refers to */
- InputStream openStream(URL u) throws IOException {
- this.u = u;
- this.os = os;
- int i = 0;
- String s = u.getFile();
- int limit = s.length();
- int c = '1';
- while (i < limit && (c = s.charAt(i)) == '/')
- i++;
- gtype = c == '/' ? '1' : c;
- if (i < limit)
- i++;
- gkey = s.substring(i);
-
- openServer(u.getHost(), u.getPort() <= 0 ? 70 : u.getPort());
-
- MessageHeader msgh = new MessageHeader();
-
- switch (gtype) {
- case '0':
- case '7':
- msgh.add("content-type", "text/plain");
- break;
- case '1':
- msgh.add("content-type", "text/html");
- break;
- case 'g':
- case 'I':
- msgh.add("content-type", "image/gif");
- break;
- default:
- msgh.add("content-type", "content/unknown");
- break;
- }
- if (gtype != '7') {
- serverOutput.print(decodePercent(gkey) + "\r\n");
- serverOutput.flush();
- } else if ((i = gkey.indexOf('?')) >= 0) {
- serverOutput.print(decodePercent(gkey.substring(0, i) + "\t" +
- gkey.substring(i + 1) + "\r\n"));
- serverOutput.flush();
- msgh.add("content-type", "text/html");
- } else {
- msgh.add("content-type", "text/html");
- }
- connection.setProperties(msgh);
- if (msgh.findValue("content-type") == "text/html") {
- os = new PipedOutputStream();
- PipedInputStream ret = new PipedInputStream();
- ret.connect(os);
- new Thread(this).start();
- return ret;
- }
- return new GopherInputStream(this, serverInput);
- }
-
- /** Translate all the instances of %NN into the character they represent */
- private String decodePercent(String s) {
- if (s == null || s.indexOf('%') < 0)
- return s;
- int limit = s.length();
- char d[] = new char[limit];
- int dp = 0;
- for (int sp = 0; sp < limit; sp++) {
- int c = s.charAt(sp);
- if (c == '%' && sp + 2 < limit) {
- int s1 = s.charAt(sp + 1);
- int s2 = s.charAt(sp + 2);
- if ('0' <= s1 && s1 <= '9')
- s1 = s1 - '0';
- else if ('a' <= s1 && s1 <= 'f')
- s1 = s1 - 'a' + 10;
- else if ('A' <= s1 && s1 <= 'F')
- s1 = s1 - 'A' + 10;
- else
- s1 = -1;
- if ('0' <= s2 && s2 <= '9')
- s2 = s2 - '0';
- else if ('a' <= s2 && s2 <= 'f')
- s2 = s2 - 'a' + 10;
- else if ('A' <= s2 && s2 <= 'F')
- s2 = s2 - 'A' + 10;
- else
- s2 = -1;
- if (s1 >= 0 && s2 >= 0) {
- c = (s1 << 4) | s2;
- sp += 2;
- }
- }
- d[dp++] = (char) c;
- }
- return new String(d, 0, dp);
- }
-
- /** Turn special characters into the %NN form */
- private String encodePercent(String s) {
- if (s == null)
- return s;
- int limit = s.length();
- char d[] = null;
- int dp = 0;
- for (int sp = 0; sp < limit; sp++) {
- int c = s.charAt(sp);
- if (c <= ' ' || c == '"' || c == '%') {
- if (d == null)
- d = s.toCharArray();
- if (dp + 3 >= d.length) {
- char nd[] = new char[dp + 10];
- System.arraycopy(d, 0, nd, 0, dp);
- d = nd;
- }
- d[dp] = '%';
- int dig = (c >> 4) & 0xF;
- d[dp + 1] = (char) (dig < 10 ? '0' + dig : 'A' - 10 + dig);
- dig = c & 0xF;
- d[dp + 2] = (char) (dig < 10 ? '0' + dig : 'A' - 10 + dig);
- dp += 3;
- } else {
- if (d != null) {
- if (dp >= d.length) {
- char nd[] = new char[dp + 10];
- System.arraycopy(d, 0, nd, 0, dp);
- d = nd;
- }
- d[dp] = (char) c;
- }
- dp++;
- }
- }
- return d == null ? s : new String(d, 0, dp);
- }
-
- /** This method is run as a seperate thread when an incoming gopher
- document requires translation to html */
- public void run() {
- int qpos = -1;
- try {
- if (gtype == '7' && (qpos = gkey.indexOf('?')) < 0) {
- PrintStream ps = new PrintStream(os, false, encoding);
- ps.print("<html><head><title>Searchable Gopher Index</title></head>\n<body><h1>Searchable Gopher Index</h1><isindex>\n</body></html>\n");
- } else if (gtype != '1' && gtype != '7') {
- byte buf[] = new byte[2048];
- try {
- int n;
- while ((n = serverInput.read(buf)) >= 0)
- os.write(buf, 0, n);
- } catch(Exception e) {
- }
- } else {
- PrintStream ps = new PrintStream(os, false, encoding);
- String title = null;
- if (gtype == '7')
- title = "Results of searching for \"" + gkey.substring(qpos + 1)
- + "\" on " + u.getHost();
- else
- title = "Gopher directory " + gkey + " from " + u.getHost();
- ps.print("<html><head><title>");
- ps.print(title);
- ps.print("</title></head>\n<body>\n<H1>");
- ps.print(title);
- ps.print("</h1><dl compact>\n");
- BufferedReader ds = new BufferedReader(new InputStreamReader(serverInput));
- String s;
- while ((s = ds.readLine()) != null) {
- int len = s.length();
- while (len > 0 && s.charAt(len - 1) <= ' ')
- len--;
- if (len <= 0)
- continue;
- int key = s.charAt(0);
- int t1 = s.indexOf('\t');
- int t2 = t1 > 0 ? s.indexOf('\t', t1 + 1) : -1;
- int t3 = t2 > 0 ? s.indexOf('\t', t2 + 1) : -1;
- if (t3 < 0) {
- // ps.print("<br><i>"+s+"</i>\n");
- continue;
- }
- String port = t3 + 1 < len ? ":" + s.substring(t3 + 1, len) : "";
- String host = t2 + 1 < t3 ? s.substring(t2 + 1, t3) : u.getHost();
- ps.print("<dt><a href=\"gopher://" + host + port + "/"
- + s.substring(0, 1) + encodePercent(s.substring(t1 + 1, t2)) + "\">\n");
- ps.print("<img align=middle border=0 width=25 height=32 src=");
- switch (key) {
- default:
- ps.print(System.getProperty("java.net.ftp.imagepath.file"));
- break;
- case '0':
- ps.print(System.getProperty("java.net.ftp.imagepath.text"));
- break;
- case '1':
- ps.print(System.getProperty("java.net.ftp.imagepath.directory"));
- break;
- case 'g':
- ps.print(System.getProperty("java.net.ftp.imagepath.gif"));
- break;
- }
- ps.print(".gif align=middle><dd>\n");
- ps.print(s.substring(1, t1) + "</a>\n");
- }
- ps.print("</dl></body>\n");
- ps.close();
- }
-
- } catch (UnsupportedEncodingException e) {
- throw new InternalError(encoding+ " encoding not found", e);
- } catch (IOException e) {
- } finally {
- try {
- closeServer();
- os.close();
- } catch (IOException e2) {
- }
- }
- }
-}
-
-/** An input stream that does nothing more than hold on to the NetworkClient
- that created it. This is used when only the input stream is needed, and
- the network client needs to be closed when the input stream is closed. */
-class GopherInputStream extends FilterInputStream {
- NetworkClient parent;
-
- GopherInputStream(NetworkClient o, InputStream fd) {
- super(fd);
- parent = o;
- }
-
- public void close() {
- try {
- parent.closeServer();
- super.close();
- } catch (IOException e) {
- }
- }
-}
diff --git a/jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java b/jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java
deleted file mode 100644
index 8009859..0000000
--- a/jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
- * 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 sun.net.www.protocol.gopher;
-
-import java.io.*;
-import java.util.*;
-import sun.net.NetworkClient;
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.Proxy;
-import java.net.InetSocketAddress;
-import java.net.SocketPermission;
-import java.security.Permission;
-import sun.net.www.protocol.http.HttpURLConnection;
-
-/**
- * A class to handle the gopher protocol.
- */
-
-public class Handler extends java.net.URLStreamHandler {
-
- protected int getDefaultPort() {
- return 70;
- }
-
- public java.net.URLConnection openConnection(URL u)
- throws IOException {
- return openConnection(u, null);
- }
-
- public java.net.URLConnection openConnection(URL u, Proxy p)
- throws IOException {
-
-
- /* if set for proxy usage then go through the http code to get */
- /* the url connection. */
- if (p == null && GopherClient.getUseGopherProxy()) {
- String host = GopherClient.getGopherProxyHost();
- if (host != null) {
- InetSocketAddress saddr = InetSocketAddress.createUnresolved(host, GopherClient.getGopherProxyPort());
-
- p = new Proxy(Proxy.Type.HTTP, saddr);
- }
- }
- if (p != null) {
- return new HttpURLConnection(u, p);
- }
-
- return new GopherURLConnection(u);
- }
-}
-
-class GopherURLConnection extends sun.net.www.URLConnection {
-
- Permission permission;
-
- GopherURLConnection(URL u) {
- super(u);
- }
-
- public void connect() throws IOException {
- }
-
- public InputStream getInputStream() throws IOException {
- return new GopherClient(this).openStream(url);
- }
-
- public Permission getPermission() {
- if (permission == null) {
- int port = url.getPort();
- port = port < 0 ? 70 : port;
- String host = url.getHost() + ":" + url.getPort();
- permission = new SocketPermission(host, "connect");
- }
- return permission;
- }
-}
diff --git a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
index 34579c2..e086f79c 100644
--- a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
+++ b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
@@ -405,7 +405,8 @@
*/
perms.add(new SocketPermission("*", "connect,accept"));
- perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*"));
+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
perms.add(new FilePermission("<<ALL FILES>>", "read"));
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
index c985887..780b930 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
@@ -348,7 +348,7 @@
* Returns path name of the credentials cache file.
* The path name is searched in the following order:
*
- * 1. KRB5CCNAME
+ * 1. KRB5CCNAME (bare file name without FILE:)
* 2. /tmp/krb5cc_<uid> on unix systems
* 3. <user.home>/krb5cc_<user.name>
* 4. <user.home>/krb5cc (if can't get <user.name>)
@@ -359,11 +359,19 @@
String stdCacheNameComponent = "krb5cc";
String name;
+ // The env var can start with TYPE:, we only support FILE: here.
+ // http://docs.oracle.com/cd/E19082-01/819-2252/6n4i8rtr3/index.html
name = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<String>() {
@Override
public String run() {
- return System.getenv("KRB5CCNAME");
+ String cache = System.getenv("KRB5CCNAME");
+ if (cache != null &&
+ (cache.length() >= 5) &&
+ cache.regionMatches(true, 0, "FILE:", 0, 5)) {
+ cache = cache.substring(5);
+ }
+ return cache;
}
});
if (name != null) {
diff --git a/jdk/src/share/classes/sun/security/provider/SecureRandom.java b/jdk/src/share/classes/sun/security/provider/SecureRandom.java
index e79e9d7..fa88334 100644
--- a/jdk/src/share/classes/sun/security/provider/SecureRandom.java
+++ b/jdk/src/share/classes/sun/security/provider/SecureRandom.java
@@ -56,12 +56,6 @@
private static final long serialVersionUID = 3581829991155417889L;
- /**
- * This static object will be seeded by SeedGenerator, and used
- * to seed future instances of SecureRandom
- */
- private static SecureRandom seeder;
-
private static final int DIGEST_SIZE = 20;
private transient MessageDigest digest;
private byte[] state;
@@ -173,6 +167,28 @@
}
/**
+ * This static object will be seeded by SeedGenerator, and used
+ * to seed future instances of SHA1PRNG SecureRandoms.
+ *
+ * Bloch, Effective Java Second Edition: Item 71
+ */
+ private static class SeederHolder {
+
+ private static final SecureRandom seeder;
+
+ static {
+ /*
+ * Call to SeedGenerator.generateSeed() to add additional
+ * seed material (likely from the Native implementation).
+ */
+ seeder = new SecureRandom(SeedGenerator.getSystemEntropy());
+ byte [] b = new byte[DIGEST_SIZE];
+ SeedGenerator.generateSeed(b);
+ seeder.engineSetSeed(b);
+ }
+ }
+
+ /**
* Generates a user-specified number of random bytes.
*
* @param bytes the array to be filled in with random bytes.
@@ -183,13 +199,8 @@
byte[] output = remainder;
if (state == null) {
- if (seeder == null) {
- seeder = new SecureRandom(SeedGenerator.getSystemEntropy());
- seeder.engineSetSeed(engineGenerateSeed(DIGEST_SIZE));
- }
-
byte[] seed = new byte[DIGEST_SIZE];
- seeder.engineNextBytes(seed);
+ SeederHolder.seeder.engineNextBytes(seed);
state = digest.digest(seed);
}
diff --git a/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
index ef7503b..1542585 100644
--- a/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,7 +23,6 @@
* questions.
*/
-
package sun.security.ssl;
import java.io.*;
@@ -55,16 +54,25 @@
* recurse infinitely ... e.g. close() calling itself, or doing
* I/O in terms of our own streams.
*/
- final Socket self;
+ final private Socket self;
+ final private InputStream consumedInput;
BaseSSLSocketImpl() {
super();
this.self = this;
+ this.consumedInput = null;
}
BaseSSLSocketImpl(Socket socket) {
super();
this.self = socket;
+ this.consumedInput = null;
+ }
+
+ BaseSSLSocketImpl(Socket socket, InputStream consumed) {
+ super();
+ this.self = socket;
+ this.consumedInput = consumed;
}
//
@@ -541,4 +549,57 @@
}
}
+ @Override
+ public String toString() {
+ if (self == this) {
+ return super.toString();
+ }
+
+ return self.toString();
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ if (self == this) {
+ return super.getInputStream();
+ }
+
+ if (consumedInput != null) {
+ return new SequenceInputStream(consumedInput,
+ self.getInputStream());
+ }
+
+ return self.getInputStream();
+ }
+
+ @Override
+ public OutputStream getOutputStream() throws IOException {
+ if (self == this) {
+ return super.getOutputStream();
+ }
+
+ return self.getOutputStream();
+ }
+
+ @Override
+ public synchronized void close() throws IOException {
+ if (self == this) {
+ super.close();
+ } else {
+ self.close();
+ }
+ }
+
+ @Override
+ public synchronized void setSoTimeout(int timeout) throws SocketException {
+ if (self == this) {
+ super.setSoTimeout(timeout);
+ } else {
+ self.setSoTimeout(timeout);
+ }
+ }
+
+ boolean isLayered() {
+ return (self != this);
+ }
}
diff --git a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
index 9ebeb75..d18af55 100644
--- a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
@@ -48,8 +48,6 @@
import sun.security.ssl.CipherSuite.*;
import static sun.security.ssl.CipherSuite.KeyExchange.*;
-import sun.net.util.IPAddressUtil;
-
/**
* ClientHandshaker does the protocol handshaking from the point
* of view of a client. It is driven asychronously by handshake messages
@@ -92,6 +90,9 @@
private final static boolean enableSNIExtension =
Debug.getBooleanProperty("jsse.enableSNIExtension", true);
+ private List<SNIServerName> requestedServerNames =
+ Collections.<SNIServerName>emptyList();
+
/*
* Constructors
*/
@@ -579,6 +580,7 @@
session = new SSLSessionImpl(protocolVersion, cipherSuite,
getLocalSupportedSignAlgs(),
mesg.sessionId, getHostSE(), getPortSE());
+ session.setRequestedServerNames(requestedServerNames);
setHandshakeSessionSE(session);
if (debug != null && Debug.isOn("handshake")) {
System.out.println("** " + cipherSuite);
@@ -1246,17 +1248,14 @@
// add server_name extension
if (enableSNIExtension) {
- // We cannot use the hostname resolved from name services. For
- // virtual hosting, multiple hostnames may be bound to the same IP
- // address, so the hostname resolved from name services is not
- // reliable.
- String hostname = getRawHostnameSE();
+ if (session != null) {
+ requestedServerNames = session.getRequestedServerNames();
+ } else {
+ requestedServerNames = serverNames;
+ }
- // we only allow FQDN
- if (hostname != null && hostname.indexOf('.') > 0 &&
- !IPAddressUtil.isIPv4LiteralAddress(hostname) &&
- !IPAddressUtil.isIPv6LiteralAddress(hostname)) {
- clientHelloMessage.addServerNameIndicationExtension(hostname);
+ if (!requestedServerNames.isEmpty()) {
+ clientHelloMessage.addSNIExtension(requestedServerNames);
}
}
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java b/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
index f6ca477..a6c0611 100644
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -121,7 +121,8 @@
r.mark(readlimit);
}
- public void reset() {
+ @Override
+ public void reset() throws IOException {
r.reset();
}
@@ -190,6 +191,7 @@
byte[] getBytes8() throws IOException {
int len = getInt8();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
@@ -198,6 +200,7 @@
public byte[] getBytes16() throws IOException {
int len = getInt16();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
@@ -206,10 +209,19 @@
byte[] getBytes24() throws IOException {
int len = getInt24();
+ verifyLength(len);
byte b[] = new byte[len];
read(b, 0, len);
return b;
}
+ // Is a length greater than available bytes in the record?
+ private void verifyLength(int len) throws SSLException {
+ if (len > available()) {
+ throw new SSLException(
+ "Not enough data to fill declared vector size");
+ }
+ }
+
}
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
index c4cca9e..7467735 100644
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
@@ -256,13 +256,9 @@
}
// add server_name extension
- void addServerNameIndicationExtension(String hostname) {
- // We would have checked that the hostname ia a FQDN.
- ArrayList<String> hostnames = new ArrayList<>(1);
- hostnames.add(hostname);
-
+ void addSNIExtension(List<SNIServerName> serverNames) {
try {
- extensions.add(new ServerNameExtension(hostnames));
+ extensions.add(new ServerNameExtension(serverNames));
} catch (IOException ioe) {
// ignore the exception and return
}
diff --git a/jdk/src/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
index 4fb7fec..834f4c0 100644
--- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -112,6 +112,12 @@
*/
private CipherSuiteList activeCipherSuites;
+ // The server name indication and matchers
+ List<SNIServerName> serverNames =
+ Collections.<SNIServerName>emptyList();
+ Collection<SNIMatcher> sniMatchers =
+ Collections.<SNIMatcher>emptyList();
+
private boolean isClient;
private boolean needCertVerify;
@@ -287,14 +293,7 @@
}
}
- String getRawHostnameSE() {
- if (conn != null) {
- return conn.getRawHostname();
- } else {
- return engine.getPeerHost();
- }
- }
-
+ // ONLY used by ClientHandshaker to setup the peer host in SSLSession.
String getHostSE() {
if (conn != null) {
return conn.getHost();
@@ -303,6 +302,7 @@
}
}
+ // ONLY used by ServerHandshaker to setup the peer host in SSLSession.
String getHostAddressSE() {
if (conn != null) {
return conn.getInetAddress().getHostAddress();
@@ -436,6 +436,22 @@
}
/**
+ * Sets the server name indication of the handshake.
+ */
+ void setSNIServerNames(List<SNIServerName> serverNames) {
+ // The serverNames parameter is unmodifiable.
+ this.serverNames = serverNames;
+ }
+
+ /**
+ * Sets the server name matchers of the handshaking.
+ */
+ void setSNIMatchers(Collection<SNIMatcher> sniMatchers) {
+ // The sniMatchers parameter is unmodifiable.
+ this.sniMatchers = sniMatchers;
+ }
+
+ /**
* Prior to handshaking, activate the handshake and initialize the version,
* input stream and output stream.
*/
@@ -1063,7 +1079,6 @@
if (debug != null && Debug.isOn("handshake")) {
System.out.println("RSA master secret generation error:");
e.printStackTrace(System.out);
- System.out.println("Generating new random premaster secret");
}
if (requestedVersion != null) {
@@ -1130,7 +1145,6 @@
System.out.println("RSA PreMasterSecret version error: expected"
+ protocolVersion + " or " + requestedVersion + ", decrypted: "
+ premasterVersion);
- System.out.println("Generating new random premaster secret");
}
preMasterSecret =
RSAClientKeyExchange.generateDummySecret(requestedVersion);
diff --git a/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java b/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
index 9db6927..ea769fd 100644
--- a/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
+++ b/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -28,11 +28,10 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.*;
-
+import javax.net.ssl.*;
+import java.nio.charset.StandardCharsets;
import java.security.spec.ECParameterSpec;
-import javax.net.ssl.SSLProtocolException;
-
/**
* This file contains all the classes relevant to TLS Extensions for the
* ClientHello and ServerHello messages. The extension mechanism and
@@ -274,11 +273,11 @@
}
/*
- * [RFC4366] To facilitate secure connections to servers that host multiple
- * 'virtual' servers at a single underlying network address, clients MAY
- * include an extension of type "server_name" in the (extended) client hello.
- * The "extension_data" field of this extension SHALL contain "ServerNameList"
- * where:
+ * [RFC 4366/6066] To facilitate secure connections to servers that host
+ * multiple 'virtual' servers at a single underlying network address, clients
+ * MAY include an extension of type "server_name" in the (extended) client
+ * hello. The "extension_data" field of this extension SHALL contain
+ * "ServerNameList" where:
*
* struct {
* NameType name_type;
@@ -299,44 +298,47 @@
*/
final class ServerNameExtension extends HelloExtension {
- final static int NAME_HOST_NAME = 0;
-
- private List<ServerName> names;
+ // For backward compatibility, all future data structures associated with
+ // new NameTypes MUST begin with a 16-bit length field.
+ final static int NAME_HEADER_LENGTH = 3; // NameType: 1 byte
+ // Name length: 2 bytes
+ private Map<Integer, SNIServerName> sniMap;
private int listLength; // ServerNameList length
- ServerNameExtension(List<String> hostnames) throws IOException {
+ // constructor for ServerHello
+ ServerNameExtension() throws IOException {
super(ExtensionType.EXT_SERVER_NAME);
listLength = 0;
- names = new ArrayList<ServerName>(hostnames.size());
- for (String hostname : hostnames) {
- if (hostname != null && hostname.length() != 0) {
- // we only support DNS hostname now.
- ServerName serverName =
- new ServerName(NAME_HOST_NAME, hostname);
- names.add(serverName);
- listLength += serverName.length;
+ sniMap = Collections.<Integer, SNIServerName>emptyMap();
+ }
+
+ // constructor for ClientHello
+ ServerNameExtension(List<SNIServerName> serverNames)
+ throws IOException {
+ super(ExtensionType.EXT_SERVER_NAME);
+
+ listLength = 0;
+ sniMap = new LinkedHashMap<>();
+ for (SNIServerName serverName : serverNames) {
+ // check for duplicated server name type
+ if (sniMap.put(serverName.getType(), serverName) != null) {
+ // unlikely to happen, but in case ...
+ throw new RuntimeException(
+ "Duplicated server name of type " + serverName.getType());
}
+
+ listLength += serverName.getEncoded().length + NAME_HEADER_LENGTH;
}
- // As we only support DNS hostname now, the hostname list must
- // not contain more than one hostname
- if (names.size() > 1) {
- throw new SSLProtocolException(
- "The ServerNameList MUST NOT contain more than " +
- "one name of the same name_type");
- }
-
- // We only need to add "server_name" extension in ClientHello unless
- // we support SNI in server side in the future. It is possible that
- // the SNI is empty in ServerHello. As we don't support SNI in
- // ServerHello now, we will throw exception for empty list for now.
+ // This constructor is used for ClientHello only. Empty list is
+ // not allowed in client mode.
if (listLength == 0) {
- throw new SSLProtocolException(
- "The ServerNameList cannot be empty");
+ throw new RuntimeException("The ServerNameList cannot be empty");
}
}
+ // constructor for ServerHello for parsing SNI extension
ServerNameExtension(HandshakeInStream s, int len)
throws IOException {
super(ExtensionType.EXT_SERVER_NAME);
@@ -350,17 +352,54 @@
}
remains -= 2;
- names = new ArrayList<ServerName>();
+ sniMap = new LinkedHashMap<>();
while (remains > 0) {
- ServerName name = new ServerName(s);
- names.add(name);
- remains -= name.length;
+ int code = s.getInt8(); // NameType
- // we may need to check the duplicated ServerName type
+ // HostName (length read in getBytes16);
+ byte[] encoded = s.getBytes16();
+ SNIServerName serverName;
+ switch (code) {
+ case StandardConstants.SNI_HOST_NAME:
+ if (encoded.length == 0) {
+ throw new SSLProtocolException(
+ "Empty HostName in server name indication");
+ }
+ try {
+ serverName = new SNIHostName(encoded);
+ } catch (IllegalArgumentException iae) {
+ SSLProtocolException spe = new SSLProtocolException(
+ "Illegal server name, type=host_name(" +
+ code + "), name=" +
+ (new String(encoded, StandardCharsets.UTF_8)) +
+ ", value=" + Debug.toString(encoded));
+ spe.initCause(iae);
+ throw spe;
+ }
+ break;
+ default:
+ try {
+ serverName = new UnknownServerName(code, encoded);
+ } catch (IllegalArgumentException iae) {
+ SSLProtocolException spe = new SSLProtocolException(
+ "Illegal server name, type=(" + code +
+ "), value=" + Debug.toString(encoded));
+ spe.initCause(iae);
+ throw spe;
+ }
+ }
+ // check for duplicated server name type
+ if (sniMap.put(serverName.getType(), serverName) != null) {
+ throw new SSLProtocolException(
+ "Duplicated server name of type " +
+ serverName.getType());
+ }
+
+ remains -= encoded.length + NAME_HEADER_LENGTH;
}
} else if (len == 0) { // "server_name" extension in ServerHello
listLength = 0;
- names = Collections.<ServerName>emptyList();
+ sniMap = Collections.<Integer, SNIServerName>emptyMap();
}
if (remains != 0) {
@@ -368,39 +407,72 @@
}
}
- static class ServerName {
- final int length;
- final int type;
- final byte[] data;
- final String hostname;
-
- ServerName(int type, String hostname) throws IOException {
- this.type = type; // NameType
- this.hostname = hostname;
- this.data = hostname.getBytes("UTF8"); // HostName
- this.length = data.length + 3; // NameType: 1 byte
- // HostName length: 2 bytes
+ List<SNIServerName> getServerNames() {
+ if (sniMap != null && !sniMap.isEmpty()) {
+ return Collections.<SNIServerName>unmodifiableList(
+ new ArrayList<>(sniMap.values()));
}
- ServerName(HandshakeInStream s) throws IOException {
- type = s.getInt8(); // NameType
- data = s.getBytes16(); // HostName (length read in getBytes16)
- length = data.length + 3; // NameType: 1 byte
- // HostName length: 2 bytes
- if (type == NAME_HOST_NAME) {
- hostname = new String(data, "UTF8");
- } else {
- hostname = null;
+ return Collections.<SNIServerName>emptyList();
+ }
+
+ /*
+ * Is the extension recognized by the corresponding matcher?
+ *
+ * This method is used to check whether the server name indication can
+ * be recognized by the server name matchers.
+ *
+ * Per RFC 6066, if the server understood the ClientHello extension but
+ * does not recognize the server name, the server SHOULD take one of two
+ * actions: either abort the handshake by sending a fatal-level
+ * unrecognized_name(112) alert or continue the handshake.
+ *
+ * If there is an instance of SNIMatcher defined for a particular name
+ * type, it must be used to perform match operations on the server name.
+ */
+ boolean isMatched(Collection<SNIMatcher> matchers) {
+ if (sniMap != null && !sniMap.isEmpty()) {
+ for (SNIMatcher matcher : matchers) {
+ SNIServerName sniName = sniMap.get(matcher.getType());
+ if (sniName != null && (!matcher.matches(sniName))) {
+ return false;
+ }
}
}
- public String toString() {
- if (type == NAME_HOST_NAME) {
- return "host_name: " + hostname;
- } else {
- return "unknown-" + type + ": " + Debug.toString(data);
+ return true;
+ }
+
+ /*
+ * Is the extension is identical to a server name list?
+ *
+ * This method is used to check the server name indication during session
+ * resumption.
+ *
+ * Per RFC 6066, when the server is deciding whether or not to accept a
+ * request to resume a session, the contents of a server_name extension
+ * MAY be used in the lookup of the session in the session cache. The
+ * client SHOULD include the same server_name extension in the session
+ * resumption request as it did in the full handshake that established
+ * the session. A server that implements this extension MUST NOT accept
+ * the request to resume the session if the server_name extension contains
+ * a different name. Instead, it proceeds with a full handshake to
+ * establish a new session. When resuming a session, the server MUST NOT
+ * include a server_name extension in the server hello.
+ */
+ boolean isIdentical(List<SNIServerName> other) {
+ if (other.size() == sniMap.size()) {
+ for(SNIServerName sniInOther : other) {
+ SNIServerName sniName = sniMap.get(sniInOther.getType());
+ if (sniName == null || !sniInOther.equals(sniName)) {
+ return false;
+ }
}
+
+ return true;
}
+
+ return false;
}
int length() {
@@ -409,25 +481,34 @@
void send(HandshakeOutStream s) throws IOException {
s.putInt16(type.id);
- s.putInt16(listLength + 2);
- if (listLength != 0) {
- s.putInt16(listLength);
+ if (listLength == 0) {
+ s.putInt16(listLength); // in ServerHello, empty extension_data
+ } else {
+ s.putInt16(listLength + 2); // length of extension_data
+ s.putInt16(listLength); // length of ServerNameList
- for (ServerName name : names) {
- s.putInt8(name.type); // NameType
- s.putBytes16(name.data); // HostName
+ for (SNIServerName sniName : sniMap.values()) {
+ s.putInt8(sniName.getType()); // server name type
+ s.putBytes16(sniName.getEncoded()); // server name value
}
}
}
public String toString() {
StringBuffer buffer = new StringBuffer();
- for (ServerName name : names) {
- buffer.append("[" + name + "]");
+ for (SNIServerName sniName : sniMap.values()) {
+ buffer.append("[" + sniName + "]");
}
return "Extension " + type + ", server_name: " + buffer;
}
+
+ private static class UnknownServerName extends SNIServerName {
+ UnknownServerName(int code, byte[] encoded) {
+ super(code, encoded);
+ }
+ }
+
}
final class SupportedEllipticCurvesExtension extends HelloExtension {
diff --git a/jdk/src/share/classes/sun/security/ssl/ProtocolList.java b/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
index a57a9bd..2a4bbee 100644
--- a/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
+++ b/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -79,7 +79,7 @@
throw new IllegalArgumentException("Protocols may not be null");
}
- ArrayList<ProtocolVersion> versions = new ArrayList<>(3);
+ ArrayList<ProtocolVersion> versions = new ArrayList<>(names.length);
for (int i = 0; i < names.length; i++ ) {
ProtocolVersion version = ProtocolVersion.valueOf(names[i]);
if (versions.contains(version) == false) {
diff --git a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 1c0d692..36fda8c 100644
--- a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -36,6 +36,7 @@
import javax.net.ssl.*;
import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
+import sun.security.util.KeyLength;
/**
* This is the client key exchange message (CLIENT --> SERVER) used with
@@ -192,26 +193,38 @@
"unable to get the plaintext of the premaster secret");
}
- // We are not always able to get the encoded key of the
- // premaster secret. Pass the cheking to master secret
+ int keySize = KeyLength.getKeySize(secretKey);
+ if (keySize > 0 && keySize != 384) { // 384 = 48 * 8
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println(
+ "incorrect length of premaster secret: " +
+ (keySize/8));
+ }
+
+ return generateDummySecret(clientHelloVersion);
+ }
+
+ // The key size is exactly 48 bytes or not accessible.
+ //
+ // Conservatively, pass the checking to master secret
// calculation.
return secretKey;
} else if (encoded.length == 48) {
// check the version
if (clientHelloVersion.major == encoded[0] &&
clientHelloVersion.minor == encoded[1]) {
+
return secretKey;
- } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v) {
+ } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
+ currentVersion.major == encoded[0] &&
+ currentVersion.minor == encoded[1]) {
/*
- * we never checked the client_version in server side
- * for TLS v1.0 and SSL v3.0. For compatibility, we
- * maintain this behavior.
+ * For compatibility, we maintain the behavior that the
+ * version in pre_master_secret can be the negotiated
+ * version for TLS v1.0 and SSL v3.0.
*/
- if (currentVersion.major == encoded[0] &&
- currentVersion.minor == encoded[1]) {
- this.protocolVersion = currentVersion;
- return secretKey;
- }
+ this.protocolVersion = currentVersion;
+ return secretKey;
}
if (debug != null && Debug.isOn("handshake")) {
@@ -220,22 +233,23 @@
", while PreMasterSecret.client_version is " +
ProtocolVersion.valueOf(encoded[0], encoded[1]));
}
+
+ return generateDummySecret(clientHelloVersion);
} else {
if (debug != null && Debug.isOn("handshake")) {
System.out.println(
"incorrect length of premaster secret: " +
encoded.length);
}
+
+ return generateDummySecret(clientHelloVersion);
}
}
- if (debug != null && Debug.isOn("handshake")) {
- if (failoverException != null) {
- System.out.println("Error decrypting premaster secret:");
- failoverException.printStackTrace(System.out);
- }
-
- System.out.println("Generating random secret");
+ if (debug != null && Debug.isOn("handshake") &&
+ failoverException != null) {
+ System.out.println("Error decrypting premaster secret:");
+ failoverException.printStackTrace(System.out);
}
return generateDummySecret(clientHelloVersion);
@@ -243,6 +257,10 @@
// generate a premaster secret with the specified version number
static SecretKey generateDummySecret(ProtocolVersion version) {
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println("Generating a random fake premaster secret");
+ }
+
try {
String s = ((version.v >= ProtocolVersion.TLS12.v) ?
"SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index a396bf7..267bd55 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -27,6 +27,7 @@
import java.io.*;
import java.nio.*;
+import java.util.*;
import java.security.*;
import javax.crypto.BadPaddingException;
@@ -34,7 +35,6 @@
import javax.net.ssl.*;
import javax.net.ssl.SSLEngineResult.*;
-
/**
* Implementation of an non-blocking SSLEngine.
*
@@ -253,6 +253,12 @@
// The cryptographic algorithm constraints
private AlgorithmConstraints algorithmConstraints = null;
+ // The server name indication and matchers
+ List<SNIServerName> serverNames =
+ Collections.<SNIServerName>emptyList();
+ Collection<SNIMatcher> sniMatchers =
+ Collections.<SNIMatcher>emptyList();
+
// Have we been told whether we're client or server?
private boolean serverModeSet = false;
private boolean roleIsServer;
@@ -361,6 +367,10 @@
roleIsServer = true;
connectionState = cs_START;
+ // default server name indication
+ serverNames =
+ Utilities.addToSNIServerNameList(serverNames, getPeerHost());
+
/*
* default read and write side cipher and MAC support
*
@@ -459,11 +469,13 @@
enabledProtocols, doClientAuth,
protocolVersion, connectionState == cs_HANDSHAKE,
secureRenegotiation, clientVerifyData, serverVerifyData);
+ handshaker.setSNIMatchers(sniMatchers);
} else {
handshaker = new ClientHandshaker(this, sslContext,
enabledProtocols,
protocolVersion, connectionState == cs_HANDSHAKE,
secureRenegotiation, clientVerifyData, serverVerifyData);
+ handshaker.setSNIServerNames(serverNames);
}
handshaker.setEnabledCipherSuites(enabledCipherSuites);
handshaker.setEnableSessionCreation(enableSessionCreation);
@@ -1100,7 +1112,7 @@
// TLS requires that unrecognized records be ignored.
//
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", Received record type: "
+ inputRecord.contentType());
}
@@ -1384,7 +1396,7 @@
* for handshaking and bad_record_mac for other records.
*/
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", sequence number extremely close to overflow " +
"(2^64-1 packets). Closing connection.");
}
@@ -1402,7 +1414,8 @@
*/
if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", request renegotiation " +
+ System.out.println(Thread.currentThread().getName() +
+ ", request renegotiation " +
"to avoid sequence number overflow");
}
@@ -1420,7 +1433,8 @@
private void closeOutboundInternal() {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", closeOutboundInternal()");
+ System.out.println(Thread.currentThread().getName() +
+ ", closeOutboundInternal()");
}
/*
@@ -1467,7 +1481,8 @@
* Dump out a close_notify to the remote side
*/
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called closeOutbound()");
+ System.out.println(Thread.currentThread().getName() +
+ ", called closeOutbound()");
}
closeOutboundInternal();
@@ -1487,7 +1502,8 @@
private void closeInboundInternal() {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", closeInboundInternal()");
+ System.out.println(Thread.currentThread().getName() +
+ ", closeInboundInternal()");
}
/*
@@ -1519,7 +1535,8 @@
* someday in the future.
*/
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called closeInbound()");
+ System.out.println(Thread.currentThread().getName() +
+ ", called closeInbound()");
}
/*
@@ -1642,7 +1659,7 @@
*/
if (closeReason != null) {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", fatal: engine already closed. Rethrowing " +
cause.toString());
}
@@ -1656,7 +1673,7 @@
}
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName()
+ System.out.println(Thread.currentThread().getName()
+ ", fatal error: " + description +
": " + diagnostic + "\n" + cause.toString());
}
@@ -1723,7 +1740,7 @@
if (debug != null && (Debug.isOn("record") ||
Debug.isOn("handshake"))) {
synchronized (System.out) {
- System.out.print(threadName());
+ System.out.print(Thread.currentThread().getName());
System.out.print(", RECV " + protocolVersion + " ALERT: ");
if (level == Alerts.alert_fatal) {
System.out.print("fatal, ");
@@ -1790,7 +1807,7 @@
boolean useDebug = debug != null && Debug.isOn("ssl");
if (useDebug) {
synchronized (System.out) {
- System.out.print(threadName());
+ System.out.print(Thread.currentThread().getName());
System.out.print(", SEND " + protocolVersion + " ALERT: ");
if (level == Alerts.alert_fatal) {
System.out.print("fatal, ");
@@ -1810,7 +1827,7 @@
writeRecord(r);
} catch (IOException e) {
if (useDebug) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", Exception sending alert: " + e);
}
}
@@ -1948,7 +1965,7 @@
default:
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", setUseClientMode() invoked in state = " +
connectionState);
}
@@ -2050,6 +2067,8 @@
// the super implementation does not handle the following parameters
params.setEndpointIdentificationAlgorithm(identificationProtocol);
params.setAlgorithmConstraints(algorithmConstraints);
+ params.setSNIMatchers(sniMatchers);
+ params.setServerNames(serverNames);
return params;
}
@@ -2063,20 +2082,29 @@
// the super implementation does not handle the following parameters
identificationProtocol = params.getEndpointIdentificationAlgorithm();
algorithmConstraints = params.getAlgorithmConstraints();
+
+ List<SNIServerName> sniNames = params.getServerNames();
+ if (sniNames != null) {
+ serverNames = sniNames;
+ }
+
+ Collection<SNIMatcher> matchers = params.getSNIMatchers();
+ if (matchers != null) {
+ sniMatchers = matchers;
+ }
+
if ((handshaker != null) && !handshaker.started()) {
handshaker.setIdentificationProtocol(identificationProtocol);
handshaker.setAlgorithmConstraints(algorithmConstraints);
+ if (roleIsServer) {
+ handshaker.setSNIMatchers(sniMatchers);
+ } else {
+ handshaker.setSNIServerNames(serverNames);
+ }
}
}
/**
- * Return the name of the current thread. Utility method.
- */
- private static String threadName() {
- return Thread.currentThread().getName();
- }
-
- /**
* Returns a printable representation of this end of the connection.
*/
public String toString() {
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
index c2098c1..0dcf2cd 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
@@ -39,6 +39,7 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SNIMatcher;
/**
@@ -92,6 +93,10 @@
// The cryptographic algorithm constraints
private AlgorithmConstraints algorithmConstraints = null;
+ // The server name indication
+ Collection<SNIMatcher> sniMatchers =
+ Collections.<SNIMatcher>emptyList();
+
/**
* Create an SSL server socket on a port, using a non-default
* authentication context and a specified connection backlog.
@@ -289,6 +294,7 @@
// the super implementation does not handle the following parameters
params.setEndpointIdentificationAlgorithm(identificationProtocol);
params.setAlgorithmConstraints(algorithmConstraints);
+ params.setSNIMatchers(sniMatchers);
return params;
}
@@ -302,6 +308,10 @@
// the super implementation does not handle the following parameters
identificationProtocol = params.getEndpointIdentificationAlgorithm();
algorithmConstraints = params.getAlgorithmConstraints();
+ Collection<SNIMatcher> matchers = params.getSNIMatchers();
+ if (matchers != null) {
+ sniMatchers = params.getSNIMatchers();
+ }
}
/**
@@ -312,7 +322,8 @@
public Socket accept() throws IOException {
SSLSocketImpl s = new SSLSocketImpl(sslContext, useServerMode,
enabledCipherSuites, doClientAuth, enableSessionCreation,
- enabledProtocols, identificationProtocol, algorithmConstraints);
+ enabledProtocols, identificationProtocol, algorithmConstraints,
+ sniMatchers);
implAccept(s);
s.doneConnect();
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
index 110fc9c..1c4575f 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -33,6 +33,9 @@
import java.util.Vector;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
import java.security.Principal;
import java.security.PrivateKey;
@@ -51,6 +54,7 @@
import javax.net.ssl.SSLPermission;
import javax.net.ssl.SSLException;
import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SNIServerName;
import javax.security.auth.x500.X500Principal;
@@ -111,6 +115,8 @@
private PrivateKey localPrivateKey;
private String[] localSupportedSignAlgs;
private String[] peerSupportedSignAlgs;
+ private List<SNIServerName> requestedServerNames;
+
// Principals for non-certificate based cipher suites
private Principal peerPrincipal;
@@ -212,6 +218,10 @@
SignatureAndHashAlgorithm.getAlgorithmNames(algorithms);
}
+ void setRequestedServerNames(List<SNIServerName> requestedServerNames) {
+ this.requestedServerNames = new ArrayList<>(requestedServerNames);
+ }
+
/**
* Set the peer principal.
*/
@@ -748,6 +758,7 @@
* Gets an array of supported signature algorithms that the local side is
* willing to verify.
*/
+ @Override
public String[] getLocalSupportedSignatureAlgorithms() {
if (localSupportedSignAlgs != null) {
return localSupportedSignAlgs.clone();
@@ -760,6 +771,7 @@
* Gets an array of supported signature algorithms that the peer is
* able to verify.
*/
+ @Override
public String[] getPeerSupportedSignatureAlgorithms() {
if (peerSupportedSignAlgs != null) {
return peerSupportedSignAlgs.clone();
@@ -768,6 +780,20 @@
return new String[0];
}
+ /**
+ * Obtains a <code>List</code> containing all {@link SNIServerName}s
+ * of the requested Server Name Indication (SNI) extension.
+ */
+ @Override
+ public List<SNIServerName> getRequestedServerNames() {
+ if (requestedServerNames != null && !requestedServerNames.isEmpty()) {
+ return Collections.<SNIServerName>unmodifiableList(
+ requestedServerNames);
+ }
+
+ return Collections.<SNIServerName>emptyList();
+ }
+
/** Returns a string representation of this SSL session */
public String toString() {
return "[Session-" + sessionCount
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
index 135b462..dc61b7b 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
@@ -109,6 +109,16 @@
return new SSLSocketImpl(context, s, host, port, autoClose);
}
+ @Override
+ public Socket createSocket(Socket s, InputStream consumed,
+ boolean autoClose) throws IOException {
+ if (s == null) {
+ throw new NullPointerException(
+ "the existing socket cannot be null");
+ }
+
+ return new SSLSocketImpl(context, s, consumed, autoClose);
+ }
/**
* Constructs an SSL connection to a server at a specified address
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
index 49ab309..2e27d62 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -36,9 +36,9 @@
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
+import java.nio.charset.StandardCharsets;
import javax.crypto.BadPaddingException;
-
import javax.net.ssl.*;
/**
@@ -198,14 +198,6 @@
private boolean autoClose = true;
private AccessControlContext acc;
- /*
- * We cannot use the hostname resolved from name services. For
- * virtual hosting, multiple hostnames may be bound to the same IP
- * address, so the hostname resolved from name services is not
- * reliable.
- */
- private String rawHostname;
-
// The cipher suites enabled for use on this connection.
private CipherSuiteList enabledCipherSuites;
@@ -215,6 +207,12 @@
// The cryptographic algorithm constraints
private AlgorithmConstraints algorithmConstraints = null;
+ // The server name indication and matchers
+ List<SNIServerName> serverNames =
+ Collections.<SNIServerName>emptyList();
+ Collection<SNIMatcher> sniMatchers =
+ Collections.<SNIMatcher>emptyList();
+
/*
* READ ME * READ ME * READ ME * READ ME * READ ME * READ ME *
* IMPORTANT STUFF TO UNDERSTANDING THE SYNCHRONIZATION ISSUES.
@@ -397,7 +395,8 @@
throws IOException, UnknownHostException {
super();
this.host = host;
- this.rawHostname = host;
+ this.serverNames =
+ Utilities.addToSNIServerNameList(this.serverNames, this.host);
init(context, false);
SocketAddress socketAddress =
host != null ? new InetSocketAddress(host, port) :
@@ -440,7 +439,8 @@
throws IOException, UnknownHostException {
super();
this.host = host;
- this.rawHostname = host;
+ this.serverNames =
+ Utilities.addToSNIServerNameList(this.serverNames, this.host);
init(context, false);
bind(new InetSocketAddress(localAddr, localPort));
SocketAddress socketAddress =
@@ -482,13 +482,15 @@
CipherSuiteList suites, byte clientAuth,
boolean sessionCreation, ProtocolList protocols,
String identificationProtocol,
- AlgorithmConstraints algorithmConstraints) throws IOException {
+ AlgorithmConstraints algorithmConstraints,
+ Collection<SNIMatcher> sniMatchers) throws IOException {
super();
doClientAuth = clientAuth;
enableSessionCreation = sessionCreation;
this.identificationProtocol = identificationProtocol;
this.algorithmConstraints = algorithmConstraints;
+ this.sniMatchers = sniMatchers;
init(context, serverMode);
/*
@@ -535,13 +537,36 @@
throw new SocketException("Underlying socket is not connected");
}
this.host = host;
- this.rawHostname = host;
+ this.serverNames =
+ Utilities.addToSNIServerNameList(this.serverNames, this.host);
init(context, false);
this.autoClose = autoClose;
doneConnect();
}
/**
+ * Creates a server mode {@link Socket} layered over an
+ * existing connected socket, and is able to read data which has
+ * already been consumed/removed from the {@link Socket}'s
+ * underlying {@link InputStream}.
+ */
+ SSLSocketImpl(SSLContextImpl context, Socket sock,
+ InputStream consumed, boolean autoClose) throws IOException {
+ super(sock, consumed);
+ // We always layer over a connected socket
+ if (!sock.isConnected()) {
+ throw new SocketException("Underlying socket is not connected");
+ }
+
+ // In server mode, it is not necessary to set host and serverNames.
+ // Otherwise, would require a reverse DNS lookup to get the hostname.
+
+ init(context, true);
+ this.autoClose = autoClose;
+ doneConnect();
+ }
+
+ /**
* Initializes the client socket.
*/
private void init(SSLContextImpl context, boolean isServer) {
@@ -604,7 +629,7 @@
public void connect(SocketAddress endpoint, int timeout)
throws IOException {
- if (self != this) {
+ if (isLayered()) {
throw new SocketException("Already connected");
}
@@ -628,13 +653,8 @@
* java.net actually connects using the socket "self", else
* we get some pretty bizarre failure modes.
*/
- if (self == this) {
- sockInput = super.getInputStream();
- sockOutput = super.getOutputStream();
- } else {
- sockInput = self.getInputStream();
- sockOutput = self.getOutputStream();
- }
+ sockInput = super.getInputStream();
+ sockOutput = super.getOutputStream();
/*
* Move to handshaking state, with pending session initialized
@@ -761,13 +781,14 @@
// For layered, non-autoclose sockets, we are not
// able to bring them into a usable state, so we
// treat it as fatal error.
- if (self != this && !autoClose) {
+ if (isLayered() && !autoClose) {
// Note that the alert description is
// specified as -1, so no message will be send
// to peer anymore.
fatal((byte)(-1), ssle);
} else if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(
+ Thread.currentThread().getName() +
", received Exception: " + ssle);
}
@@ -935,7 +956,7 @@
boolean handshaking = (getConnectionState() <= cs_HANDSHAKE);
boolean rethrow = requireCloseNotify || handshaking;
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", received EOFException: "
+ (rethrow ? "error" : "ignored"));
}
@@ -1119,7 +1140,7 @@
// TLS requires that unrecognized records be ignored.
//
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", Received record type: "
+ r.contentType());
}
@@ -1183,7 +1204,7 @@
* for handshaking and bad_record_mac for other records.
*/
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", sequence number extremely close to overflow " +
"(2^64-1 packets). Closing connection.");
@@ -1200,7 +1221,8 @@
*/
if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", request renegotiation " +
+ System.out.println(Thread.currentThread().getName() +
+ ", request renegotiation " +
"to avoid sequence number overflow");
}
@@ -1278,11 +1300,13 @@
enabledProtocols, doClientAuth,
protocolVersion, connectionState == cs_HANDSHAKE,
secureRenegotiation, clientVerifyData, serverVerifyData);
+ handshaker.setSNIMatchers(sniMatchers);
} else {
handshaker = new ClientHandshaker(this, sslContext,
enabledProtocols,
protocolVersion, connectionState == cs_HANDSHAKE,
secureRenegotiation, clientVerifyData, serverVerifyData);
+ handshaker.setSNIServerNames(serverNames);
}
handshaker.setEnabledCipherSuites(enabledCipherSuites);
handshaker.setEnableSessionCreation(enableSessionCreation);
@@ -1509,24 +1533,20 @@
protected void closeSocket() throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called closeSocket()");
+ System.out.println(Thread.currentThread().getName() +
+ ", called closeSocket()");
}
- if (self == this) {
- super.close();
- } else {
- self.close();
- }
+
+ super.close();
}
private void closeSocket(boolean selfInitiated) throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", called closeSocket(" + selfInitiated + ")");
}
- if (self == this) {
+ if (!isLayered() || autoClose) {
super.close();
- } else if (autoClose) {
- self.close();
} else if (selfInitiated) {
// layered && non-autoclose
// read close_notify alert to clear input stream
@@ -1549,7 +1569,8 @@
*/
public void close() throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called close()");
+ System.out.println(Thread.currentThread().getName() +
+ ", called close()");
}
closeInternal(true); // caller is initiating close
setConnectionState(cs_APP_CLOSED);
@@ -1567,8 +1588,8 @@
*/
private void closeInternal(boolean selfInitiated) throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called closeInternal("
- + selfInitiated + ")");
+ System.out.println(Thread.currentThread().getName() +
+ ", called closeInternal(" + selfInitiated + ")");
}
int state = getConnectionState();
@@ -1630,7 +1651,7 @@
// closing since it is already in progress.
if (state == cs_SENT_CLOSE) {
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", close invoked again; state = " +
getConnectionState());
}
@@ -1653,7 +1674,7 @@
}
}
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", after primary close; state = " +
getConnectionState());
}
@@ -1701,7 +1722,7 @@
*/
void waitForClose(boolean rethrow) throws IOException {
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", waiting for close_notify or alert: state "
+ getConnectionState());
}
@@ -1726,7 +1747,7 @@
inrec = null;
} catch (IOException e) {
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", Exception while waiting for close " +e);
}
if (rethrow) {
@@ -1788,8 +1809,8 @@
synchronized private void handleException(Exception e, boolean resumable)
throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName()
- + ", handling exception: " + e.toString());
+ System.out.println(Thread.currentThread().getName() +
+ ", handling exception: " + e.toString());
}
// don't close the Socket in case of timeouts or interrupts if
@@ -1935,7 +1956,7 @@
if (debug != null && (Debug.isOn("record") ||
Debug.isOn("handshake"))) {
synchronized (System.out) {
- System.out.print(threadName());
+ System.out.print(Thread.currentThread().getName());
System.out.print(", RECV " + protocolVersion + " ALERT: ");
if (level == Alerts.alert_fatal) {
System.out.print("fatal, ");
@@ -2001,7 +2022,7 @@
boolean useDebug = debug != null && Debug.isOn("ssl");
if (useDebug) {
synchronized (System.out) {
- System.out.print(threadName());
+ System.out.print(Thread.currentThread().getName());
System.out.print(", SEND " + protocolVersion + " ALERT: ");
if (level == Alerts.alert_fatal) {
System.out.print("fatal, ");
@@ -2021,7 +2042,7 @@
writeRecord(r);
} catch (IOException e) {
if (useDebug) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", Exception sending alert: " + e);
}
}
@@ -2118,14 +2139,15 @@
return host;
}
- synchronized String getRawHostname() {
- return rawHostname;
- }
-
// ONLY used by HttpsClient to setup the URI specified hostname
+ //
+ // Please NOTE that this method MUST be called before calling to
+ // SSLSocket.setSSLParameters(). Otherwise, the {@code host} parameter
+ // may override SNIHostName in the customized server name indication.
synchronized public void setHost(String host) {
this.host = host;
- this.rawHostname = host;
+ this.serverNames =
+ Utilities.addToSNIServerNameList(this.serverNames, this.host);
}
/**
@@ -2186,7 +2208,7 @@
} catch (IOException e) {
// handshake failed. log and return a nullSession
if (debug != null && Debug.isOn("handshake")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", IOException in getSession(): " + e);
}
}
@@ -2328,7 +2350,7 @@
default:
if (debug != null && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", setUseClientMode() invoked in state = " +
connectionState);
}
@@ -2422,14 +2444,11 @@
*/
public void setSoTimeout(int timeout) throws SocketException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() +
+ System.out.println(Thread.currentThread().getName() +
", setSoTimeout(" + timeout + ") called");
}
- if (self == this) {
- super.setSoTimeout(timeout);
- } else {
- self.setSoTimeout(timeout);
- }
+
+ super.setSoTimeout(timeout);
}
/**
@@ -2474,6 +2493,8 @@
// the super implementation does not handle the following parameters
params.setEndpointIdentificationAlgorithm(identificationProtocol);
params.setAlgorithmConstraints(algorithmConstraints);
+ params.setSNIMatchers(sniMatchers);
+ params.setServerNames(serverNames);
return params;
}
@@ -2487,9 +2508,25 @@
// the super implementation does not handle the following parameters
identificationProtocol = params.getEndpointIdentificationAlgorithm();
algorithmConstraints = params.getAlgorithmConstraints();
+
+ List<SNIServerName> sniNames = params.getServerNames();
+ if (sniNames != null) {
+ serverNames = sniNames;
+ }
+
+ Collection<SNIMatcher> matchers = params.getSNIMatchers();
+ if (matchers != null) {
+ sniMatchers = matchers;
+ }
+
if ((handshaker != null) && !handshaker.started()) {
handshaker.setIdentificationProtocol(identificationProtocol);
handshaker.setAlgorithmConstraints(algorithmConstraints);
+ if (roleIsServer) {
+ handshaker.setSNIMatchers(sniMatchers);
+ } else {
+ handshaker.setSNIServerNames(serverNames);
+ }
}
}
@@ -2531,13 +2568,6 @@
}
/**
- * Return the name of the current thread. Utility method.
- */
- private static String threadName() {
- return Thread.currentThread().getName();
- }
-
- /**
* Returns a printable representation of this end of the connection.
*/
public String toString() {
@@ -2548,11 +2578,7 @@
retval.append(sess.getCipherSuite());
retval.append(": ");
- if (self == this) {
- retval.append(super.toString());
- } else {
- retval.append(self.toString());
- }
+ retval.append(super.toString());
retval.append("]");
return retval.toString();
diff --git a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
index 8b10f8a..475746e 100644
--- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
@@ -276,6 +276,18 @@
mesg.print(System.out);
}
+ // check the server name indication if required
+ ServerNameExtension clientHelloSNIExt = (ServerNameExtension)
+ mesg.extensions.get(ExtensionType.EXT_SERVER_NAME);
+ if (!sniMatchers.isEmpty()) {
+ // we do not reject client without SNI extension
+ if (clientHelloSNIExt != null &&
+ !clientHelloSNIExt.isMatched(sniMatchers)) {
+ fatalSE(Alerts.alert_unrecognized_name,
+ "Unrecognized server name indication");
+ }
+ }
+
// Does the message include security renegotiation indication?
boolean renegotiationIndicated = false;
@@ -474,6 +486,26 @@
}
}
+ // cannot resume session with different server name indication
+ if (resumingSession) {
+ List<SNIServerName> oldServerNames =
+ previous.getRequestedServerNames();
+ if (clientHelloSNIExt != null) {
+ if (!clientHelloSNIExt.isIdentical(oldServerNames)) {
+ resumingSession = false;
+ }
+ } else if (!oldServerNames.isEmpty()) {
+ resumingSession = false;
+ }
+
+ if (!resumingSession &&
+ debug != null && Debug.isOn("handshake")) {
+ System.out.println(
+ "The requested server name indication " +
+ "is not identical to the previous one");
+ }
+ }
+
if (resumingSession &&
(doClientAuth == SSLEngineImpl.clauth_required)) {
try {
@@ -613,6 +645,14 @@
// algorithms in chooseCipherSuite()
}
+ // set the server name indication in the session
+ List<SNIServerName> clientHelloSNI =
+ Collections.<SNIServerName>emptyList();
+ if (clientHelloSNIExt != null) {
+ clientHelloSNI = clientHelloSNIExt.getServerNames();
+ }
+ session.setRequestedServerNames(clientHelloSNI);
+
// set the handshake session
setHandshakeSessionSE(session);
@@ -654,6 +694,15 @@
m1.extensions.add(serverHelloRI);
}
+ if (!sniMatchers.isEmpty() && clientHelloSNIExt != null) {
+ // When resuming a session, the server MUST NOT include a
+ // server_name extension in the server hello.
+ if (!resumingSession) {
+ ServerNameExtension serverHelloSNI = new ServerNameExtension();
+ m1.extensions.add(serverHelloSNI);
+ }
+ }
+
if (debug != null && Debug.isOn("handshake")) {
m1.print(System.out);
System.out.println("Cipher suite: " + session.getSuite());
diff --git a/jdk/src/share/classes/sun/security/ssl/SunJSSE.java b/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
index 16cb35c..6946063 100644
--- a/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
+++ b/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -103,7 +103,7 @@
// standard constructor
protected SunJSSE() {
- super("SunJSSE", 1.7d, info);
+ super("SunJSSE", 1.8d, info);
subclassCheck();
if (Boolean.TRUE.equals(fips)) {
throw new ProviderException
diff --git a/jdk/src/share/classes/sun/security/ssl/Utilities.java b/jdk/src/share/classes/sun/security/ssl/Utilities.java
new file mode 100644
index 0000000..aefb02c
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ssl/Utilities.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package sun.security.ssl;
+
+import javax.net.ssl.*;
+import java.util.*;
+import sun.net.util.IPAddressUtil;
+
+/**
+ * A utility class to share the static methods.
+ */
+final class Utilities {
+ /**
+ * Puts {@code hostname} into the {@code serverNames} list.
+ * <P>
+ * If the {@code serverNames} does not look like a legal FQDN, it will
+ * not be put into the returned list.
+ * <P>
+ * Note that the returned list does not allow duplicated name type.
+ *
+ * @return a list of {@link SNIServerName}
+ */
+ static List<SNIServerName> addToSNIServerNameList(
+ List<SNIServerName> serverNames, String hostname) {
+
+ SNIHostName sniHostName = rawToSNIHostName(hostname);
+ if (sniHostName == null) {
+ return serverNames;
+ }
+
+ int size = serverNames.size();
+ List<SNIServerName> sniList = (size != 0) ?
+ new ArrayList<SNIServerName>(serverNames) :
+ new ArrayList<SNIServerName>(1);
+
+ boolean reset = false;
+ for (int i = 0; i < size; i++) {
+ SNIServerName serverName = sniList.get(i);
+ if (serverName.getType() == StandardConstants.SNI_HOST_NAME) {
+ sniList.set(i, sniHostName);
+ if (Debug.isOn("ssl")) {
+ System.out.println(Thread.currentThread().getName() +
+ ", the previous server name in SNI (" + serverName +
+ ") was replaced with (" + sniHostName + ")");
+ }
+ reset = true;
+ break;
+ }
+ }
+
+ if (!reset) {
+ sniList.add(sniHostName);
+ }
+
+ return Collections.<SNIServerName>unmodifiableList(sniList);
+ }
+
+ /**
+ * Converts string hostname to {@code SNIHostName}.
+ * <P>
+ * Note that to check whether a hostname is a valid domain name, we cannot
+ * use the hostname resolved from name services. For virtual hosting,
+ * multiple hostnames may be bound to the same IP address, so the hostname
+ * resolved from name services is not always reliable.
+ *
+ * @param hostname
+ * the raw hostname
+ * @return an instance of {@link SNIHostName}, or null if the hostname does
+ * not look like a FQDN
+ */
+ private static SNIHostName rawToSNIHostName(String hostname) {
+ SNIHostName sniHostName = null;
+ if (hostname != null && hostname.indexOf('.') > 0 &&
+ !hostname.endsWith(".") &&
+ !IPAddressUtil.isIPv4LiteralAddress(hostname) &&
+ !IPAddressUtil.isIPv6LiteralAddress(hostname)) {
+
+ try {
+ sniHostName = new SNIHostName(hostname);
+ } catch (IllegalArgumentException iae) {
+ // don't bother to handle illegal host_name
+ if (Debug.isOn("ssl")) {
+ System.out.println(Thread.currentThread().getName() +
+ ", \"" + hostname + "\" " +
+ "is not a legal HostName for server name indication");
+ }
+ }
+ }
+
+ return sniHostName;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
index 45e6c99..4b8a101 100644
--- a/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -128,13 +128,35 @@
public String chooseServerAlias(String keyType,
Principal[] issuers, Socket socket) {
return chooseAlias(getKeyTypes(keyType), issuers, CheckType.SERVER,
- getAlgorithmConstraints(socket));
+ getAlgorithmConstraints(socket),
+ X509TrustManagerImpl.getRequestedServerNames(socket),
+ "HTTPS"); // The SNI HostName is a fully qualified domain name.
+ // The certificate selection scheme for SNI HostName
+ // is similar to HTTPS endpoint identification scheme
+ // implemented in this provider.
+ //
+ // Using HTTPS endpoint identification scheme to guide
+ // the selection of an appropriate authentication
+ // certificate according to requested SNI extension.
+ //
+ // It is not a really HTTPS endpoint identification.
}
public String chooseEngineServerAlias(String keyType,
Principal[] issuers, SSLEngine engine) {
return chooseAlias(getKeyTypes(keyType), issuers, CheckType.SERVER,
- getAlgorithmConstraints(engine));
+ getAlgorithmConstraints(engine),
+ X509TrustManagerImpl.getRequestedServerNames(engine),
+ "HTTPS"); // The SNI HostName is a fully qualified domain name.
+ // The certificate selection scheme for SNI HostName
+ // is similar to HTTPS endpoint identification scheme
+ // implemented in this provider.
+ //
+ // Using HTTPS endpoint identification scheme to guide
+ // the selection of an appropriate authentication
+ // certificate according to requested SNI extension.
+ //
+ // It is not a really HTTPS endpoint identification.
}
public String[] getClientAliases(String keyType, Principal[] issuers) {
@@ -321,8 +343,8 @@
* The algorithm we use is:
* . scan through all the aliases in all builders in order
* . as soon as we find a perfect match, return
- * (i.e. a match with a cert that has appropriate key usage
- * and is not expired).
+ * (i.e. a match with a cert that has appropriate key usage,
+ * qualified endpoint identity, and is not expired).
* . if we do not find a perfect match, keep looping and remember
* the imperfect matches
* . at the end, sort the imperfect matches. we prefer expired certs
@@ -331,6 +353,15 @@
*/
private String chooseAlias(List<KeyType> keyTypeList, Principal[] issuers,
CheckType checkType, AlgorithmConstraints constraints) {
+
+ return chooseAlias(keyTypeList, issuers,
+ checkType, constraints, null, null);
+ }
+
+ private String chooseAlias(List<KeyType> keyTypeList, Principal[] issuers,
+ CheckType checkType, AlgorithmConstraints constraints,
+ List<SNIServerName> requestedServerNames, String idAlgorithm) {
+
if (keyTypeList == null || keyTypeList.isEmpty()) {
return null;
}
@@ -340,7 +371,8 @@
for (int i = 0, n = builders.size(); i < n; i++) {
try {
List<EntryStatus> results = getAliases(i, keyTypeList,
- issuerSet, false, checkType, constraints);
+ issuerSet, false, checkType, constraints,
+ requestedServerNames, idAlgorithm);
if (results != null) {
// the results will either be a single perfect match
// or 1 or more imperfect matches
@@ -394,7 +426,8 @@
for (int i = 0, n = builders.size(); i < n; i++) {
try {
List<EntryStatus> results = getAliases(i, keyTypeList,
- issuerSet, true, checkType, constraints);
+ issuerSet, true, checkType, constraints,
+ null, null);
if (results != null) {
if (allResults == null) {
allResults = new ArrayList<EntryStatus>();
@@ -504,7 +537,9 @@
// first check extensions, if they match, check expiration
// note: we may want to move this code into the sun.security.validator
// package
- CheckResult check(X509Certificate cert, Date date) {
+ CheckResult check(X509Certificate cert, Date date,
+ List<SNIServerName> serverNames, String idAlgorithm) {
+
if (this == NONE) {
return CheckResult.OK;
}
@@ -553,11 +588,11 @@
return CheckResult.EXTENSION_MISMATCH;
}
// For servers, also require key agreement.
- // This is not totally accurate as the keyAgreement bit
- // is only necessary for static ECDH key exchange and
- // not ephemeral ECDH. We leave it in for now until
- // there are signs that this check causes problems
- // for real world EC certificates.
+ // This is not totally accurate as the keyAgreement
+ // bit is only necessary for static ECDH key
+ // exchange and not ephemeral ECDH. We leave it in
+ // for now until there are signs that this check
+ // causes problems for real world EC certificates.
if ((this == SERVER) && (getBit(ku, 4) == false)) {
return CheckResult.EXTENSION_MISMATCH;
}
@@ -571,10 +606,50 @@
try {
cert.checkValidity(date);
- return CheckResult.OK;
} catch (CertificateException e) {
return CheckResult.EXPIRED;
}
+
+ if (serverNames != null && !serverNames.isEmpty()) {
+ for (SNIServerName serverName : serverNames) {
+ if (serverName.getType() ==
+ StandardConstants.SNI_HOST_NAME) {
+ if (!(serverName instanceof SNIHostName)) {
+ try {
+ serverName =
+ new SNIHostName(serverName.getEncoded());
+ } catch (IllegalArgumentException iae) {
+ // unlikely to happen, just in case ...
+ if (useDebug) {
+ debug.println(
+ "Illegal server name: " + serverName);
+ }
+
+ return CheckResult.INSENSITIVE;
+ }
+ }
+ String hostname =
+ ((SNIHostName)serverName).getAsciiName();
+
+ try {
+ X509TrustManagerImpl.checkIdentity(hostname,
+ cert, idAlgorithm);
+ } catch (CertificateException e) {
+ if (useDebug) {
+ debug.println(
+ "Certificate identity does not match " +
+ "Server Name Inidication (SNI): " +
+ hostname);
+ }
+ return CheckResult.INSENSITIVE;
+ }
+
+ break;
+ }
+ }
+ }
+
+ return CheckResult.OK;
}
}
@@ -583,6 +658,7 @@
// for sorting, i.e. OK is best, followed by EXPIRED and EXTENSION_MISMATCH
private static enum CheckResult {
OK, // ok or not checked
+ INSENSITIVE, // server name indication insensitive
EXPIRED, // extensions valid but cert expired
EXTENSION_MISMATCH, // extensions invalid (expiration not checked)
}
@@ -616,7 +692,10 @@
private List<EntryStatus> getAliases(int builderIndex,
List<KeyType> keyTypes, Set<Principal> issuerSet,
boolean findAll, CheckType checkType,
- AlgorithmConstraints constraints) throws Exception {
+ AlgorithmConstraints constraints,
+ List<SNIServerName> requestedServerNames,
+ String idAlgorithm) throws Exception {
+
Builder builder = builders.get(builderIndex);
KeyStore ks = builder.getKeyStore();
List<EntryStatus> results = null;
@@ -699,7 +778,8 @@
date = new Date();
}
CheckResult checkResult =
- checkType.check((X509Certificate)chain[0], date);
+ checkType.check((X509Certificate)chain[0], date,
+ requestedServerNames, idAlgorithm);
EntryStatus status =
new EntryStatus(builderIndex, keyIndex,
alias, chain, checkResult);
diff --git a/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index d38e727..13bbb18 100644
--- a/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -28,15 +28,14 @@
import java.net.Socket;
import javax.net.ssl.SSLSession;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.security.*;
import java.security.cert.*;
-
import javax.net.ssl.*;
import sun.security.validator.*;
-
import sun.security.util.HostnameChecker;
/**
@@ -199,8 +198,8 @@
String identityAlg = sslSocket.getSSLParameters().
getEndpointIdentificationAlgorithm();
if (identityAlg != null && identityAlg.length() != 0) {
- String hostname = session.getPeerHost();
- checkIdentity(hostname, chain[0], identityAlg);
+ checkIdentity(session, chain[0], identityAlg, isClient,
+ getRequestedServerNames(socket));
}
// create the algorithm constraints
@@ -251,8 +250,8 @@
String identityAlg = engine.getSSLParameters().
getEndpointIdentificationAlgorithm();
if (identityAlg != null && identityAlg.length() != 0) {
- String hostname = session.getPeerHost();
- checkIdentity(hostname, chain[0], identityAlg);
+ checkIdentity(session, chain[0], identityAlg, isClient,
+ getRequestedServerNames(engine));
}
// create the algorithm constraints
@@ -329,6 +328,117 @@
}
}
+ // Get string representation of HostName from a list of server names.
+ //
+ // We are only accepting host_name name type in the list.
+ private static String getHostNameInSNI(List<SNIServerName> sniNames) {
+
+ SNIHostName hostname = null;
+ for (SNIServerName sniName : sniNames) {
+ if (sniName.getType() != StandardConstants.SNI_HOST_NAME) {
+ continue;
+ }
+
+ if (sniName instanceof SNIHostName) {
+ hostname = (SNIHostName)sniName;
+ } else {
+ try {
+ hostname = new SNIHostName(sniName.getEncoded());
+ } catch (IllegalArgumentException iae) {
+ // unlikely to happen, just in case ...
+ if ((debug != null) && Debug.isOn("trustmanager")) {
+ byte[] encoded = hostname.getEncoded();
+ System.out.println("Illegal server name: " + sniName);
+ }
+ }
+ }
+
+ // no more than server name of the same name type
+ break;
+ }
+
+ if (hostname != null) {
+ return hostname.getAsciiName();
+ }
+
+ return null;
+ }
+
+ // Also used by X509KeyManagerImpl
+ static List<SNIServerName> getRequestedServerNames(Socket socket) {
+ if (socket != null && socket.isConnected() &&
+ socket instanceof SSLSocket) {
+
+ SSLSocket sslSocket = (SSLSocket)socket;
+ SSLSession session = sslSocket.getHandshakeSession();
+
+ if (session != null && (session instanceof ExtendedSSLSession)) {
+ ExtendedSSLSession extSession = (ExtendedSSLSession)session;
+ return extSession.getRequestedServerNames();
+ }
+ }
+
+ return Collections.<SNIServerName>emptyList();
+ }
+
+ // Also used by X509KeyManagerImpl
+ static List<SNIServerName> getRequestedServerNames(SSLEngine engine) {
+ if (engine != null) {
+ SSLSession session = engine.getHandshakeSession();
+
+ if (session != null && (session instanceof ExtendedSSLSession)) {
+ ExtendedSSLSession extSession = (ExtendedSSLSession)session;
+ return extSession.getRequestedServerNames();
+ }
+ }
+
+ return Collections.<SNIServerName>emptyList();
+ }
+
+ /*
+ * Per RFC 6066, if an application negotiates a server name using an
+ * application protocol and then upgrades to TLS, and if a server_name
+ * extension is sent, then the extension SHOULD contain the same name
+ * that was negotiated in the application protocol. If the server_name
+ * is established in the TLS session handshake, the client SHOULD NOT
+ * attempt to request a different server name at the application layer.
+ *
+ * According to the above spec, we only need to check either the identity
+ * in server_name extension or the peer host of the connection. Peer host
+ * is not always a reliable fully qualified domain name. The HostName in
+ * server_name extension is more reliable than peer host. So we prefer
+ * the identity checking aginst the server_name extension if present, and
+ * may failove to peer host checking.
+ */
+ private static void checkIdentity(SSLSession session,
+ X509Certificate cert,
+ String algorithm,
+ boolean isClient,
+ List<SNIServerName> sniNames) throws CertificateException {
+
+ boolean identifiable = false;
+ String peerHost = session.getPeerHost();
+ if (isClient) {
+ String hostname = getHostNameInSNI(sniNames);
+ if (hostname != null) {
+ try {
+ checkIdentity(hostname, cert, algorithm);
+ identifiable = true;
+ } catch (CertificateException ce) {
+ if (hostname.equalsIgnoreCase(peerHost)) {
+ throw ce;
+ }
+
+ // otherwisw, failover to check peer host
+ }
+ }
+ }
+
+ if (!identifiable) {
+ checkIdentity(peerHost, cert, algorithm);
+ }
+ }
+
/*
* Identify the peer by its certificate and hostname.
*
diff --git a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
index 679a247..ecfba5f 100644
--- a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+++ b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,6 +25,18 @@
package sun.security.tools;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import java.net.URL;
+
+import java.security.KeyStore;
+
+import java.text.Collator;
+
import java.util.Locale;
/**
@@ -34,18 +46,17 @@
*/
public class KeyStoreUtil {
- // Class and methods marked as public so that they can be
- // accessed by JarSigner, which although lies in a package
- // with the same name, but bundled in tools.jar and loaded
- // by another class loader, hence in a different *runtime*
- // package.
- //
- // See JVM Spec, 5.3 and 5.4.4
-
private KeyStoreUtil() {
// this class is not meant to be instantiated
}
+ private static final String JKS = "jks";
+
+ private static final Collator collator = Collator.getInstance();
+ static {
+ // this is for case insensitive string comparisons
+ collator.setStrength(Collator.PRIMARY);
+ };
/**
* Returns true if KeyStore has a password. This is true except for
@@ -68,4 +79,76 @@
return storetype.toUpperCase(Locale.ENGLISH);
}
}
+
+ /**
+ * Returns the keystore with the configured CA certificates.
+ */
+ public static KeyStore getCacertsKeyStore()
+ throws Exception
+ {
+ String sep = File.separator;
+ File file = new File(System.getProperty("java.home") + sep
+ + "lib" + sep + "security" + sep
+ + "cacerts");
+ if (!file.exists()) {
+ return null;
+ }
+ KeyStore caks = null;
+ try (FileInputStream fis = new FileInputStream(file)) {
+ caks = KeyStore.getInstance(JKS);
+ caks.load(fis, null);
+ }
+ return caks;
+ }
+
+ public static char[] getPassWithModifier(String modifier, String arg,
+ java.util.ResourceBundle rb) {
+ if (modifier == null) {
+ return arg.toCharArray();
+ } else if (collator.compare(modifier, "env") == 0) {
+ String value = System.getenv(arg);
+ if (value == null) {
+ System.err.println(rb.getString(
+ "Cannot.find.environment.variable.") + arg);
+ return null;
+ } else {
+ return value.toCharArray();
+ }
+ } else if (collator.compare(modifier, "file") == 0) {
+ try {
+ URL url = null;
+ try {
+ url = new URL(arg);
+ } catch (java.net.MalformedURLException mue) {
+ File f = new File(arg);
+ if (f.exists()) {
+ url = f.toURI().toURL();
+ } else {
+ System.err.println(rb.getString(
+ "Cannot.find.file.") + arg);
+ return null;
+ }
+ }
+
+ try (BufferedReader br =
+ new BufferedReader(new InputStreamReader(
+ url.openStream()))) {
+ String value = br.readLine();
+
+ if (value == null) {
+ return new char[0];
+ }
+
+ return value.toCharArray();
+ }
+ } catch (IOException ioe) {
+ System.err.println(ioe);
+ return null;
+ }
+ } else {
+ System.err.println(rb.getString("Unknown.password.type.") +
+ modifier);
+ return null;
+ }
+ }
}
diff --git a/jdk/src/share/classes/sun/security/tools/JarSigner.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
similarity index 98%
rename from jdk/src/share/classes/sun/security/tools/JarSigner.java
rename to jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
index 31dfbce..98f3ec2 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSigner.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -23,7 +23,7 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.jarsigner;
import java.io.*;
import java.util.*;
@@ -53,6 +53,8 @@
import java.security.cert.PKIXParameters;
import java.security.cert.TrustAnchor;
import java.util.Map.Entry;
+import sun.security.tools.KeyStoreUtil;
+import sun.security.tools.PathList;
import sun.security.x509.*;
import sun.security.util.*;
import sun.misc.BASE64Encoder;
@@ -74,12 +76,12 @@
* @author Jan Luehe
*/
-public class JarSigner {
+public class Main {
// for i18n
private static final java.util.ResourceBundle rb =
java.util.ResourceBundle.getBundle
- ("sun.security.tools.JarSignerResources");
+ ("sun.security.tools.jarsigner.Resources");
private static final Collator collator = Collator.getInstance();
static {
// this is for case insensitive string comparisions
@@ -101,7 +103,7 @@
// Attention:
// This is the entry that get launched by the security tool jarsigner.
public static void main(String args[]) throws Exception {
- JarSigner js = new JarSigner();
+ Main js = new Main();
js.run(args);
}
@@ -461,7 +463,7 @@
}
static char[] getPass(String modifier, String arg) {
- char[] output = KeyTool.getPassWithModifier(modifier, arg);
+ char[] output = KeyStoreUtil.getPassWithModifier(modifier, arg, rb);
if (output != null) return output;
usage();
return null; // Useless, usage() already exit
@@ -1579,7 +1581,7 @@
validator = CertPathValidator.getInstance("PKIX");
Set<TrustAnchor> tas = new HashSet<>();
try {
- KeyStore caks = KeyTool.getCacertsKeyStore();
+ KeyStore caks = KeyStoreUtil.getCacertsKeyStore();
if (caks != null) {
Enumeration<String> aliases = caks.aliases();
while (aliases.hasMoreElements()) {
diff --git a/jdk/src/share/classes/sun/security/tools/JarSignerResources.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java
similarity index 96%
rename from jdk/src/share/classes/sun/security/tools/JarSignerResources.java
rename to jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java
index cea8b25..9c59b50 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -23,14 +23,14 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.jarsigner;
/**
* <p> This class represents the <code>ResourceBundle</code>
* for JarSigner.
*
*/
-public class JarSignerResources extends java.util.ListResourceBundle {
+public class Resources extends java.util.ListResourceBundle {
private static final Object[][] contents = {
@@ -227,6 +227,10 @@
"The signer's certificate chain is not validated."},
{"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
"This jar contains entries whose certificate chain is not validated."},
+ {"Unknown.password.type.", "Unknown password type: "},
+ {"Cannot.find.environment.variable.",
+ "Cannot find environment variable: "},
+ {"Cannot.find.file.", "Cannot find file: "},
};
/**
@@ -236,6 +240,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java
similarity index 97%
rename from jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java
rename to jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java
index 05bf83c..ef68a72 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -23,14 +23,14 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.jarsigner;
/**
* <p> This class represents the <code>ResourceBundle</code>
* for JarSigner.
*
*/
-public class JarSignerResources_ja extends java.util.ListResourceBundle {
+public class Resources_ja extends java.util.ListResourceBundle {
private static final Object[][] contents = {
@@ -225,6 +225,10 @@
"\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
{"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
"\u3053\u306Ejar\u306B\u306F\u3001\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
+ {"Unknown.password.type.", "\u4E0D\u660E\u306A\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30BF\u30A4\u30D7: "},
+ {"Cannot.find.environment.variable.",
+ "\u74B0\u5883\u5909\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
+ {"Cannot.find.file.", "\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
};
/**
@@ -234,6 +238,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
similarity index 96%
rename from jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
rename to jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
index 48b6c73..50e22a5 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -23,14 +23,14 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.jarsigner;
/**
* <p> This class represents the <code>ResourceBundle</code>
* for JarSigner.
*
*/
-public class JarSignerResources_zh_CN extends java.util.ListResourceBundle {
+public class Resources_zh_CN extends java.util.ListResourceBundle {
private static final Object[][] contents = {
@@ -225,6 +225,11 @@
"\u7B7E\u540D\u8005\u7684\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u3002"},
{"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
"\u6B64 jar \u5305\u542B\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u7684\u6761\u76EE\u3002"},
+ {"Unknown.password.type.", "\u672A\u77E5\u53E3\u4EE4\u7C7B\u578B: "},
+ {"Cannot.find.environment.variable.",
+ "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
+ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
+ {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
};
/**
@@ -234,6 +239,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java b/jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
similarity index 98%
rename from jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
rename to jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
index 4848a40..4b952de 100644
--- a/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,7 +23,7 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.jarsigner;
import java.io.IOException;
import java.net.URI;
diff --git a/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java b/jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
similarity index 98%
rename from jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java
rename to jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
index fad412e..6f557b6 100644
--- a/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java
+++ b/jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -23,7 +23,7 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.keytool;
import java.io.IOException;
import java.security.cert.X509Certificate;
diff --git a/jdk/src/share/classes/sun/security/tools/KeyTool.java b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
similarity index 97%
rename from jdk/src/share/classes/sun/security/tools/KeyTool.java
rename to jdk/src/share/classes/sun/security/tools/keytool/Main.java
index 44fb40d..fd399fc 100644
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -23,7 +23,7 @@
* questions.
*/
-package sun.security.tools;
+package sun.security.tools.keytool;
import java.io.*;
import java.security.CodeSigner;
@@ -75,12 +75,14 @@
import sun.misc.BASE64Decoder;
import sun.security.pkcs.PKCS9Attribute;
+import sun.security.tools.KeyStoreUtil;
+import sun.security.tools.PathList;
import sun.security.util.DerValue;
import sun.security.x509.*;
import static java.security.KeyStore.*;
-import static sun.security.tools.KeyTool.Command.*;
-import static sun.security.tools.KeyTool.Option.*;
+import static sun.security.tools.keytool.Main.Command.*;
+import static sun.security.tools.keytool.Main.Option.*;
/**
* This tool manages keystores.
@@ -94,7 +96,7 @@
*
* @since 1.2
*/
-public final class KeyTool {
+public final class Main {
private boolean debug = false;
private Command command = null;
@@ -304,7 +306,6 @@
private static final Class[] PARAM_STRING = { String.class };
- private static final String JKS = "jks";
private static final String NONE = "NONE";
private static final String P11KEYSTORE = "PKCS11";
private static final String P12KEYSTORE = "PKCS12";
@@ -312,17 +313,18 @@
// for i18n
private static final java.util.ResourceBundle rb =
- java.util.ResourceBundle.getBundle("sun.security.util.Resources");
+ java.util.ResourceBundle.getBundle(
+ "sun.security.tools.keytool.Resources");
private static final Collator collator = Collator.getInstance();
static {
// this is for case insensitive string comparisons
collator.setStrength(Collator.PRIMARY);
};
- private KeyTool() { }
+ private Main() { }
public static void main(String[] args) throws Exception {
- KeyTool kt = new KeyTool();
+ Main kt = new Main();
kt.run(args, System.out);
}
@@ -907,7 +909,7 @@
}
if (trustcacerts) {
- caks = getCacertsKeyStore();
+ caks = KeyStoreUtil.getCacertsKeyStore();
}
// Perform the specified command
@@ -2076,7 +2078,7 @@
for (GeneralName name: names.names()) {
if (name.getType() == GeneralNameInterface.NAME_URI) {
URIName uriName = (URIName)name.getName();
- for (CRL crl: KeyTool.loadCRLs(uriName.getName())) {
+ for (CRL crl: loadCRLs(uriName.getName())) {
if (crl instanceof X509CRL) {
crls.add((X509CRL)crl);
}
@@ -3371,27 +3373,6 @@
}
/**
- * Returns the keystore with the configured CA certificates.
- */
- public static KeyStore getCacertsKeyStore()
- throws Exception
- {
- String sep = File.separator;
- File file = new File(System.getProperty("java.home") + sep
- + "lib" + sep + "security" + sep
- + "cacerts");
- if (!file.exists()) {
- return null;
- }
- KeyStore caks = null;
- try (FileInputStream fis = new FileInputStream(file)) {
- caks = KeyStore.getInstance(JKS);
- caks.load(fis, null);
- }
- return caks;
- }
-
- /**
* Stores the (leaf) certificates of a keystore in a hashtable.
* All certs belonging to the same CA are stored in a vector that
* in turn is stored in the hashtable, keyed by the CA's subject DN
@@ -4056,59 +4037,11 @@
}
private char[] getPass(String modifier, String arg) {
- char[] output = getPassWithModifier(modifier, arg);
+ char[] output = KeyStoreUtil.getPassWithModifier(modifier, arg, rb);
if (output != null) return output;
tinyHelp();
return null; // Useless, tinyHelp() already exits.
}
-
- // This method also used by JarSigner
- public static char[] getPassWithModifier(String modifier, String arg) {
- if (modifier == null) {
- return arg.toCharArray();
- } else if (collator.compare(modifier, "env") == 0) {
- String value = System.getenv(arg);
- if (value == null) {
- System.err.println(rb.getString(
- "Cannot.find.environment.variable.") + arg);
- return null;
- } else {
- return value.toCharArray();
- }
- } else if (collator.compare(modifier, "file") == 0) {
- try {
- URL url = null;
- try {
- url = new URL(arg);
- } catch (java.net.MalformedURLException mue) {
- File f = new File(arg);
- if (f.exists()) {
- url = f.toURI().toURL();
- } else {
- System.err.println(rb.getString(
- "Cannot.find.file.") + arg);
- return null;
- }
- }
- BufferedReader br = new BufferedReader(new InputStreamReader(
- url.openStream()));
- String value = br.readLine();
- br.close();
- if (value == null) {
- return new char[0];
- } else {
- return value.toCharArray();
- }
- } catch (IOException ioe) {
- System.err.println(ioe);
- return null;
- }
- } else {
- System.err.println(rb.getString("Unknown.password.type.") +
- modifier);
- return null;
- }
- }
}
// This class is exactly the same as com.sun.tools.javac.util.Pair,
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
new file mode 100644
index 0000000..262fe20
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+ {".OPTION.", " [OPTION]..."},
+ {"Options.", "Options:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "Use \"keytool -help\" for all available commands"},
+ {"Key.and.Certificate.Management.Tool",
+ "Key and Certificate Management Tool"},
+ {"Commands.", "Commands:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "Use \"keytool -command_name -help\" for usage of command_name"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Generates a certificate request"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "Changes an entry's alias"}, //-changealias
+ {"Deletes.an.entry",
+ "Deletes an entry"}, //-delete
+ {"Exports.certificate",
+ "Exports certificate"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Generates a key pair"}, //-genkeypair
+ {"Generates.a.secret.key",
+ "Generates a secret key"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Generates certificate from a certificate request"}, //-gencert
+ {"Generates.CRL", "Generates CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Imports entries from a JDK 1.1.x-style identity database"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Imports a certificate or a certificate chain"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Imports one or all entries from another keystore"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Clones a key entry"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "Changes the key password of an entry"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Lists entries in a keystore"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Prints the content of a certificate"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Prints the content of a certificate request"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Prints the content of a CRL file"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Generates a self-signed certificate"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "Changes the store password of a keystore"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "alias name of the entry to process"}, //-alias
+ {"destination.alias",
+ "destination alias"}, //-destalias
+ {"destination.key.password",
+ "destination key password"}, //-destkeypass
+ {"destination.keystore.name",
+ "destination keystore name"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "destination keystore password protected"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "destination keystore provider name"}, //-destprovidername
+ {"destination.keystore.password",
+ "destination keystore password"}, //-deststorepass
+ {"destination.keystore.type",
+ "destination keystore type"}, //-deststoretype
+ {"distinguished.name",
+ "distinguished name"}, //-dname
+ {"X.509.extension",
+ "X.509 extension"}, //-ext
+ {"output.file.name",
+ "output file name"}, //-file and -outfile
+ {"input.file.name",
+ "input file name"}, //-file and -infile
+ {"key.algorithm.name",
+ "key algorithm name"}, //-keyalg
+ {"key.password",
+ "key password"}, //-keypass
+ {"key.bit.size",
+ "key bit size"}, //-keysize
+ {"keystore.name",
+ "keystore name"}, //-keystore
+ {"new.password",
+ "new password"}, //-new
+ {"do.not.prompt",
+ "do not prompt"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "password through protected mechanism"}, //-protected
+ {"provider.argument",
+ "provider argument"}, //-providerarg
+ {"provider.class.name",
+ "provider class name"}, //-providerclass
+ {"provider.name",
+ "provider name"}, //-providername
+ {"provider.classpath",
+ "provider classpath"}, //-providerpath
+ {"output.in.RFC.style",
+ "output in RFC style"}, //-rfc
+ {"signature.algorithm.name",
+ "signature algorithm name"}, //-sigalg
+ {"source.alias",
+ "source alias"}, //-srcalias
+ {"source.key.password",
+ "source key password"}, //-srckeypass
+ {"source.keystore.name",
+ "source keystore name"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "source keystore password protected"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "source keystore provider name"}, //-srcprovidername
+ {"source.keystore.password",
+ "source keystore password"}, //-srcstorepass
+ {"source.keystore.type",
+ "source keystore type"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL server host and port"}, //-sslserver
+ {"signed.jar.file",
+ "signed jar file"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "certificate validity start date/time"}, //-startdate
+ {"keystore.password",
+ "keystore password"}, //-storepass
+ {"keystore.type",
+ "keystore type"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "trust certificates from cacerts"}, //-trustcacerts
+ {"verbose.output",
+ "verbose output"}, //-v
+ {"validity.number.of.days",
+ "validity number of days"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "Serial ID of cert to revoke"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "keytool error: "},
+ {"Illegal.option.", "Illegal option: "},
+ {"Illegal.value.", "Illegal value: "},
+ {"Unknown.password.type.", "Unknown password type: "},
+ {"Cannot.find.environment.variable.",
+ "Cannot find environment variable: "},
+ {"Cannot.find.file.", "Cannot find file: "},
+ {"Command.option.flag.needs.an.argument.", "Command option {0} needs an argument."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Warning: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified {0} value."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore must be NONE if -storetype is {0}"},
+ {"Too.many.retries.program.terminated",
+ "Too many retries, program terminated"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "-storepasswd and -keypasswd commands not supported if -storetype is {0}"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "-keypasswd commands not supported if -storetype is PKCS12"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-keypass and -new can not be specified if -storetype is {0}"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "if -protected is specified, then -storepass, -keypass, and -new must not be specified"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "if -srcprotected is specified, then -srcstorepass and -srckeypass must not be specified"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "if keystore is not password protected, then -storepass, -keypass, and -new must not be specified"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "if source keystore is not password protected, then -srcstorepass and -srckeypass must not be specified"},
+ {"Illegal.startdate.value", "Illegal startdate value"},
+ {"Validity.must.be.greater.than.zero",
+ "Validity must be greater than zero"},
+ {"provName.not.a.provider", "{0} not a provider"},
+ {"Usage.error.no.command.provided", "Usage error: no command provided"},
+ {"Source.keystore.file.exists.but.is.empty.", "Source keystore file exists, but is empty: "},
+ {"Please.specify.srckeystore", "Please specify -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "Must not specify both -v and -rfc with 'list' command"},
+ {"Key.password.must.be.at.least.6.characters",
+ "Key password must be at least 6 characters"},
+ {"New.password.must.be.at.least.6.characters",
+ "New password must be at least 6 characters"},
+ {"Keystore.file.exists.but.is.empty.",
+ "Keystore file exists, but is empty: "},
+ {"Keystore.file.does.not.exist.",
+ "Keystore file does not exist: "},
+ {"Must.specify.destination.alias", "Must specify destination alias"},
+ {"Must.specify.alias", "Must specify alias"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "Keystore password must be at least 6 characters"},
+ {"Enter.keystore.password.", "Enter keystore password: "},
+ {"Enter.source.keystore.password.", "Enter source keystore password: "},
+ {"Enter.destination.keystore.password.", "Enter destination keystore password: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "Keystore password is too short - must be at least 6 characters"},
+ {"Unknown.Entry.Type", "Unknown Entry Type"},
+ {"Too.many.failures.Alias.not.changed", "Too many failures. Alias not changed"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "Entry for alias {0} successfully imported."},
+ {"Entry.for.alias.alias.not.imported.", "Entry for alias {0} not imported."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Problem importing entry for alias {0}: {1}.\nEntry for alias {0} not imported."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Import command completed: {0} entries successfully imported, {1} entries failed or cancelled"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Warning: Overwriting existing alias {0} in destination keystore"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "Existing entry alias {0} exists, overwrite? [no]: "},
+ {"Too.many.failures.try.later", "Too many failures - try later"},
+ {"Certification.request.stored.in.file.filename.",
+ "Certification request stored in file <{0}>"},
+ {"Submit.this.to.your.CA", "Submit this to your CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "if alias not specified, destalias, srckeypass, and destkeypass must not be specified"},
+ {"Certificate.stored.in.file.filename.",
+ "Certificate stored in file <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "Certificate reply was installed in keystore"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "Certificate reply was not installed in keystore"},
+ {"Certificate.was.added.to.keystore",
+ "Certificate was added to keystore"},
+ {"Certificate.was.not.added.to.keystore",
+ "Certificate was not added to keystore"},
+ {".Storing.ksfname.", "[Storing {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} has no public key (certificate)"},
+ {"Cannot.derive.signature.algorithm",
+ "Cannot derive signature algorithm"},
+ {"Alias.alias.does.not.exist",
+ "Alias <{0}> does not exist"},
+ {"Alias.alias.has.no.certificate",
+ "Alias <{0}> has no certificate"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Key pair not generated, alias <{0}> already exists"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Generating {0} bit {1} key pair and self-signed certificate ({2}) with a validity of {3} days\n\tfor: {4}"},
+ {"Enter.key.password.for.alias.", "Enter key password for <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN if same as keystore password): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "Key password is too short - must be at least 6 characters"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Too many failures - key not added to keystore"},
+ {"Destination.alias.dest.already.exists",
+ "Destination alias <{0}> already exists"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "Password is too short - must be at least 6 characters"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Too many failures. Key entry not cloned"},
+ {"key.password.for.alias.", "key password for <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "Keystore entry for <{0}> already exists"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Creating keystore entry for <{0}> ..."},
+ {"No.entries.from.identity.database.added",
+ "No entries from identity database added"},
+ {"Alias.name.alias", "Alias name: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Creation date: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Entry type: {0}"},
+ {"Certificate.chain.length.", "Certificate chain length: "},
+ {"Certificate.i.1.", "Certificate[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Certificate fingerprint (SHA1): "},
+ {"Keystore.type.", "Keystore type: "},
+ {"Keystore.provider.", "Keystore provider: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Your keystore contains {0,number,integer} entry"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Your keystore contains {0,number,integer} entries"},
+ {"Failed.to.parse.input", "Failed to parse input"},
+ {"Empty.input", "Empty input"},
+ {"Not.X.509.certificate", "Not X.509 certificate"},
+ {"alias.has.no.public.key", "{0} has no public key"},
+ {"alias.has.no.X.509.certificate", "{0} has no X.509 certificate"},
+ {"New.certificate.self.signed.", "New certificate (self-signed):"},
+ {"Reply.has.no.certificates", "Reply has no certificates"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Certificate not imported, alias <{0}> already exists"},
+ {"Input.not.an.X.509.certificate", "Input not an X.509 certificate"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "Certificate already exists in keystore under alias <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "Do you still want to add it? [no]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "Certificate already exists in system-wide CA keystore under alias <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "Do you still want to add it to your own keystore? [no]: "},
+ {"Trust.this.certificate.no.", "Trust this certificate? [no]: "},
+ {"YES", "YES"},
+ {"New.prompt.", "New {0}: "},
+ {"Passwords.must.differ", "Passwords must differ"},
+ {"Re.enter.new.prompt.", "Re-enter new {0}: "},
+ {"Re.enter.new.password.", "Re-enter new password: "},
+ {"They.don.t.match.Try.again", "They don't match. Try again"},
+ {"Enter.prompt.alias.name.", "Enter {0} alias name: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Enter new alias name\t(RETURN to cancel import for this entry): "},
+ {"Enter.alias.name.", "Enter alias name: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN if same as for <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signature algorithm name: {8}\n\t Version: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "What is your first and last name?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "What is the name of your organizational unit?"},
+ {"What.is.the.name.of.your.organization.",
+ "What is the name of your organization?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "What is the name of your City or Locality?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "What is the name of your State or Province?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "What is the two-letter country code for this unit?"},
+ {"Is.name.correct.", "Is {0} correct?"},
+ {"no", "no"},
+ {"yes", "yes"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "Alias <{0}> has no key"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "Alias <{0}> references an entry type that is not a private key entry. The -keyclone command only supports cloning of private key entries"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** WARNING WARNING WARNING *****************"},
+ {"Signer.d.", "Signer #%d:"},
+ {"Timestamp.", "Timestamp:"},
+ {"Signature.", "Signature:"},
+ {"CRLs.", "CRLs:"},
+ {"Certificate.owner.", "Certificate owner: "},
+ {"Not.a.signed.jar.file", "Not a signed jar file"},
+ {"No.certificate.from.the.SSL.server",
+ "No certificate from the SSL server"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* The integrity of the information stored in your keystore *\n" +
+ "* has NOT been verified! In order to verify its integrity, *\n" +
+ "* you must provide your keystore password. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* The integrity of the information stored in the srckeystore*\n" +
+ "* has NOT been verified! In order to verify its integrity, *\n" +
+ "* you must provide the srckeystore password. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "Certificate reply does not contain public key for <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Incomplete certificate chain in reply"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "Certificate chain in reply does not verify: "},
+ {"Top.level.certificate.in.reply.",
+ "Top-level certificate in reply:\n"},
+ {".is.not.trusted.", "... is not trusted. "},
+ {"Install.reply.anyway.no.", "Install reply anyway? [no]: "},
+ {"NO", "NO"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "Public keys in reply and keystore don't match"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "Certificate reply and certificate in keystore are identical"},
+ {"Failed.to.establish.chain.from.reply",
+ "Failed to establish chain from reply"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "Wrong answer, try again"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "Secret Key not generated, alias <{0}> already exists"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Please provide -keysize for secret key generation"},
+
+ {"verified.by.s.in.s", "Verified by %s in %s"},
+ {"warning.not.verified.make.sure.keystore.is.correct",
+ "WARNING: not verified. Make sure -keystore is correct."},
+
+ {"Extensions.", "Extensions: "},
+ {".Empty.value.", "(Empty value)"},
+ {"Extension.Request.", "Extension Request:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 Certificate Request (Version 1.0)\n" +
+ "Subject: %s\nPublic Key: %s format %s key\n"},
+ {"Unknown.keyUsage.type.", "Unknown keyUsage type: "},
+ {"Unknown.extendedkeyUsage.type.", "Unknown extendedkeyUsage type: "},
+ {"Unknown.AccessDescription.type.", "Unknown AccessDescription type: "},
+ {"Unrecognized.GeneralName.type.", "Unrecognized GeneralName type: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "This extension cannot be marked as critical. "},
+ {"Odd.number.of.hex.digits.found.", "Odd number of hex digits found: "},
+ {"Unknown.extension.type.", "Unknown extension type: "},
+ {"command.{0}.is.ambiguous.", "command {0} is ambiguous:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java
new file mode 100644
index 0000000..087362c
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_de extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Option]..."},
+ {"Options.", "Optionen:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
+ {"Key.and.Certificate.Management.Tool",
+ "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
+ {"Commands.", "Befehle:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "\"keytool -command_name -help\" f\u00FCr Verwendung von command_name verwenden"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Generiert eine Zertifikatanforderung"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u00C4ndert den Alias eines Eintrags"}, //-changealias
+ {"Deletes.an.entry",
+ "L\u00F6scht einen Eintrag"}, //-delete
+ {"Exports.certificate",
+ "Exportiert ein Zertifikat"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Generiert ein Schl\u00FCsselpaar"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "Generiert einen Secret Key"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Generiert ein Zertifikat aus einer Zertifikatanforderung"}, //-gencert
+ {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importiert Eintr\u00E4ge aus einer Identity-Datenbank im JDK 1.1.x-Stil"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importiert ein Zertifikat oder eine Zertifikatkette"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importiert einen oder alle Eintr\u00E4ge aus einem anderen Keystore"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Clont einen Schl\u00FCsseleintrag"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u00C4ndert das Schl\u00FCsselkennwort eines Eintrags"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Listet die Eintr\u00E4ge in einem Keystore auf"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Druckt den Content eines Zertifikats"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Druckt den Content einer Zertifikatanforderung"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Druckt den Content einer CRL-Datei"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "Aliasname des zu verarbeitenden Eintrags"}, //-alias
+ {"destination.alias",
+ "Zielalias"}, //-destalias
+ {"destination.key.password",
+ "Zielschl\u00FCssel-Kennwort"}, //-destkeypass
+ {"destination.keystore.name",
+ "Ziel-Keystore-Name"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "Ziel-Keystore kennwortgesch\u00FCtzt"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "Ziel-Keystore-Providername"}, //-destprovidername
+ {"destination.keystore.password",
+ "Ziel-Keystore-Kennwort"}, //-deststorepass
+ {"destination.keystore.type",
+ "Ziel-Keystore-Typ"}, //-deststoretype
+ {"distinguished.name",
+ "Distinguished Name"}, //-dname
+ {"X.509.extension",
+ "X.509-Erweiterung"}, //-ext
+ {"output.file.name",
+ "Ausgabedateiname"}, //-file and -outfile
+ {"input.file.name",
+ "Eingabedateiname"}, //-file and -infile
+ {"key.algorithm.name",
+ "Schl\u00FCsselalgorithmusname"}, //-keyalg
+ {"key.password",
+ "Schl\u00FCsselkennwort"}, //-keypass
+ {"key.bit.size",
+ "Schl\u00FCsselbitgr\u00F6\u00DFe"}, //-keysize
+ {"keystore.name",
+ "Keystore-Name"}, //-keystore
+ {"new.password",
+ "Neues Kennwort"}, //-new
+ {"do.not.prompt",
+ "Kein Prompt"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
+ {"provider.argument",
+ "Providerargument"}, //-providerarg
+ {"provider.class.name",
+ "Providerklassenname"}, //-providerclass
+ {"provider.name",
+ "Providername"}, //-providername
+ {"provider.classpath",
+ "Provider-Classpath"}, //-providerpath
+ {"output.in.RFC.style",
+ "Ausgabe in RFC-Stil"}, //-rfc
+ {"signature.algorithm.name",
+ "Signaturalgorithmusname"}, //-sigalg
+ {"source.alias",
+ "Quellalias"}, //-srcalias
+ {"source.key.password",
+ "Quellschl\u00FCssel-Kennwort"}, //-srckeypass
+ {"source.keystore.name",
+ "Quell-Keystore-Name"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "Quell-Keystore kennwortgesch\u00FCtzt"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "Quell-Keystore-Providername"}, //-srcprovidername
+ {"source.keystore.password",
+ "Quell-Keystore-Kennwort"}, //-srcstorepass
+ {"source.keystore.type",
+ "Quell-Keystore-Typ"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL-Serverhost und -port"}, //-sslserver
+ {"signed.jar.file",
+ "Signierte JAR-Datei"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "Anfangsdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
+ {"keystore.password",
+ "Keystore-Kennwort"}, //-storepass
+ {"keystore.type",
+ "Keystore-Typ"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "Zertifikaten aus cacerts vertrauen"}, //-trustcacerts
+ {"verbose.output",
+ "Verbose-Ausgabe"}, //-v
+ {"validity.number.of.days",
+ "G\u00FCltigkeitsdauer (Tage)"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "Serielle ID des zu entziehenden Certs"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "Keytool-Fehler: "},
+ {"Illegal.option.", "Ung\u00FCltige Option: "},
+ {"Illegal.value.", "Ung\u00FCltiger Wert: "},
+ {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
+ {"Cannot.find.environment.variable.",
+ "Umgebungsvariable kann nicht gefunden werden: "},
+ {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
+ {"Command.option.flag.needs.an.argument.", "Befehlsoption {0} ben\u00F6tigt ein Argument."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Warnung: Keine Unterst\u00FCtzung f\u00FCr unterschiedliche Speicher- und Schl\u00FCsselkennw\u00F6rter bei PKCS12 KeyStores. Der benutzerdefinierte Wert {0} wird ignoriert."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore muss NONE sein, wenn -storetype {0} ist"},
+ {"Too.many.retries.program.terminated",
+ "Zu viele erneute Versuche. Programm wird beendet"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "Befehle -storepasswd und -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype {0} ist"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "Befehle des Typs -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype PKCS12 ist"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-keypass und -new k\u00F6nnen nicht angegeben werden, wenn -storetype {0} ist"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "Wenn -protected angegeben ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Wenn -srcprotected angegeben ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
+ {"Illegal.startdate.value", "Ung\u00FCltiger Wert f\u00FCr Anfangsdatum"},
+ {"Validity.must.be.greater.than.zero",
+ "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
+ {"provName.not.a.provider", "{0} kein Provider"},
+ {"Usage.error.no.command.provided", "Verwendungsfehler: Kein Befehl angegeben"},
+ {"Source.keystore.file.exists.but.is.empty.", "Quell-Keystore-Datei ist zwar vorhanden, ist aber leer: "},
+ {"Please.specify.srckeystore", "Geben Sie -srckeystore an"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "-v und -rfc d\u00FCrfen bei Befehl \"list\" nicht beide angegeben werden"},
+ {"Key.password.must.be.at.least.6.characters",
+ "Schl\u00FCsselkennwort muss mindestens sechs Zeichen lang sein"},
+ {"New.password.must.be.at.least.6.characters",
+ "Neues Kennwort muss mindestens sechs Zeichen lang sein"},
+ {"Keystore.file.exists.but.is.empty.",
+ "Keystore-Datei ist vorhanden, ist aber leer: "},
+ {"Keystore.file.does.not.exist.",
+ "Keystore-Datei ist nicht vorhanden: "},
+ {"Must.specify.destination.alias", "Sie m\u00FCssen einen Zielalias angeben"},
+ {"Must.specify.alias", "Sie m\u00FCssen einen Alias angeben"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "Keystore-Kennwort muss mindestens sechs Zeichen lang sein"},
+ {"Enter.keystore.password.", "Keystore-Kennwort eingeben: "},
+ {"Enter.source.keystore.password.", "Quell-Keystore-Kennwort eingeben: "},
+ {"Enter.destination.keystore.password.", "Ziel-Keystore-Kennwort eingeben: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
+ {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
+ {"Too.many.failures.Alias.not.changed", "Zu viele Fehler. Alias nicht ge\u00E4ndert"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
+ {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Problem beim Importieren des Eintrags f\u00FCr Alias {0}: {1}.\nEintrag f\u00FCr Alias {0} nicht importiert."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Importbefehl abgeschlossen: {0} Eintr\u00E4ge erfolgreich importiert, {1} Eintr\u00E4ge nicht erfolgreich oder abgebrochen"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Warnung: Vorhandener Alias {0} in Ziel-Keystore wird \u00FCberschrieben"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "Eintragsalias {0} ist bereits vorhanden. \u00DCberschreiben? [Nein]: "},
+ {"Too.many.failures.try.later", "Zu viele Fehler. Versuchen Sie es sp\u00E4ter erneut"},
+ {"Certification.request.stored.in.file.filename.",
+ "Zertifizierungsanforderung in Datei <{0}> gespeichert"},
+ {"Submit.this.to.your.CA", "Leiten Sie dies an die CA weiter"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "Wenn kein Alias angegeben ist, d\u00FCrfen destalias, srckeypass und destkeypass nicht angegeben werden"},
+ {"Certificate.stored.in.file.filename.",
+ "Zertifikat in Datei <{0}> gespeichert"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "Zertifikatantwort wurde in Keystore installiert"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "Zertifikatantwort wurde nicht in Keystore installiert"},
+ {"Certificate.was.added.to.keystore",
+ "Zertifikat wurde Keystore hinzugef\u00FCgt"},
+ {"Certificate.was.not.added.to.keystore",
+ "Zertifikat wurde nicht zu Keystore hinzugef\u00FCgt"},
+ {".Storing.ksfname.", "[{0} wird gesichert]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} hat keinen Public Key (Zertifikat)"},
+ {"Cannot.derive.signature.algorithm",
+ "Signaturalgorithmus kann nicht abgeleitet werden"},
+ {"Alias.alias.does.not.exist",
+ "Alias <{0}> ist nicht vorhanden"},
+ {"Alias.alias.has.no.certificate",
+ "Alias <{0}> hat kein Zertifikat"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
+ {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN, wenn identisch mit Keystore-Kennwort): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "Schl\u00FCsselkennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Zu viele Fehler. Schl\u00FCssel wurde nicht zu Keystore hinzugef\u00FCgt"},
+ {"Destination.alias.dest.already.exists",
+ "Zielalias <{0}> bereits vorhanden"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geclont"},
+ {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "Keystore-Eintrag f\u00FCr <{0}> bereits vorhanden"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Keystore-Eintrag f\u00FCr <{0}> wird erstellt..."},
+ {"No.entries.from.identity.database.added",
+ "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
+ {"Alias.name.alias", "Aliasname: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Erstellungsdatum: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Eintragstyp: {0}"},
+ {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "},
+ {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "},
+ {"Keystore.type.", "Keystore-Typ: "},
+ {"Keystore.provider.", "Keystore-Provider: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Keystore enth\u00E4lt {0,number,integer} Eintrag"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Keystore enth\u00E4lt {0,number,integer} Eintr\u00E4ge"},
+ {"Failed.to.parse.input", "Eingabe konnte nicht geparst werden"},
+ {"Empty.input", "Leere Eingabe"},
+ {"Not.X.509.certificate", "Kein X.509-Zertifikat"},
+ {"alias.has.no.public.key", "{0} hat keinen Public Key"},
+ {"alias.has.no.X.509.certificate", "{0} hat kein X.509-Zertifikat"},
+ {"New.certificate.self.signed.", "Neues Zertifikat (selbst signiert):"},
+ {"Reply.has.no.certificates", "Antwort hat keine Zertifikate"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Zertifikat nicht importiert. Alias <{0}> ist bereits vorhanden"},
+ {"Input.not.an.X.509.certificate", "Eingabe kein X.509-Zertifikat"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "Zertifikat ist bereits unter Alias <{0}> im Keystore vorhanden"},
+ {"Do.you.still.want.to.add.it.no.",
+ "M\u00F6chten Sie es trotzdem hinzuf\u00FCgen? [Nein]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "Zertifikat ist bereits unter Alias <{0}> im systemweiten CA-Keystore vorhanden"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]: "},
+ {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]: "},
+ {"YES", "Ja"},
+ {"New.prompt.", "Neues {0}: "},
+ {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
+ {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
+ {"Re.enter.new.password.", "Neues Kennwort erneut eingeben: "},
+ {"They.don.t.match.Try.again", "Keine \u00DCbereinstimmung. Wiederholen Sie den Vorgang"},
+ {"Enter.prompt.alias.name.", "{0}-Aliasnamen eingeben: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Geben Sie einen neuen Aliasnamen ein\t(RETURN, um den Import dieses Eintrags abzubrechen): "},
+ {"Enter.alias.name.", "Aliasnamen eingeben: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN, wenn identisch mit <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikat-Fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signaturalgorithmusname: {8}\n\t Version: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "Wie lautet Ihr Vor- und Nachname?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "Wie lautet der Name Ihrer organisatorischen Einheit?"},
+ {"What.is.the.name.of.your.organization.",
+ "Wie lautet der Name Ihrer Organisation?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "Wie lautet der Name Ihrer Stadt oder Gemeinde?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "Wie lautet der Name Ihres Bundeslands?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "Wie lautet der L\u00E4ndercode (zwei Buchstaben) f\u00FCr diese Einheit?"},
+ {"Is.name.correct.", "Ist {0} richtig?"},
+ {"no", "Nein"},
+ {"yes", "Ja"},
+ {"y", "J"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Clonen von Private Key-Eintr\u00E4gen"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Warnung Warnung Warnung *****************"},
+ {"Signer.d.", "Signaturgeber #%d:"},
+ {"Timestamp.", "Zeitstempel:"},
+ {"Signature.", "Signatur:"},
+ {"CRLs.", "CRLs:"},
+ {"Certificate.owner.", "Zertifikateigent\u00FCmer: "},
+ {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
+ {"No.certificate.from.the.SSL.server",
+ "Kein Zertifikat vom SSL-Server"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Unvollst\u00E4ndige Zertifikatkette in Antwort"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "Zertifikatkette in Antwort verifiziert nicht: "},
+ {"Top.level.certificate.in.reply.",
+ "Zertifikat der obersten Ebene in Antwort:\n"},
+ {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
+ {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]: "},
+ {"NO", "Nein"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "Zertifikatantwort und Zertifikat in Keystore sind identisch"},
+ {"Failed.to.establish.chain.from.reply",
+ "Kette konnte der Antwort nicht entnommen werden"},
+ {"n", "N"},
+ {"Wrong.answer.try.again", "Falsche Antwort. Wiederholen Sie den Vorgang"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Geben Sie -keysize zum Erstellen eines Secret Keys an"},
+
+ {"Extensions.", "Erweiterungen: "},
+ {".Empty.value.", "(Leerer Wert)"},
+ {"Extension.Request.", "Erweiterungsanforderung:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubjekt: %s\nPublic Key: %s Format %s Schl\u00FCssel\n"},
+ {"Unknown.keyUsage.type.", "Unbekannter keyUsage-Typ: "},
+ {"Unknown.extendedkeyUsage.type.", "Unbekannter extendedkeyUsage-Typ: "},
+ {"Unknown.AccessDescription.type.", "Unbekannter AccessDescription-Typ: "},
+ {"Unrecognized.GeneralName.type.", "Unbekannter GeneralName-Typ: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Erweiterung kann nicht als \"Kritisch\" markiert werden. "},
+ {"Odd.number.of.hex.digits.found.", "Ungerade Anzahl hexadezimaler Ziffern gefunden: "},
+ {"Unknown.extension.type.", "Unbekannter Erweiterungstyp: "},
+ {"command.{0}.is.ambiguous.", "Befehl {0} ist mehrdeutig:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java
new file mode 100644
index 0000000..942c0ec
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_es extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Opci\u00F3n]..."},
+ {"Options.", "Opciones:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "Utilice\"keytool -help\" para todos los comandos disponibles"},
+ {"Key.and.Certificate.Management.Tool",
+ "Herramienta de Gesti\u00F3n de Certificados y Claves"},
+ {"Commands.", "Comandos:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "Utilice \"keytool -command_name -help\" para la sintaxis de nombre_comando"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Genera una solicitud de certificado"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "Cambia un alias de entrada"}, //-changealias
+ {"Deletes.an.entry",
+ "Suprime una entrada"}, //-delete
+ {"Exports.certificate",
+ "Exporta el certificado"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Genera un par de claves"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "Genera un clave secreta"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Genera un certificado a partir de una solicitud de certificado"}, //-gencert
+ {"Generates.CRL", "Genera CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importa entradas desde una base de datos de identidades JDK 1.1.x-style"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importa un certificado o una cadena de certificados"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importa una o todas las entradas desde otro almac\u00E9n de claves"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Clona una entrada de clave"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "Cambia la contrase\u00F1a de clave de una entrada"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Enumera las entradas de un almac\u00E9n de claves"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Imprime el contenido de un certificado"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Imprime el contenido de una solicitud de certificado"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Imprime el contenido de un archivo CRL"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Genera un certificado autofirmado"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "Cambia la contrase\u00F1a de almac\u00E9n de un almac\u00E9n de claves"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "nombre de alias de la entrada que se va a procesar"}, //-alias
+ {"destination.alias",
+ "alias de destino"}, //-destalias
+ {"destination.key.password",
+ "contrase\u00F1a de clave de destino"}, //-destkeypass
+ {"destination.keystore.name",
+ "nombre de almac\u00E9n de claves de destino"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "almac\u00E9n de claves de destino protegido por contrase\u00F1a"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "nombre de proveedor de almac\u00E9n de claves de destino"}, //-destprovidername
+ {"destination.keystore.password",
+ "contrase\u00F1a de almac\u00E9n de claves de destino"}, //-deststorepass
+ {"destination.keystore.type",
+ "tipo de almac\u00E9n de claves de destino"}, //-deststoretype
+ {"distinguished.name",
+ "nombre distintivo"}, //-dname
+ {"X.509.extension",
+ "extensi\u00F3n X.509"}, //-ext
+ {"output.file.name",
+ "nombre de archivo de salida"}, //-file and -outfile
+ {"input.file.name",
+ "nombre de archivo de entrada"}, //-file and -infile
+ {"key.algorithm.name",
+ "nombre de algoritmo de clave"}, //-keyalg
+ {"key.password",
+ "contrase\u00F1a de clave"}, //-keypass
+ {"key.bit.size",
+ "tama\u00F1o de bit de clave"}, //-keysize
+ {"keystore.name",
+ "nombre de almac\u00E9n de claves"}, //-keystore
+ {"new.password",
+ "nueva contrase\u00F1a"}, //-new
+ {"do.not.prompt",
+ "no solicitar"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "contrase\u00F1a a trav\u00E9s de mecanismo protegido"}, //-protected
+ {"provider.argument",
+ "argumento del proveedor"}, //-providerarg
+ {"provider.class.name",
+ "nombre de clase del proveedor"}, //-providerclass
+ {"provider.name",
+ "nombre del proveedor"}, //-providername
+ {"provider.classpath",
+ "classpath de proveedor"}, //-providerpath
+ {"output.in.RFC.style",
+ "salida en estilo RFC"}, //-rfc
+ {"signature.algorithm.name",
+ "nombre de algoritmo de firma"}, //-sigalg
+ {"source.alias",
+ "alias de origen"}, //-srcalias
+ {"source.key.password",
+ "contrase\u00F1a de clave de origen"}, //-srckeypass
+ {"source.keystore.name",
+ "nombre de almac\u00E9n de claves de origen"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "almac\u00E9n de claves de origen protegido por contrase\u00F1a"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "nombre de proveedor de almac\u00E9n de claves de origen"}, //-srcprovidername
+ {"source.keystore.password",
+ "contrase\u00F1a de almac\u00E9n de claves de origen"}, //-srcstorepass
+ {"source.keystore.type",
+ "tipo de almac\u00E9n de claves de origen"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "puerto y host del servidor SSL"}, //-sslserver
+ {"signed.jar.file",
+ "archivo jar firmado"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "fecha/hora de inicio de validez del certificado"}, //-startdate
+ {"keystore.password",
+ "contrase\u00F1a de almac\u00E9n de claves"}, //-storepass
+ {"keystore.type",
+ "tipo de almac\u00E9n de claves"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "certificados de protecci\u00F3n de cacerts"}, //-trustcacerts
+ {"verbose.output",
+ "salida detallada"}, //-v
+ {"validity.number.of.days",
+ "n\u00FAmero de validez de d\u00EDas"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "identificador de serie del certificado que se va a revocar"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "error de herramienta de claves: "},
+ {"Illegal.option.", "Opci\u00F3n no permitida: "},
+ {"Illegal.value.", "Valor no permitido: "},
+ {"Unknown.password.type.", "Tipo de contrase\u00F1a desconocido: "},
+ {"Cannot.find.environment.variable.",
+ "No se ha encontrado la variable del entorno: "},
+ {"Cannot.find.file.", "No se ha encontrado el archivo: "},
+ {"Command.option.flag.needs.an.argument.", "La opci\u00F3n de comando {0} necesita un argumento."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Advertencia: los almacenes de claves en formato PKCS12 no admiten contrase\u00F1as de clave y almacenamiento distintas. Se ignorar\u00E1 el valor especificado por el usuario, {0}."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore debe ser NONE si -storetype es {0}"},
+ {"Too.many.retries.program.terminated",
+ "Ha habido demasiados intentos, se ha cerrado el programa"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "Los comandos -storepasswd y -keypasswd no est\u00E1n soportados si -storetype es {0}"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "Los comandos -keypasswd no est\u00E1n soportados si -storetype es PKCS12"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-keypass y -new no se pueden especificar si -storetype es {0}"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "si se especifica -protected, no deben especificarse -storepass, -keypass ni -new"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Si se especifica -srcprotected, no se puede especificar -srcstorepass ni -srckeypass"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "Si keystore no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -storepass, -keypass ni -new"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Si el almac\u00E9n de claves de origen no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -srcstorepass ni -srckeypass"},
+ {"Illegal.startdate.value", "Valor de fecha de inicio no permitido"},
+ {"Validity.must.be.greater.than.zero",
+ "La validez debe ser mayor que cero"},
+ {"provName.not.a.provider", "{0} no es un proveedor"},
+ {"Usage.error.no.command.provided", "Error de sintaxis: no se ha proporcionado ning\u00FAn comando"},
+ {"Source.keystore.file.exists.but.is.empty.", "El archivo de almac\u00E9n de claves de origen existe, pero est\u00E1 vac\u00EDo: "},
+ {"Please.specify.srckeystore", "Especifique -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "No se deben especificar -v y -rfc simult\u00E1neamente con el comando 'list'"},
+ {"Key.password.must.be.at.least.6.characters",
+ "La contrase\u00F1a de clave debe tener al menos 6 caracteres"},
+ {"New.password.must.be.at.least.6.characters",
+ "La nueva contrase\u00F1a debe tener al menos 6 caracteres"},
+ {"Keystore.file.exists.but.is.empty.",
+ "El archivo de almac\u00E9n de claves existe, pero est\u00E1 vac\u00EDo: "},
+ {"Keystore.file.does.not.exist.",
+ "El archivo de almac\u00E9n de claves no existe: "},
+ {"Must.specify.destination.alias", "Se debe especificar un alias de destino"},
+ {"Must.specify.alias", "Se debe especificar un alias"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "La contrase\u00F1a del almac\u00E9n de claves debe tener al menos 6 caracteres"},
+ {"Enter.keystore.password.", "Introduzca la contrase\u00F1a del almac\u00E9n de claves: "},
+ {"Enter.source.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de origen: "},
+ {"Enter.destination.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de destino: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "La contrase\u00F1a del almac\u00E9n de claves es demasiado corta, debe tener al menos 6 caracteres"},
+ {"Unknown.Entry.Type", "Tipo de Entrada Desconocido"},
+ {"Too.many.failures.Alias.not.changed", "Demasiados fallos. No se ha cambiado el alias"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "La entrada del alias {0} se ha importado correctamente."},
+ {"Entry.for.alias.alias.not.imported.", "La entrada del alias {0} no se ha importado."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Problema al importar la entrada del alias {0}: {1}.\nNo se ha importado la entrada del alias {0}."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Comando de importaci\u00F3n completado: {0} entradas importadas correctamente, {1} entradas incorrectas o canceladas"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Advertencia: se sobrescribir\u00E1 el alias {0} en el almac\u00E9n de claves de destino"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "El alias de entrada existente {0} ya existe, \u00BFdesea sobrescribirlo? [no]: "},
+ {"Too.many.failures.try.later", "Demasiados fallos; int\u00E9ntelo m\u00E1s adelante"},
+ {"Certification.request.stored.in.file.filename.",
+ "Solicitud de certificaci\u00F3n almacenada en el archivo <{0}>"},
+ {"Submit.this.to.your.CA", "Enviar a la CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "si no se especifica el alias, no se puede especificar destalias, srckeypass ni destkeypass"},
+ {"Certificate.stored.in.file.filename.",
+ "Certificado almacenado en el archivo <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "Se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "No se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
+ {"Certificate.was.added.to.keystore",
+ "Se ha agregado el certificado al almac\u00E9n de claves"},
+ {"Certificate.was.not.added.to.keystore",
+ "No se ha agregado el certificado al almac\u00E9n de claves"},
+ {".Storing.ksfname.", "[Almacenando {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} no tiene clave p\u00FAblica (certificado)"},
+ {"Cannot.derive.signature.algorithm",
+ "No se puede derivar el algoritmo de firma"},
+ {"Alias.alias.does.not.exist",
+ "El alias <{0}> no existe"},
+ {"Alias.alias.has.no.certificate",
+ "El alias <{0}> no tiene certificado"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "No se ha generado el par de claves, el alias <{0}> ya existe"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Generando par de claves {1} de {0} bits para certificado autofirmado ({2}) con una validez de {3} d\u00EDas\n\tpara: {4}"},
+ {"Enter.key.password.for.alias.", "Introduzca la contrase\u00F1a de clave para <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(INTRO si es la misma contrase\u00F1a que la del almac\u00E9n de claves): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "La contrase\u00F1a de clave es demasiado corta; debe tener al menos 6 caracteres"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Demasiados fallos; no se ha agregado la clave al almac\u00E9n de claves"},
+ {"Destination.alias.dest.already.exists",
+ "El alias de destino <{0}> ya existe"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "La contrase\u00F1a es demasiado corta; debe tener al menos 6 caracteres"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Demasiados fallos. No se ha clonado la entrada de clave"},
+ {"key.password.for.alias.", "contrase\u00F1a de clave para <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "La entrada de almac\u00E9n de claves para <{0}> ya existe"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Creando entrada de almac\u00E9n de claves para <{0}> ..."},
+ {"No.entries.from.identity.database.added",
+ "No se han agregado entradas de la base de datos de identidades"},
+ {"Alias.name.alias", "Nombre de Alias: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Fecha de Creaci\u00F3n: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Tipo de Entrada: {0}"},
+ {"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "},
+ {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Huella Digital de Certificado (SHA1): "},
+ {"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "},
+ {"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Su almac\u00E9n de claves contiene {0,number,integer} entrada"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Su almac\u00E9n de claves contiene {0,number,integer} entradas"},
+ {"Failed.to.parse.input", "Fallo al analizar la entrada"},
+ {"Empty.input", "Entrada vac\u00EDa"},
+ {"Not.X.509.certificate", "No es un certificado X.509"},
+ {"alias.has.no.public.key", "{0} no tiene clave p\u00FAblica"},
+ {"alias.has.no.X.509.certificate", "{0} no tiene certificado X.509"},
+ {"New.certificate.self.signed.", "Nuevo Certificado (Autofirmado):"},
+ {"Reply.has.no.certificates", "La respuesta no tiene certificados"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Certificado no importado, el alias <{0}> ya existe"},
+ {"Input.not.an.X.509.certificate", "La entrada no es un certificado X.509"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "El certificado ya existe en el almac\u00E9n de claves con el alias <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "\u00BFA\u00FAn desea agregarlo? [no]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "El certificado ya existe en el almac\u00E9n de claves de la CA del sistema, con el alias <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]: "},
+ {"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]: "},
+ {"YES", "S\u00ED"},
+ {"New.prompt.", "Nuevo {0}: "},
+ {"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"},
+ {"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "},
+ {"Re.enter.new.password.", "Volver a escribir la contrase\u00F1a nueva: "},
+ {"They.don.t.match.Try.again", "No coinciden. Int\u00E9ntelo de nuevo"},
+ {"Enter.prompt.alias.name.", "Escriba el nombre de alias de {0}: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Indique el nuevo nombre de alias\t(INTRO para cancelar la importaci\u00F3n de esta entrada): "},
+ {"Enter.alias.name.", "Introduzca el nombre de alias: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(INTRO si es el mismo que para <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Propietario: {0}\nEmisor: {1}\nN\u00FAmero de serie: {2}\nV\u00E1lido desde: {3} hasta: {4}\nHuellas digitales del Certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nombre del Algoritmo de Firma: {8}\n\t Versi\u00F3n: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\u00BFCu\u00E1les son su nombre y su apellido?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\u00BFCu\u00E1l es el nombre de su unidad de organizaci\u00F3n?"},
+ {"What.is.the.name.of.your.organization.",
+ "\u00BFCu\u00E1l es el nombre de su organizaci\u00F3n?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\u00BFCu\u00E1l es el nombre de su ciudad o localidad?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\u00BFCu\u00E1l es el nombre de su estado o provincia?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\u00BFCu\u00E1l es el c\u00F3digo de pa\u00EDs de dos letras de la unidad?"},
+ {"Is.name.correct.", "\u00BFEs correcto {0}?"},
+ {"no", "no"},
+ {"yes", "s\u00ED"},
+ {"y", "s"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "El alias <{0}> no tiene clave"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Advertencia Advertencia Advertencia *****************"},
+ {"Signer.d.", "#%d de Firmante:"},
+ {"Timestamp.", "Registro de Hora:"},
+ {"Signature.", "Firma:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "Propietario del Certificado: "},
+ {"Not.a.signed.jar.file", "No es un archivo jar firmado"},
+ {"No.certificate.from.the.SSL.server",
+ "Ning\u00FAn certificado del servidor SSL"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves *\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Cadena de certificado incompleta en la respuesta"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "La cadena de certificado de la respuesta no verifica: "},
+ {"Top.level.certificate.in.reply.",
+ "Certificado de nivel superior en la respuesta:\n"},
+ {".is.not.trusted.", "... no es de confianza. "},
+ {"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]: "},
+ {"NO", "No"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "La respuesta del certificado y el certificado en el almac\u00E9n de claves son id\u00E9nticos"},
+ {"Failed.to.establish.chain.from.reply",
+ "No se ha podido definir una cadena a partir de la respuesta"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "Respuesta incorrecta, vuelva a intentarlo"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "No se ha generado la clave secreta, el alias <{0}> ya existe"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Proporcione el valor de -keysize para la generaci\u00F3n de claves secretas"},
+
+ {"Extensions.", "Extensiones: "},
+ {".Empty.value.", "(Valor vac\u00EDo)"},
+ {"Extension.Request.", "Solicitud de Extensi\u00F3n:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "Solicitud de Certificado PKCS #10 (Versi\u00F3n 1.0)\nAsunto: %s\nClave P\u00FAblica: %s formato %s clave\n"},
+ {"Unknown.keyUsage.type.", "Tipo de uso de clave desconocido: "},
+ {"Unknown.extendedkeyUsage.type.", "Tipo de uso de clave extendida desconocido: "},
+ {"Unknown.AccessDescription.type.", "Tipo de descripci\u00F3n de acceso desconocido: "},
+ {"Unrecognized.GeneralName.type.", "Tipo de nombre general no reconocido: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Esta extensi\u00F3n no se puede marcar como cr\u00EDtica. "},
+ {"Odd.number.of.hex.digits.found.", "Se ha encontrado un n\u00FAmero impar de d\u00EDgitos hexadecimales: "},
+ {"Unknown.extension.type.", "Tipo de extensi\u00F3n desconocida: "},
+ {"command.{0}.is.ambiguous.", "El comando {0} es ambiguo:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java
new file mode 100644
index 0000000..2ae1476
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_fr extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Option]..."},
+ {"Options.", "Options :"},
+ {"Use.keytool.help.for.all.available.commands",
+ "Utiliser \"keytool -help\" pour toutes les commandes disponibles"},
+ {"Key.and.Certificate.Management.Tool",
+ "Outil de gestion de certificats et de cl\u00E9s"},
+ {"Commands.", "Commandes :"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "Utiliser \"keytool -command_name -help\" pour la syntaxe de command_name"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "G\u00E9n\u00E8re une demande de certificat"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "Modifie l'alias d'une entr\u00E9e"}, //-changealias
+ {"Deletes.an.entry",
+ "Supprime une entr\u00E9e"}, //-delete
+ {"Exports.certificate",
+ "Exporte le certificat"}, //-exportcert
+ {"Generates.a.key.pair",
+ "G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "G\u00E9n\u00E8re le certificat \u00E0 partir d'une demande de certificat"}, //-gencert
+ {"Generates.CRL", "G\u00E9n\u00E8re la liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importe les entr\u00E9es \u00E0 partir d'une base de donn\u00E9es d'identit\u00E9s de type JDK 1.1.x"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importe un certificat ou une cha\u00EEne de certificat"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importe une entr\u00E9e ou la totalit\u00E9 des entr\u00E9es depuis un autre fichier de cl\u00E9s"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Clone une entr\u00E9e de cl\u00E9"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "Modifie le mot de passe de cl\u00E9 d'une entr\u00E9e"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "R\u00E9pertorie les entr\u00E9es d'un fichier de cl\u00E9s"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Imprime le contenu d'un certificat"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Imprime le contenu d'une demande de certificat"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Imprime le contenu d'un fichier de liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "G\u00E9n\u00E8re un certificat auto-sign\u00E9"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "Modifie le mot de passe de banque d'un fichier de cl\u00E9s"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "nom d'alias de l'entr\u00E9e \u00E0 traiter"}, //-alias
+ {"destination.alias",
+ "alias de destination"}, //-destalias
+ {"destination.key.password",
+ "mot de passe de la cl\u00E9 de destination"}, //-destkeypass
+ {"destination.keystore.name",
+ "nom du fichier de cl\u00E9s de destination"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "mot de passe du fichier de cl\u00E9s de destination prot\u00E9g\u00E9"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "nom du fournisseur du fichier de cl\u00E9s de destination"}, //-destprovidername
+ {"destination.keystore.password",
+ "mot de passe du fichier de cl\u00E9s de destination"}, //-deststorepass
+ {"destination.keystore.type",
+ "type du fichier de cl\u00E9s de destination"}, //-deststoretype
+ {"distinguished.name",
+ "nom distinctif"}, //-dname
+ {"X.509.extension",
+ "extension X.509"}, //-ext
+ {"output.file.name",
+ "nom du fichier de sortie"}, //-file and -outfile
+ {"input.file.name",
+ "nom du fichier d'entr\u00E9e"}, //-file and -infile
+ {"key.algorithm.name",
+ "nom de l'algorithme de cl\u00E9"}, //-keyalg
+ {"key.password",
+ "mot de passe de la cl\u00E9"}, //-keypass
+ {"key.bit.size",
+ "taille en bits de la cl\u00E9"}, //-keysize
+ {"keystore.name",
+ "nom du fichier de cl\u00E9s"}, //-keystore
+ {"new.password",
+ "nouveau mot de passe"}, //-new
+ {"do.not.prompt",
+ "ne pas inviter"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "mot de passe via m\u00E9canisme prot\u00E9g\u00E9"}, //-protected
+ {"provider.argument",
+ "argument du fournisseur"}, //-providerarg
+ {"provider.class.name",
+ "nom de la classe de fournisseur"}, //-providerclass
+ {"provider.name",
+ "nom du fournisseur"}, //-providername
+ {"provider.classpath",
+ "variable d'environnement CLASSPATH du fournisseur"}, //-providerpath
+ {"output.in.RFC.style",
+ "sortie au style RFC"}, //-rfc
+ {"signature.algorithm.name",
+ "nom de l'algorithme de signature"}, //-sigalg
+ {"source.alias",
+ "alias source"}, //-srcalias
+ {"source.key.password",
+ "mot de passe de la cl\u00E9 source"}, //-srckeypass
+ {"source.keystore.name",
+ "nom du fichier de cl\u00E9s source"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "mot de passe du fichier de cl\u00E9s source prot\u00E9g\u00E9"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "nom du fournisseur du fichier de cl\u00E9s source"}, //-srcprovidername
+ {"source.keystore.password",
+ "mot de passe du fichier de cl\u00E9s source"}, //-srcstorepass
+ {"source.keystore.type",
+ "type du fichier de cl\u00E9s source"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "Port et h\u00F4te du serveur SSL"}, //-sslserver
+ {"signed.jar.file",
+ "fichier JAR sign\u00E9"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "date/heure de d\u00E9but de validit\u00E9 du certificat"}, //-startdate
+ {"keystore.password",
+ "mot de passe du fichier de cl\u00E9s"}, //-storepass
+ {"keystore.type",
+ "type du fichier de cl\u00E9s"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "certificats s\u00E9curis\u00E9s issus de certificats CA"}, //-trustcacerts
+ {"verbose.output",
+ "sortie en mode verbose"}, //-v
+ {"validity.number.of.days",
+ "nombre de jours de validit\u00E9"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "ID de s\u00E9rie du certificat \u00E0 r\u00E9voquer"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "erreur keytool : "},
+ {"Illegal.option.", "Option non admise : "},
+ {"Illegal.value.", "Valeur non admise : "},
+ {"Unknown.password.type.", "Type de mot de passe inconnu : "},
+ {"Cannot.find.environment.variable.",
+ "Variable d'environnement introuvable : "},
+ {"Cannot.find.file.", "Fichier introuvable : "},
+ {"Command.option.flag.needs.an.argument.", "L''option de commande {0} requiert un argument."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Avertissement\u00A0: les mots de passe de cl\u00E9 et de banque distincts ne sont pas pris en charge pour les fichiers de cl\u00E9s d''acc\u00E8s PKCS12. La valeur {0} sp\u00E9cifi\u00E9e par l''utilisateur est ignor\u00E9e."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore doit \u00EAtre d\u00E9fini sur NONE si -storetype est {0}"},
+ {"Too.many.retries.program.terminated",
+ "Trop de tentatives, fin du programme"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "Les commandes -storepasswd et -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur {0}"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "Les commandes -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur PKCS12"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "Les commandes -keypass et -new ne peuvent pas \u00EAtre sp\u00E9cifi\u00E9es si -storetype est d\u00E9fini sur {0}"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "si -protected est sp\u00E9cifi\u00E9, -storepass, -keypass et -new ne doivent pas \u00EAtre indiqu\u00E9s"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Si -srcprotected est indiqu\u00E9, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "Si le fichier de cl\u00E9s n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -storepass, -keypass et -new ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Si le fichier de cl\u00E9s source n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
+ {"Illegal.startdate.value", "Valeur de date de d\u00E9but non admise"},
+ {"Validity.must.be.greater.than.zero",
+ "La validit\u00E9 doit \u00EAtre sup\u00E9rieure \u00E0 z\u00E9ro"},
+ {"provName.not.a.provider", "{0} n''est pas un fournisseur"},
+ {"Usage.error.no.command.provided", "Erreur de syntaxe\u00A0: aucune commande fournie"},
+ {"Source.keystore.file.exists.but.is.empty.", "Le fichier de cl\u00E9s source existe mais il est vide : "},
+ {"Please.specify.srckeystore", "Indiquez -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "-v et -rfc ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s avec la commande 'list'"},
+ {"Key.password.must.be.at.least.6.characters",
+ "Un mot de passe de cl\u00E9 doit comporter au moins 6 caract\u00E8res"},
+ {"New.password.must.be.at.least.6.characters",
+ "Le nouveau mot de passe doit comporter au moins 6 caract\u00E8res"},
+ {"Keystore.file.exists.but.is.empty.",
+ "Fichier de cl\u00E9s existant mais vide : "},
+ {"Keystore.file.does.not.exist.",
+ "Le fichier de cl\u00E9s n'existe pas : "},
+ {"Must.specify.destination.alias", "L'alias de destination doit \u00EAtre sp\u00E9cifi\u00E9"},
+ {"Must.specify.alias", "L'alias doit \u00EAtre sp\u00E9cifi\u00E9"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "Un mot de passe de fichier de cl\u00E9s doit comporter au moins 6 caract\u00E8res"},
+ {"Enter.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s : "},
+ {"Enter.source.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s source\u00A0: "},
+ {"Enter.destination.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s de destination\u00A0: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "Le mot de passe du fichier de cl\u00E9s est trop court : il doit comporter au moins 6 caract\u00E8res"},
+ {"Unknown.Entry.Type", "Type d'entr\u00E9e inconnu"},
+ {"Too.many.failures.Alias.not.changed", "Trop d'erreurs. Alias non modifi\u00E9"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "L''entr\u00E9e de l''alias {0} a \u00E9t\u00E9 import\u00E9e."},
+ {"Entry.for.alias.alias.not.imported.", "L''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Probl\u00E8me lors de l''import de l''entr\u00E9e de l''alias {0}\u00A0: {1}.\nL''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Commande d''import ex\u00E9cut\u00E9e\u00A0: {0} entr\u00E9es import\u00E9es, \u00E9chec ou annulation de {1} entr\u00E9es"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Avertissement\u00A0: l''alias {0} existant sera remplac\u00E9 dans le fichier de cl\u00E9s d''acc\u00E8s de destination"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "L''alias d''entr\u00E9e {0} existe d\u00E9j\u00E0. Voulez-vous le remplacer ? [non]\u00A0: "},
+ {"Too.many.failures.try.later", "Trop d'erreurs. R\u00E9essayez plus tard"},
+ {"Certification.request.stored.in.file.filename.",
+ "Demande de certification stock\u00E9e dans le fichier <{0}>"},
+ {"Submit.this.to.your.CA", "Soumettre \u00E0 votre CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "si l'alias n'est pas sp\u00E9cifi\u00E9, destalias, srckeypass et destkeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s"},
+ {"Certificate.stored.in.file.filename.",
+ "Certificat stock\u00E9 dans le fichier <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "R\u00E9ponse de certificat install\u00E9e dans le fichier de cl\u00E9s"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "R\u00E9ponse de certificat non install\u00E9e dans le fichier de cl\u00E9s"},
+ {"Certificate.was.added.to.keystore",
+ "Certificat ajout\u00E9 au fichier de cl\u00E9s"},
+ {"Certificate.was.not.added.to.keystore",
+ "Certificat non ajout\u00E9 au fichier de cl\u00E9s"},
+ {".Storing.ksfname.", "[Stockage de {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} ne poss\u00E8de pas de cl\u00E9 publique (certificat)"},
+ {"Cannot.derive.signature.algorithm",
+ "Impossible de d\u00E9duire l'algorithme de signature"},
+ {"Alias.alias.does.not.exist",
+ "L''alias <{0}> n''existe pas"},
+ {"Alias.alias.has.no.certificate",
+ "L''alias <{0}> ne poss\u00E8de pas de certificat"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Paire de cl\u00E9s non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "G\u00E9n\u00E9ration d''une paire de cl\u00E9s {1} de {0} bits et d''un certificat auto-sign\u00E9 ({2}) d''une validit\u00E9 de {3} jours\n\tpour : {4}"},
+ {"Enter.key.password.for.alias.", "Entrez le mot de passe de la cl\u00E9 pour <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(appuyez sur Entr\u00E9e s'il s'agit du mot de passe du fichier de cl\u00E9s) : "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "Le mot de passe de la cl\u00E9 est trop court : il doit comporter au moins 6 caract\u00E8res"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Trop d'erreurs. Cl\u00E9 non ajout\u00E9e au fichier de cl\u00E9s"},
+ {"Destination.alias.dest.already.exists",
+ "L''alias de la destination <{0}> existe d\u00E9j\u00E0"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "Le mot de passe est trop court : il doit comporter au moins 6 caract\u00E8res"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Trop d'erreurs. Entr\u00E9e de cl\u00E9 non clon\u00E9e"},
+ {"key.password.for.alias.", "mot de passe de cl\u00E9 pour <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "L''entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}> existe d\u00E9j\u00E0"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Cr\u00E9ation d''une entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}>..."},
+ {"No.entries.from.identity.database.added",
+ "Aucune entr\u00E9e ajout\u00E9e \u00E0 partir de la base de donn\u00E9es d'identit\u00E9s"},
+ {"Alias.name.alias", "Nom d''alias : {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Date de cr\u00E9ation : {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Type d''entr\u00E9e\u00A0: {0}"},
+ {"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "},
+ {"Certificate.i.1.", "Certificat[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Empreinte du certificat (SHA1) : "},
+ {"Keystore.type.", "Type de fichier de cl\u00E9s : "},
+ {"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9e"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9es"},
+ {"Failed.to.parse.input", "L'analyse de l'entr\u00E9e a \u00E9chou\u00E9"},
+ {"Empty.input", "Entr\u00E9e vide"},
+ {"Not.X.509.certificate", "Pas un certificat X.509"},
+ {"alias.has.no.public.key", "{0} ne poss\u00E8de pas de cl\u00E9 publique"},
+ {"alias.has.no.X.509.certificate", "{0} ne poss\u00E8de pas de certificat X.509"},
+ {"New.certificate.self.signed.", "Nouveau certificat (auto-sign\u00E9) :"},
+ {"Reply.has.no.certificates", "La r\u00E9ponse n'a pas de certificat"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Certificat non import\u00E9, l''alias <{0}> existe d\u00E9j\u00E0"},
+ {"Input.not.an.X.509.certificate", "L'entr\u00E9e n'est pas un certificat X.509"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s sous l''alias <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "Voulez-vous toujours l'ajouter ? [non] : "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s CA syst\u00E8me sous l''alias <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] : "},
+ {"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] : "},
+ {"YES", "Oui"},
+ {"New.prompt.", "Nouveau {0} : "},
+ {"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"},
+ {"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "},
+ {"Re.enter.new.password.", "Ressaisissez le nouveau mot de passe : "},
+ {"They.don.t.match.Try.again", "Ils sont diff\u00E9rents. R\u00E9essayez."},
+ {"Enter.prompt.alias.name.", "Indiquez le nom d''alias {0} : "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Saisissez le nom du nouvel alias\t(ou appuyez sur Entr\u00E9e pour annuler l'import de cette entr\u00E9e)\u00A0: "},
+ {"Enter.alias.name.", "Indiquez le nom d'alias : "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(appuyez sur Entr\u00E9e si le r\u00E9sultat est identique \u00E0 <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Propri\u00E9taire : {0}\nEmetteur : {1}\nNum\u00E9ro de s\u00E9rie : {2}\nValide du : {3} au : {4}\nEmpreintes du certificat :\n\t MD5: {5}\n\t SHA1 : {6}\n\t SHA256 : {7}\n\t Nom de l''algorithme de signature : {8}\n\t Version : {9}"},
+ {"What.is.your.first.and.last.name.",
+ "Quels sont vos nom et pr\u00E9nom ?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "Quel est le nom de votre unit\u00E9 organisationnelle ?"},
+ {"What.is.the.name.of.your.organization.",
+ "Quel est le nom de votre entreprise ?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "Quel est le nom de votre ville de r\u00E9sidence ?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "Quel est le nom de votre \u00E9tat ou province ?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "Quel est le code pays \u00E0 deux lettres pour cette unit\u00E9 ?"},
+ {"Is.name.correct.", "Est-ce {0} ?"},
+ {"no", "non"},
+ {"yes", "oui"},
+ {"y", "o"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "L''alias <{0}> n''est associ\u00E9 \u00E0 aucune cl\u00E9"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Avertissement Avertissement Avertissement *****************"},
+ {"Signer.d.", "Signataire n\u00B0%d :"},
+ {"Timestamp.", "Horodatage :"},
+ {"Signature.", "Signature :"},
+ {"CRLs.", "Listes des certificats r\u00E9voqu\u00E9s (CRL) :"},
+ {"Certificate.owner.", "Propri\u00E9taire du certificat : "},
+ {"Not.a.signed.jar.file", "Fichier JAR non sign\u00E9"},
+ {"No.certificate.from.the.SSL.server",
+ "Aucun certificat du serveur SSL"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Cha\u00EEne de certificat incompl\u00E8te dans la r\u00E9ponse"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "La cha\u00EEne de certificat de la r\u00E9ponse ne concorde pas : "},
+ {"Top.level.certificate.in.reply.",
+ "Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"},
+ {".is.not.trusted.", "... non s\u00E9curis\u00E9. "},
+ {"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] : "},
+ {"NO", "Non"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "La r\u00E9ponse au certificat et le certificat du fichier de cl\u00E9s sont identiques"},
+ {"Failed.to.establish.chain.from.reply",
+ "Impossible de cr\u00E9er une cha\u00EEne \u00E0 partir de la r\u00E9ponse"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "R\u00E9ponse incorrecte, recommencez"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "Cl\u00E9 secr\u00E8te non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Indiquez -keysize pour la g\u00E9n\u00E9ration de la cl\u00E9 secr\u00E8te"},
+
+ {"Extensions.", "Extensions\u00A0: "},
+ {".Empty.value.", "(Valeur vide)"},
+ {"Extension.Request.", "Demande d'extension :"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "Demande de certificat PKCS #10 (version 1.0)\nSujet : %s\nCl\u00E9 publique : format %s pour la cl\u00E9 %s\n"},
+ {"Unknown.keyUsage.type.", "Type keyUsage inconnu : "},
+ {"Unknown.extendedkeyUsage.type.", "Type extendedkeyUsage inconnu : "},
+ {"Unknown.AccessDescription.type.", "Type AccessDescription inconnu : "},
+ {"Unrecognized.GeneralName.type.", "Type GeneralName non reconnu : "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Cette extension ne peut pas \u00EAtre marqu\u00E9e comme critique. "},
+ {"Odd.number.of.hex.digits.found.", "Nombre impair de chiffres hexad\u00E9cimaux trouv\u00E9 : "},
+ {"Unknown.extension.type.", "Type d'extension inconnu : "},
+ {"command.{0}.is.ambiguous.", "commande {0} ambigu\u00EB :"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java
new file mode 100644
index 0000000..0557fdc
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_it extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Opzione]..."},
+ {"Options.", "Opzioni:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"},
+ {"Key.and.Certificate.Management.Tool",
+ "Strumento di gestione di chiavi e certificati"},
+ {"Commands.", "Comandi:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "Utilizzare \"keytool -command_name -help\" per informazioni sull'uso di command_name"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Genera una richiesta di certificato"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "Modifica l'alias di una voce"}, //-changealias
+ {"Deletes.an.entry",
+ "Elimina una voce"}, //-delete
+ {"Exports.certificate",
+ "Esporta il certificato"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Genera una coppia di chiavi"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "Genera una chiave segreta"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Genera un certificato da una richiesta di certificato"}, //-gencert
+ {"Generates.CRL", "Genera CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importa le voci da un database delle identit\u00E0 di tipo JDK 1.1.x"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importa un certificato o una catena di certificati"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importa una o tutte le voci da un altro keystore"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Duplica una voce di chiave"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "Modifica la password della chiave per una voce"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Elenca le voci in un keystore"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Visualizza i contenuti di un certificato"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Visualizza i contenuti di una richiesta di certificato"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Visualizza i contenuti di un file CRL"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Genera certificato con firma automatica"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "Modifica la password di area di memorizzazione di un keystore"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "nome alias della voce da elaborare"}, //-alias
+ {"destination.alias",
+ "alias di destinazione"}, //-destalias
+ {"destination.key.password",
+ "password chiave di destinazione"}, //-destkeypass
+ {"destination.keystore.name",
+ "nome keystore di destinazione"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "password keystore di destinazione protetta"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "nome provider keystore di destinazione"}, //-destprovidername
+ {"destination.keystore.password",
+ "password keystore di destinazione"}, //-deststorepass
+ {"destination.keystore.type",
+ "tipo keystore di destinazione"}, //-deststoretype
+ {"distinguished.name",
+ "nome distinto"}, //-dname
+ {"X.509.extension",
+ "estensione X.509"}, //-ext
+ {"output.file.name",
+ "nome file di output"}, //-file and -outfile
+ {"input.file.name",
+ "nome file di input"}, //-file and -infile
+ {"key.algorithm.name",
+ "nome algoritmo chiave"}, //-keyalg
+ {"key.password",
+ "password chiave"}, //-keypass
+ {"key.bit.size",
+ "dimensione bit chiave"}, //-keysize
+ {"keystore.name",
+ "nome keystore"}, //-keystore
+ {"new.password",
+ "nuova password"}, //-new
+ {"do.not.prompt",
+ "non richiedere"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "password mediante meccanismo protetto"}, //-protected
+ {"provider.argument",
+ "argomento provider"}, //-providerarg
+ {"provider.class.name",
+ "nome classe provider"}, //-providerclass
+ {"provider.name",
+ "nome provider"}, //-providername
+ {"provider.classpath",
+ "classpath provider"}, //-providerpath
+ {"output.in.RFC.style",
+ "output in stile RFC"}, //-rfc
+ {"signature.algorithm.name",
+ "nome algoritmo firma"}, //-sigalg
+ {"source.alias",
+ "alias origine"}, //-srcalias
+ {"source.key.password",
+ "password chiave di origine"}, //-srckeypass
+ {"source.keystore.name",
+ "nome keystore di origine"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "password keystore di origine protetta"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "nome provider keystore di origine"}, //-srcprovidername
+ {"source.keystore.password",
+ "password keystore di origine"}, //-srcstorepass
+ {"source.keystore.type",
+ "tipo keystore di origine"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "host e porta server SSL"}, //-sslserver
+ {"signed.jar.file",
+ "file jar firmato"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "data/ora di inizio validit\u00E0 certificato"}, //-startdate
+ {"keystore.password",
+ "password keystore"}, //-storepass
+ {"keystore.type",
+ "tipo keystore"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "considera sicuri i certificati da cacerts"}, //-trustcacerts
+ {"verbose.output",
+ "output descrittivo"}, //-v
+ {"validity.number.of.days",
+ "numero di giorni di validit\u00E0"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "ID seriale del certificato da revocare"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "Errore keytool: "},
+ {"Illegal.option.", "Opzione non valida: "},
+ {"Illegal.value.", "Valore non valido: "},
+ {"Unknown.password.type.", "Tipo di password sconosciuto: "},
+ {"Cannot.find.environment.variable.",
+ "Impossibile trovare la variabile di ambiente: "},
+ {"Cannot.find.file.", "Impossibile trovare il file: "},
+ {"Command.option.flag.needs.an.argument.", "\u00C8 necessario specificare un argomento per l''opzione di comando {0}."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Avvertenza: non sono supportate password diverse di chiave e di archivio per i keystore PKCS12. Il valore {0} specificato dall''utente verr\u00E0 ignorato."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "Se -storetype \u00E8 impostato su {0}, -keystore deve essere impostato su NONE"},
+ {"Too.many.retries.program.terminated",
+ "Il numero dei tentativi consentiti \u00E8 stato superato. Il programma verr\u00E0 terminato."},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "Se -storetype \u00E8 impostato su {0}, i comandi -storepasswd e -keypasswd non sono supportati"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "Se -storetype \u00E8 impostato su PKCS12 i comandi -keypasswd non vengono supportati"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "Se -storetype \u00E8 impostato su {0}, non \u00E8 possibile specificare un valore per -keypass e -new"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "Se \u00E8 specificata l'opzione -protected, le opzioni -storepass, -keypass e -new non possono essere specificate"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Se viene specificato -srcprotected, -srcstorepass e -srckeypass non dovranno essere specificati"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -storepass, -keypass e -new"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -srcstorepass e -srckeypass"},
+ {"Illegal.startdate.value", "Valore di data di inizio non valido"},
+ {"Validity.must.be.greater.than.zero",
+ "La validit\u00E0 deve essere maggiore di zero"},
+ {"provName.not.a.provider", "{0} non \u00E8 un provider"},
+ {"Usage.error.no.command.provided", "Errore di utilizzo: nessun comando specificato"},
+ {"Source.keystore.file.exists.but.is.empty.", "Il file keystore di origine esiste, ma \u00E8 vuoto: "},
+ {"Please.specify.srckeystore", "Specificare -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "Impossibile specificare sia -v sia -rfc con il comando 'list'"},
+ {"Key.password.must.be.at.least.6.characters",
+ "La password della chiave deve contenere almeno 6 caratteri"},
+ {"New.password.must.be.at.least.6.characters",
+ "La nuova password deve contenere almeno 6 caratteri"},
+ {"Keystore.file.exists.but.is.empty.",
+ "Il file keystore esiste ma \u00E8 vuoto: "},
+ {"Keystore.file.does.not.exist.",
+ "Il file keystore non esiste: "},
+ {"Must.specify.destination.alias", "\u00C8 necessario specificare l'alias di destinazione"},
+ {"Must.specify.alias", "\u00C8 necessario specificare l'alias"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "La password del keystore deve contenere almeno 6 caratteri"},
+ {"Enter.keystore.password.", "Immettere la password del keystore: "},
+ {"Enter.source.keystore.password.", "Immettere la password del keystore di origine: "},
+ {"Enter.destination.keystore.password.", "Immettere la password del keystore di destinazione: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "La password del keystore \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
+ {"Unknown.Entry.Type", "Tipo di voce sconosciuto"},
+ {"Too.many.failures.Alias.not.changed", "Numero eccessivo di errori. L'alias non \u00E8 stato modificato."},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "La voce dell''alias {0} \u00E8 stata importata."},
+ {"Entry.for.alias.alias.not.imported.", "La voce dell''alias {0} non \u00E8 stata importata."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Si \u00E8 verificato un problema durante l''importazione della voce dell''alias {0}: {1}.\nLa voce dell''alias {0} non \u00E8 stata importata."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Comando di importazione completato: {0} voce/i importata/e, {1} voce/i non importata/e o annullata/e"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Avvertenza: sovrascrittura in corso dell''alias {0} nel file keystore di destinazione"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "La voce dell''alias {0} esiste gi\u00E0. Sovrascrivere? [no]: "},
+ {"Too.many.failures.try.later", "Troppi errori - riprovare"},
+ {"Certification.request.stored.in.file.filename.",
+ "La richiesta di certificazione \u00E8 memorizzata nel file <{0}>"},
+ {"Submit.this.to.your.CA", "Sottomettere alla propria CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "Se l'alias non \u00E8 specificato, destalias, srckeypass e destkeypass non dovranno essere specificati"},
+ {"Certificate.stored.in.file.filename.",
+ "Il certificato \u00E8 memorizzato nel file <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "La risposta del certificato \u00E8 stata installata nel keystore"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "La risposta del certificato non \u00E8 stata installata nel keystore"},
+ {"Certificate.was.added.to.keystore",
+ "Il certificato \u00E8 stato aggiunto al keystore"},
+ {"Certificate.was.not.added.to.keystore",
+ "Il certificato non \u00E8 stato aggiunto al keystore"},
+ {".Storing.ksfname.", "[Memorizzazione di {0}] in corso"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} non dispone di chiave pubblica (certificato)"},
+ {"Cannot.derive.signature.algorithm",
+ "Impossibile derivare l'algoritmo di firma"},
+ {"Alias.alias.does.not.exist",
+ "L''alias <{0}> non esiste"},
+ {"Alias.alias.has.no.certificate",
+ "L''alias <{0}> non dispone di certificato"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Non \u00E8 stata generata la coppia di chiavi, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Generazione in corso di una coppia di chiavi {1} da {0} bit e di un certificato autofirmato ({2}) con una validit\u00E0 di {3} giorni\n\tper: {4}"},
+ {"Enter.key.password.for.alias.", "Immettere la password della chiave per <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(INVIO se corrisponde alla password del keystore): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "La password della chiave \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Troppi errori - la chiave non \u00E8 stata aggiunta al keystore"},
+ {"Destination.alias.dest.already.exists",
+ "L''alias di destinazione <{0}> \u00E8 gi\u00E0 esistente"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "La password \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Numero eccessivo di errori. Il valore della chiave non \u00E8 stato copiato."},
+ {"key.password.for.alias.", "password della chiave per <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "La voce del keystore per <{0}> esiste gi\u00E0"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Creazione della voce del keystore per <{0}> in corso..."},
+ {"No.entries.from.identity.database.added",
+ "Nessuna voce aggiunta dal database delle identit\u00E0"},
+ {"Alias.name.alias", "Nome alias: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Data di creazione: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Tipo di voce: {0}"},
+ {"Certificate.chain.length.", "Lunghezza catena certificati: "},
+ {"Certificate.i.1.", "Certificato[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Impronta digitale certificato (SHA1): "},
+ {"Keystore.type.", "Tipo keystore: "},
+ {"Keystore.provider.", "Provider keystore: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Il keystore contiene {0,number,integer} voce"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Il keystore contiene {0,number,integer} voci"},
+ {"Failed.to.parse.input", "Impossibile analizzare l'input"},
+ {"Empty.input", "Input vuoto"},
+ {"Not.X.509.certificate", "Il certificato non \u00E8 X.509"},
+ {"alias.has.no.public.key", "{0} non dispone di chiave pubblica"},
+ {"alias.has.no.X.509.certificate", "{0} non dispone di certificato X.509"},
+ {"New.certificate.self.signed.", "Nuovo certificato (autofirmato):"},
+ {"Reply.has.no.certificates", "La risposta non dispone di certificati"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Impossibile importare il certificato, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
+ {"Input.not.an.X.509.certificate", "L'input non \u00E8 un certificato X.509"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "Il certificato esiste gi\u00E0 nel keystore con alias <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "Aggiungerlo ugualmente? [no]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "Il certificato esiste gi\u00E0 nel keystore CA con alias <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "Aggiungerlo al proprio keystore? [no]: "},
+ {"Trust.this.certificate.no.", "Considerare sicuro questo certificato? [no]: "},
+ {"YES", "S\u00EC"},
+ {"New.prompt.", "Nuova {0}: "},
+ {"Passwords.must.differ", "Le password non devono coincidere"},
+ {"Re.enter.new.prompt.", "Reimmettere un nuovo valore per {0}: "},
+ {"Re.enter.new.password.", "Immettere nuovamente la nuova password: "},
+ {"They.don.t.match.Try.again", "Non corrispondono. Riprovare."},
+ {"Enter.prompt.alias.name.", "Immettere nome alias {0}: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce): "},
+ {"Enter.alias.name.", "Immettere nome alias: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(INVIO se corrisponde al nome di <{0}>"},
+ {".PATTERN.printX509Cert",
+ "Proprietario: {0}\nAutorit\u00E0 emittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome algoritmo firma: {8}\n\t Versione: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "Specificare nome e cognome"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "Specificare il nome dell'unit\u00E0 organizzativa"},
+ {"What.is.the.name.of.your.organization.",
+ "Specificare il nome dell'organizzazione"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "Specificare la localit\u00E0"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "Specificare la provincia"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "Specificare il codice a due lettere del paese in cui si trova l'unit\u00E0"},
+ {"Is.name.correct.", "Il dato {0} \u00E8 corretto?"},
+ {"no", "no"},
+ {"yes", "s\u00EC"},
+ {"y", "s"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "All''alias <{0}> non \u00E8 associata alcuna chiave"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Avvertenza Avvertenza Avvertenza *****************"},
+ {"Signer.d.", "Firmatario #%d:"},
+ {"Timestamp.", "Indicatore orario:"},
+ {"Signature.", "Firma:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "Proprietario certificato: "},
+ {"Not.a.signed.jar.file", "Non \u00E8 un file jar firmato"},
+ {"No.certificate.from.the.SSL.server",
+ "Nessun certificato dal server SSL"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "La risposta del certificato non contiene la chiave pubblica per <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Catena dei certificati incompleta nella risposta"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "La catena dei certificati nella risposta non verifica: "},
+ {"Top.level.certificate.in.reply.",
+ "Certificato di primo livello nella risposta:\n"},
+ {".is.not.trusted.", "...non \u00E8 considerato sicuro. "},
+ {"Install.reply.anyway.no.", "Installare la risposta? [no]: "},
+ {"NO", "No"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "Le chiavi pubbliche nella risposta e nel keystore non corrispondono"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "La risposta del certificato e il certificato nel keystore sono identici"},
+ {"Failed.to.establish.chain.from.reply",
+ "Impossibile stabilire la catena dalla risposta"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "Risposta errata, riprovare"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "La chiave segreta non \u00E8 stata generata; l''alias <{0}> esiste gi\u00E0"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Specificare il valore -keysize per la generazione della chiave segreta"},
+
+ {"Extensions.", "Estensioni: "},
+ {".Empty.value.", "(valore vuoto)"},
+ {"Extension.Request.", "Richiesta di estensione:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %s\nChiave pubblica: %s formato %s chiave\n"},
+ {"Unknown.keyUsage.type.", "Tipo keyUsage sconosciuto: "},
+ {"Unknown.extendedkeyUsage.type.", "Tipo extendedkeyUsage sconosciuto: "},
+ {"Unknown.AccessDescription.type.", "Tipo AccessDescription sconosciuto: "},
+ {"Unrecognized.GeneralName.type.", "Tipo GeneralName non riconosciuto: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Impossibile contrassegnare questa estensione come critica. "},
+ {"Odd.number.of.hex.digits.found.", "\u00C8 stato trovato un numero dispari di cifre esadecimali: "},
+ {"Unknown.extension.type.", "Tipo di estensione sconosciuto: "},
+ {"command.{0}.is.ambiguous.", "il comando {0} \u00E8 ambiguo:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java
new file mode 100644
index 0000000..9b6e6be
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_ja extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [\u30AA\u30D7\u30B7\u30E7\u30F3]..."},
+ {"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\u4F7F\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306B\u3064\u3044\u3066\u306F\"keytool -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Key.and.Certificate.Management.Tool",
+ "\u30AD\u30FC\u304A\u3088\u3073\u8A3C\u660E\u66F8\u7BA1\u7406\u30C4\u30FC\u30EB"},
+ {"Commands.", "\u30B3\u30DE\u30F3\u30C9:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "command_name\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306F\"keytool -command_name -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-changealias
+ {"Deletes.an.entry",
+ "\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059"}, //-delete
+ {"Exports.certificate",
+ "\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert
+ {"Generates.a.key.pair",
+ "\u9375\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "\u79D8\u5BC6\u9375\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u304B\u3089\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencert
+ {"Generates.CRL", "CRL\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "JDK 1.1.x-style\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "\u8A3C\u660E\u66F8\u307E\u305F\u306F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "\u5225\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u304B\u30891\u3064\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u3092\u4F5C\u6210\u3057\u307E\u3059"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u30A8\u30F3\u30C8\u30EA\u306E\u9375\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "\u8A3C\u660E\u66F8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "CRL\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "\u51E6\u7406\u3059\u308B\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D"}, //-alias
+ {"destination.alias",
+ "\u51FA\u529B\u5148\u306E\u5225\u540D"}, //-destalias
+ {"destination.key.password",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destkeypass
+ {"destination.keystore.name",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-destprovidername
+ {"destination.keystore.password",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-deststorepass
+ {"destination.keystore.type",
+ "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-deststoretype
+ {"distinguished.name",
+ "\u8B58\u5225\u540D"}, //-dname
+ {"X.509.extension",
+ "X.509\u62E1\u5F35"}, //-ext
+ {"output.file.name",
+ "\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -outfile
+ {"input.file.name",
+ "\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -infile
+ {"key.algorithm.name",
+ "\u9375\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-keyalg
+ {"key.password",
+ "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-keypass
+ {"key.bit.size",
+ "\u9375\u306E\u30D3\u30C3\u30C8\u30FB\u30B5\u30A4\u30BA"}, //-keysize
+ {"keystore.name",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-keystore
+ {"new.password",
+ "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-new
+ {"do.not.prompt",
+ "\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u306A\u3044"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "\u4FDD\u8B77\u30E1\u30AB\u30CB\u30BA\u30E0\u306B\u3088\u308B\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-protected
+ {"provider.argument",
+ "\u30D7\u30ED\u30D0\u30A4\u30C0\u5F15\u6570"}, //-providerarg
+ {"provider.class.name",
+ "\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u540D"}, //-providerclass
+ {"provider.name",
+ "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-providername
+ {"provider.classpath",
+ "\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9"}, //-providerpath
+ {"output.in.RFC.style",
+ "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
+ {"signature.algorithm.name",
+ "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
+ {"source.alias",
+ "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
+ {"source.key.password",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srckeypass
+ {"source.keystore.name",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-srcprovidername
+ {"source.keystore.password",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcstorepass
+ {"source.keystore.type",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL\u30B5\u30FC\u30D0\u30FC\u306E\u30DB\u30B9\u30C8\u3068\u30DD\u30FC\u30C8"}, //-sslserver
+ {"signed.jar.file",
+ "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u958B\u59CB\u65E5\u6642"}, //-startdate
+ {"keystore.password",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-storepass
+ {"keystore.type",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "cacerts\u304B\u3089\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3059\u308B"}, //-trustcacerts
+ {"verbose.output",
+ "\u8A73\u7D30\u51FA\u529B"}, //-v
+ {"validity.number.of.days",
+ "\u59A5\u5F53\u6027\u65E5\u6570"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "\u5931\u52B9\u3059\u308B\u8A3C\u660E\u66F8\u306E\u30B7\u30EA\u30A2\u30EBID"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "keytool\u30A8\u30E9\u30FC: "},
+ {"Illegal.option.", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: "},
+ {"Illegal.value.", "\u4E0D\u6B63\u306A\u5024: "},
+ {"Unknown.password.type.", "\u4E0D\u660E\u306A\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30BF\u30A4\u30D7: "},
+ {"Cannot.find.environment.variable.",
+ "\u74B0\u5883\u5909\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
+ {"Cannot.find.file.", "\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
+ {"Command.option.flag.needs.an.argument.", "\u30B3\u30DE\u30F3\u30C9\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002"},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "\u8B66\u544A: PKCS12\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u306F\u3001\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u7570\u306A\u308B\u72B6\u6CC1\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F{0}\u306E\u5024\u306F\u7121\u8996\u3057\u307E\u3059\u3002"},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keystore\u306FNONE\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Too.many.retries.program.terminated",
+ "\u518D\u8A66\u884C\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "-storetype\u304C{0}\u306E\u5834\u5408\u3001-storepasswd\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "-storetype\u304CPKCS12\u306E\u5834\u5408\u3001-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keypass\u3068-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "-protected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "-srcprotected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"Illegal.startdate.value", "startdate\u5024\u304C\u7121\u52B9\u3067\u3059"},
+ {"Validity.must.be.greater.than.zero",
+ "\u59A5\u5F53\u6027\u306F\u30BC\u30ED\u3088\u308A\u5927\u304D\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"provName.not.a.provider", "{0}\u306F\u30D7\u30ED\u30D0\u30A4\u30C0\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
+ {"Usage.error.no.command.provided", "\u4F7F\u7528\u30A8\u30E9\u30FC: \u30B3\u30DE\u30F3\u30C9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+ {"Source.keystore.file.exists.but.is.empty.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u5B58\u5728\u3057\u307E\u3059\u304C\u7A7A\u3067\u3059: "},
+ {"Please.specify.srckeystore", "-srckeystore\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "'list'\u30B3\u30DE\u30F3\u30C9\u306B-v\u3068-rfc\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
+ {"Key.password.must.be.at.least.6.characters",
+ "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"New.password.must.be.at.least.6.characters",
+ "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Keystore.file.exists.but.is.empty.",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u7A7A\u3067\u3059: "},
+ {"Keystore.file.does.not.exist.",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u305B\u3093: "},
+ {"Must.specify.destination.alias", "\u51FA\u529B\u5148\u306E\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Must.specify.alias", "\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Enter.keystore.password.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"Enter.source.keystore.password.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"Enter.destination.keystore.password.", "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Unknown.Entry.Type", "\u4E0D\u660E\u306A\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7"},
+ {"Too.many.failures.Alias.not.changed", "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u5225\u540D\u306F\u5909\u66F4\u3055\u308C\u307E\u305B\u3093"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002"},
+ {"Entry.for.alias.alias.not.imported.", "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}\u3002\n\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B3\u30DE\u30F3\u30C9\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F: {0}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002{1}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u305F\u304B\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "\u8B66\u544A: \u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u65E2\u5B58\u306E\u5225\u540D{0}\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3044\u307E\u3059"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "\u65E2\u5B58\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D{0}\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
+ {"Too.many.failures.try.later", "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u5F8C\u3067\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Certification.request.stored.in.file.filename.",
+ "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
+ {"Submit.this.to.your.CA", "\u3053\u308C\u3092CA\u306B\u63D0\u51FA\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "\u5225\u540D\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u5225\u540D\u3001\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304A\u3088\u3073\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
+ {"Certificate.stored.in.file.filename.",
+ "\u8A3C\u660E\u66F8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3057\u305F"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
+ {"Certificate.was.added.to.keystore",
+ "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F"},
+ {"Certificate.was.not.added.to.keystore",
+ "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
+ {".Storing.ksfname.", "[{0}\u3092\u683C\u7D0D\u4E2D]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0}\u306B\u306F\u516C\u958B\u9375(\u8A3C\u660E\u66F8)\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"Cannot.derive.signature.algorithm",
+ "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093"},
+ {"Alias.alias.does.not.exist",
+ "\u5225\u540D<{0}>\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
+ {"Alias.alias.has.no.certificate",
+ "\u5225\u540D<{0}>\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "\u9375\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u9375\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
+ {"Enter.key.password.for.alias.", "<{0}>\u306E\u9375\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u9375\u306F\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
+ {"Destination.alias.dest.already.exists",
+ "\u51FA\u529B\u5148\u306E\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u306F\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
+ {"key.password.for.alias.", "<{0}>\u306E\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u4F5C\u6210\u4E2D..."},
+ {"No.entries.from.identity.database.added",
+ "\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u8FFD\u52A0\u3055\u308C\u305F\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093"},
+ {"Alias.name.alias", "\u5225\u540D: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "\u4F5C\u6210\u65E5: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0},{1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7: {0}"},
+ {"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "},
+ {"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA1): "},
+ {"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "},
+ {"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
+ {"Failed.to.parse.input", "\u5165\u529B\u306E\u69CB\u6587\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F"},
+ {"Empty.input", "\u5165\u529B\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"Not.X.509.certificate", "X.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
+ {"alias.has.no.public.key", "{0}\u306B\u306F\u516C\u958B\u9375\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"alias.has.no.X.509.certificate", "{0}\u306B\u306FX.509\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"New.certificate.self.signed.", "\u65B0\u3057\u3044\u8A3C\u660E\u66F8(\u81EA\u5DF1\u7F72\u540D\u578B):"},
+ {"Reply.has.no.certificates", "\u5FDC\u7B54\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "\u8A3C\u660E\u66F8\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Input.not.an.X.509.certificate", "\u5165\u529B\u306FX.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Do.you.still.want.to.add.it.no.",
+ "\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30B7\u30B9\u30C6\u30E0\u898F\u6A21\u306ECA\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]: "},
+ {"Trust.this.certificate.no.", "\u3053\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]: "},
+ {"YES", "\u306F\u3044"},
+ {"New.prompt.", "\u65B0\u898F{0}: "},
+ {"Passwords.must.differ", "\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u7570\u306A\u3063\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Re.enter.new.prompt.", "\u65B0\u898F{0}\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"Re.enter.new.password.", "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"They.don.t.match.Try.again", "\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Enter.prompt.alias.name.", "{0}\u306E\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "\u65B0\u3057\u3044\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\t(\u3053\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u53D6\u308A\u6D88\u3059\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044): "},
+ {"Enter.alias.name.", "\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(<{0}>\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044)"},
+ {".PATTERN.printX509Cert",
+ "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3}\u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {8}\n\t \u30D0\u30FC\u30B8\u30E7\u30F3: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\u59D3\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\u7D44\u7E54\u5358\u4F4D\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"What.is.the.name.of.your.organization.",
+ "\u7D44\u7E54\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\u90FD\u5E02\u540D\u307E\u305F\u306F\u5730\u57DF\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\u90FD\u9053\u5E9C\u770C\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\u3053\u306E\u5358\u4F4D\u306B\u8A72\u5F53\u3059\u308B2\u6587\u5B57\u306E\u56FD\u30B3\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"Is.name.correct.", "{0}\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002"},
+ {"no", "\u3044\u3044\u3048"},
+ {"yes", "\u306F\u3044"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "\u5225\u540D<{0}>\u306B\u306F\u9375\u304C\u3042\u308A\u307E\u305B\u3093"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"},
+
+ {".WARNING.WARNING.WARNING.",
+ "*****************\u8B66\u544A \u8B66\u544A \u8B66\u544A*****************"},
+ {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
+ {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
+ {"Signature.", "\u7F72\u540D:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
+ {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
+ {"No.certificate.from.the.SSL.server",
+ "SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u9375\u306F\u542B\u307E\u308C\u307E\u305B\u3093"},
+ {"Incomplete.certificate.chain.in.reply",
+ "\u5FDC\u7B54\u3057\u305F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u4E0D\u5B8C\u5168\u3067\u3059"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\u5FDC\u7B54\u3057\u305F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093: "},
+ {"Top.level.certificate.in.reply.",
+ "\u5FDC\u7B54\u3057\u305F\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u306E\u8A3C\u660E\u66F8:\n"},
+ {".is.not.trusted.", "... \u306F\u4FE1\u983C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 "},
+ {"Install.reply.anyway.no.", "\u5FDC\u7B54\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
+ {"NO", "\u3044\u3044\u3048"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "\u5FDC\u7B54\u3057\u305F\u516C\u958B\u9375\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "\u8A3C\u660E\u66F8\u5FDC\u7B54\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u8A3C\u660E\u66F8\u304C\u540C\u3058\u3067\u3059"},
+ {"Failed.to.establish.chain.from.reply",
+ "\u5FDC\u7B54\u304B\u3089\u9023\u9396\u3092\u78BA\u7ACB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "\u5FDC\u7B54\u304C\u9593\u9055\u3063\u3066\u3044\u307E\u3059\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "\u79D8\u5BC6\u9375\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "\u79D8\u5BC6\u9375\u306E\u751F\u6210\u6642\u306B\u306F -keysize\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
+
+ {"Extensions.", "\u62E1\u5F35: "},
+ {".Empty.value.", "(\u7A7A\u306E\u5024)"},
+ {"Extension.Request.", "\u62E1\u5F35\u30EA\u30AF\u30A8\u30B9\u30C8:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8(\u30D0\u30FC\u30B8\u30E7\u30F31.0)\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8: %s\n\u516C\u958B\u9375: %s \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 %s \u30AD\u30FC\n"},
+ {"Unknown.keyUsage.type.", "\u4E0D\u660E\u306AkeyUsage\u30BF\u30A4\u30D7: "},
+ {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u306AextendedkeyUsage\u30BF\u30A4\u30D7: "},
+ {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u306AAccessDescription\u30BF\u30A4\u30D7: "},
+ {"Unrecognized.GeneralName.type.", "\u8A8D\u8B58\u3055\u308C\u306A\u3044GeneralName\u30BF\u30A4\u30D7: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "\u3053\u306E\u62E1\u5F35\u306F\u30AF\u30EA\u30C6\u30A3\u30AB\u30EB\u3068\u3057\u3066\u30DE\u30FC\u30AF\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3002 "},
+ {"Odd.number.of.hex.digits.found.", "\u5947\u6570\u306E16\u9032\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: "},
+ {"Unknown.extension.type.", "\u4E0D\u660E\u306A\u62E1\u5F35\u30BF\u30A4\u30D7: "},
+ {"command.{0}.is.ambiguous.", "\u30B3\u30DE\u30F3\u30C9{0}\u306F\u3042\u3044\u307E\u3044\u3067\u3059:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java
new file mode 100644
index 0000000..9f3f70f
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_ko extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [\uC635\uC158]..."},
+ {"Options.", "\uC635\uC158:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"},
+ {"Key.and.Certificate.Management.Tool",
+ "\uD0A4 \uBC0F \uC778\uC99D\uC11C \uAD00\uB9AC \uD234"},
+ {"Commands.", "\uBA85\uB839:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "command_name \uC0AC\uC6A9\uBC95\uC5D0 \"keytool -command_name -help\" \uC0AC\uC6A9"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "\uC778\uC99D\uC11C \uC694\uCCAD\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\uD56D\uBAA9\uC758 \uBCC4\uCE6D\uC744 \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-changealias
+ {"Deletes.an.entry",
+ "\uD56D\uBAA9\uC744 \uC0AD\uC81C\uD569\uB2C8\uB2E4."}, //-delete
+ {"Exports.certificate",
+ "\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert
+ {"Generates.a.key.pair",
+ "\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "\uC778\uC99D\uC11C \uC694\uCCAD\uC5D0\uC11C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencert
+ {"Generates.CRL", "CRL\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "JDK 1.1.x \uC2A4\uD0C0\uC77C ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "\uC778\uC99D\uC11C \uB610\uB294 \uC778\uC99D\uC11C \uCCB4\uC778\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "\uB2E4\uB978 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uD558\uB098 \uB610\uB294 \uBAA8\uB4E0 \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importkeystore
+ {"Clones.a.key.entry",
+ "\uD0A4 \uD56D\uBAA9\uC744 \uBCF5\uC81C\uD569\uB2C8\uB2E4."}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\uD56D\uBAA9\uC758 \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uD56D\uBAA9\uC744 \uB098\uC5F4\uD569\uB2C8\uB2E4."}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "\uC778\uC99D\uC11C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "\uC778\uC99D\uC11C \uC694\uCCAD\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "CRL \uD30C\uC77C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "\uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "\uCC98\uB9AC\uD560 \uD56D\uBAA9\uC758 \uBCC4\uCE6D \uC774\uB984"}, //-alias
+ {"destination.alias",
+ "\uB300\uC0C1 \uBCC4\uCE6D"}, //-destalias
+ {"destination.key.password",
+ "\uB300\uC0C1 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-destkeypass
+ {"destination.keystore.name",
+ "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-destprovidername
+ {"destination.keystore.password",
+ "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-deststorepass
+ {"destination.keystore.type",
+ "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-deststoretype
+ {"distinguished.name",
+ "\uC2DD\uBCC4 \uC774\uB984"}, //-dname
+ {"X.509.extension",
+ "X.509 \uD655\uC7A5"}, //-ext
+ {"output.file.name",
+ "\uCD9C\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -outfile
+ {"input.file.name",
+ "\uC785\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -infile
+ {"key.algorithm.name",
+ "\uD0A4 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-keyalg
+ {"key.password",
+ "\uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-keypass
+ {"key.bit.size",
+ "\uD0A4 \uBE44\uD2B8 \uD06C\uAE30"}, //-keysize
+ {"keystore.name",
+ "\uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-keystore
+ {"new.password",
+ "\uC0C8 \uBE44\uBC00\uBC88\uD638"}, //-new
+ {"do.not.prompt",
+ "\uD655\uC778\uD558\uC9C0 \uC54A\uC74C"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "\uBCF4\uD638\uB418\uB294 \uBA54\uCEE4\uB2C8\uC998\uC744 \uD1B5\uD55C \uBE44\uBC00\uBC88\uD638"}, //-protected
+ {"provider.argument",
+ "\uC81C\uACF5\uC790 \uC778\uC218"}, //-providerarg
+ {"provider.class.name",
+ "\uC81C\uACF5\uC790 \uD074\uB798\uC2A4 \uC774\uB984"}, //-providerclass
+ {"provider.name",
+ "\uC81C\uACF5\uC790 \uC774\uB984"}, //-providername
+ {"provider.classpath",
+ "\uC81C\uACF5\uC790 \uD074\uB798\uC2A4 \uACBD\uB85C"}, //-providerpath
+ {"output.in.RFC.style",
+ "RFC \uC2A4\uD0C0\uC77C\uC758 \uCD9C\uB825"}, //-rfc
+ {"signature.algorithm.name",
+ "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-sigalg
+ {"source.alias",
+ "\uC18C\uC2A4 \uBCC4\uCE6D"}, //-srcalias
+ {"source.key.password",
+ "\uC18C\uC2A4 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-srckeypass
+ {"source.keystore.name",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-srcprovidername
+ {"source.keystore.password",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-srcstorepass
+ {"source.keystore.type",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL \uC11C\uBC84 \uD638\uC2A4\uD2B8 \uBC0F \uD3EC\uD2B8"}, //-sslserver
+ {"signed.jar.file",
+ "\uC11C\uBA85\uB41C jar \uD30C\uC77C"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "\uC778\uC99D\uC11C \uC720\uD6A8 \uAE30\uAC04 \uC2DC\uC791 \uB0A0\uC9DC/\uC2DC\uAC04"}, //-startdate
+ {"keystore.password",
+ "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-storepass
+ {"keystore.type",
+ "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "cacerts\uC758 \uBCF4\uC548 \uC778\uC99D\uC11C"}, //-trustcacerts
+ {"verbose.output",
+ "\uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825"}, //-v
+ {"validity.number.of.days",
+ "\uC720\uD6A8 \uAE30\uAC04 \uC77C \uC218"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "\uCCA0\uD68C\uD560 \uC778\uC99D\uC11C\uC758 \uC77C\uB828 ID"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "keytool \uC624\uB958: "},
+ {"Illegal.option.", "\uC798\uBABB\uB41C \uC635\uC158: "},
+ {"Illegal.value.", "\uC798\uBABB\uB41C \uAC12: "},
+ {"Unknown.password.type.", "\uC54C \uC218 \uC5C6\uB294 \uBE44\uBC00\uBC88\uD638 \uC720\uD615: "},
+ {"Cannot.find.environment.variable.",
+ "\uD658\uACBD \uBCC0\uC218\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
+ {"Cannot.find.file.", "\uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
+ {"Command.option.flag.needs.an.argument.", "\uBA85\uB839 \uC635\uC158 {0}\uC5D0 \uC778\uC218\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "\uACBD\uACE0: \uB2E4\uB978 \uC800\uC7A5\uC18C \uBC0F \uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 PKCS12 KeyStores\uC5D0 \uB300\uD574 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C {0} \uAC12\uC744 \uBB34\uC2DC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keystore\uB294 NONE\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Too.many.retries.program.terminated",
+ "\uC7AC\uC2DC\uB3C4 \uD69F\uC218\uAC00 \uB108\uBB34 \uB9CE\uC544 \uD504\uB85C\uADF8\uB7A8\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -storepasswd \uBC0F -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "-storetype\uC774 PKCS12\uC778 \uACBD\uC6B0 -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "-protected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "-srcprotected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "\uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"Illegal.startdate.value", "startdate \uAC12\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Validity.must.be.greater.than.zero",
+ "\uC720\uD6A8 \uAE30\uAC04\uC740 0\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4."},
+ {"provName.not.a.provider", "{0}\uC740(\uB294) \uC81C\uACF5\uC790\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
+ {"Usage.error.no.command.provided", "\uC0AC\uC6A9\uBC95 \uC624\uB958: \uBA85\uB839\uC744 \uC785\uB825\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Source.keystore.file.exists.but.is.empty.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
+ {"Please.specify.srckeystore", "-srckeystore\uB97C \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624."},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "'list' \uBA85\uB839\uC5D0 -v\uC640 -rfc\uB97C \uD568\uAED8 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"Key.password.must.be.at.least.6.characters",
+ "\uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"New.password.must.be.at.least.6.characters",
+ "\uC0C8 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Keystore.file.exists.but.is.empty.",
+ "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
+ {"Keystore.file.does.not.exist.",
+ "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC74C: "},
+ {"Must.specify.destination.alias", "\uB300\uC0C1 \uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
+ {"Must.specify.alias", "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Enter.keystore.password.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
+ {"Enter.source.keystore.password.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
+ {"Enter.destination.keystore.password.", "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Unknown.Entry.Type", "\uC54C \uC218 \uC5C6\uB294 \uD56D\uBAA9 \uC720\uD615"},
+ {"Too.many.failures.Alias.not.changed", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uBCC4\uCE6D\uC774 \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Entry.for.alias.alias.not.imported.", "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD558\uB294 \uC911 \uBB38\uC81C \uBC1C\uC0DD: {1}.\n{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "\uC784\uD3EC\uD2B8 \uBA85\uB839 \uC644\uB8CC: \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB41C \uD56D\uBAA9\uC740 {0}\uAC1C, \uC2E4\uD328\uD558\uAC70\uB098 \uCDE8\uC18C\uB41C \uD56D\uBAA9\uC740 {1}\uAC1C\uC785\uB2C8\uB2E4."},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "\uACBD\uACE0: \uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uAE30\uC874 \uBCC4\uCE6D {0}\uC744(\uB97C) \uACB9\uCCD0 \uC4F0\uB294 \uC911"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "\uAE30\uC874 \uD56D\uBAA9 \uBCC4\uCE6D {0}\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4. \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
+ {"Too.many.failures.try.later", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uB098\uC911\uC5D0 \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
+ {"Certification.request.stored.in.file.filename.",
+ "\uC778\uC99D \uC694\uCCAD\uC774 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Submit.this.to.your.CA", "CA\uC5D0\uAC8C \uC81C\uCD9C\uD558\uC2ED\uC2DC\uC624."},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC740 \uACBD\uC6B0 destalias, srckeypass \uBC0F destkeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
+ {"Certificate.stored.in.file.filename.",
+ "\uC778\uC99D\uC11C\uAC00 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.reply.was.installed.in.keystore",
+ "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.was.added.to.keystore",
+ "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.was.not.added.to.keystore",
+ "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {".Storing.ksfname.", "[{0}\uC744(\uB97C) \uC800\uC7A5\uD558\uB294 \uC911]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0}\uC5D0 \uACF5\uC6A9 \uD0A4(\uC778\uC99D\uC11C)\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Cannot.derive.signature.algorithm",
+ "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998\uC744 \uD30C\uC0DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Alias.alias.does.not.exist",
+ "<{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
+ {"Alias.alias.has.no.certificate",
+ "<{0}> \uBCC4\uCE6D\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "\uD0A4 \uC30D\uC774 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "\uB2E4\uC74C\uC5D0 \uB300\uD574 \uC720\uD6A8 \uAE30\uAC04\uC774 {3}\uC77C\uC778 {0}\uBE44\uD2B8 {1} \uD0A4 \uC30D \uBC0F \uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C({2})\uB97C \uC0DD\uC131\uD558\uB294 \uC911\n\t: {4}"},
+ {"Enter.key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uC640 \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "\uD0A4 \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uD0A4\uAC00 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"Destination.alias.dest.already.exists",
+ "\uB300\uC0C1 \uBCC4\uCE6D <{0}>\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "\uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uD0A4 \uD56D\uBAA9\uC774 \uBCF5\uC81C\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
+ {"key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Creating.keystore.entry.for.id.getName.",
+ "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC744 \uC0DD\uC131\uD558\uB294 \uC911..."},
+ {"No.entries.from.identity.database.added",
+ "ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uCD94\uAC00\uB41C \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Alias.name.alias", "\uBCC4\uCE6D \uC774\uB984: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "\uC0DD\uC131 \uB0A0\uC9DC: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "\uD56D\uBAA9 \uC720\uD615: {0}"},
+ {"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "},
+ {"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA1): "},
+ {"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "},
+ {"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
+ {"Failed.to.parse.input", "\uC785\uB825\uAC12\uC758 \uAD6C\uBB38 \uBD84\uC11D\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
+ {"Empty.input", "\uC785\uB825\uAC12\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
+ {"Not.X.509.certificate", "X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
+ {"alias.has.no.public.key", "{0}\uC5D0 \uACF5\uC6A9 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"alias.has.no.X.509.certificate", "{0}\uC5D0 X.509 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"New.certificate.self.signed.", "\uC0C8 \uC778\uC99D\uC11C(\uC790\uCCB4 \uC11C\uBA85):"},
+ {"Reply.has.no.certificates", "\uD68C\uC2E0\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "\uC778\uC99D\uC11C\uAC00 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Input.not.an.X.509.certificate", "\uC785\uB825\uC774 X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC758 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Do.you.still.want.to.add.it.no.",
+ "\uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC5D0 \uC788\uB294 \uC2DC\uC2A4\uD15C \uCC28\uC6D0\uC758 CA \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\uACE0\uC720\uD55C \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
+ {"Trust.this.certificate.no.", "\uC774 \uC778\uC99D\uC11C\uB97C \uC2E0\uB8B0\uD569\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
+ {"YES", "\uC608"},
+ {"New.prompt.", "\uC0C8 {0}: "},
+ {"Passwords.must.differ", "\uBE44\uBC00\uBC88\uD638\uB294 \uB2EC\uB77C\uC57C \uD569\uB2C8\uB2E4."},
+ {"Re.enter.new.prompt.", "\uC0C8 {0} \uB2E4\uC2DC \uC785\uB825: "},
+ {"Re.enter.new.password.", "\uC0C8 \uBE44\uBC00\uBC88\uD638 \uB2E4\uC2DC \uC785\uB825: "},
+ {"They.don.t.match.Try.again", "\uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
+ {"Enter.prompt.alias.name.", "{0} \uBCC4\uCE6D \uC774\uB984 \uC785\uB825: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "\uC0C8 \uBCC4\uCE6D \uC774\uB984 \uC785\uB825\t(\uC774 \uD56D\uBAA9\uC5D0 \uB300\uD55C \uC784\uD3EC\uD2B8\uB97C \uCDE8\uC18C\uD558\uB824\uBA74 Enter \uD0A4\uB97C \uB204\uB984): "},
+ {"Enter.alias.name.", "\uBCC4\uCE6D \uC774\uB984 \uC785\uB825: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(<{0}>\uACFC(\uC640) \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984)"},
+ {".PATTERN.printX509Cert",
+ "\uC18C\uC720\uC790: {0}\n\uBC1C\uD589\uC790: {1}\n\uC77C\uB828 \uBC88\uD638: {2}\n\uC801\uD569\uD55C \uC2DC\uC791 \uB0A0\uC9DC: {3}, \uC885\uB8CC \uB0A0\uC9DC: {4}\n\uC778\uC99D\uC11C \uC9C0\uBB38:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984: {8}\n\t \uBC84\uC804: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\uC774\uB984\uACFC \uC131\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\uC870\uC9C1 \uB2E8\uC704 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {"What.is.the.name.of.your.organization.",
+ "\uC870\uC9C1 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\uAD6C/\uAD70/\uC2DC \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\uC2DC/\uB3C4 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\uC774 \uC870\uC9C1\uC758 \uB450 \uC790\uB9AC \uAD6D\uAC00 \uCF54\uB4DC\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
+ {"Is.name.correct.", "{0}\uC774(\uAC00) \uB9DE\uC2B5\uB2C8\uAE4C?"},
+ {"no", "\uC544\uB2C8\uC624"},
+ {"yes", "\uC608"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "<{0}> \uBCC4\uCE6D\uC5D0 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** \uACBD\uACE0 \uACBD\uACE0 \uACBD\uACE0 *****************"},
+ {"Signer.d.", "\uC11C\uBA85\uC790 #%d:"},
+ {"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"},
+ {"Signature.", "\uC11C\uBA85:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "\uC778\uC99D\uC11C \uC18C\uC720\uC790: "},
+ {"Not.a.signed.jar.file", "\uC11C\uBA85\uB41C jar \uD30C\uC77C\uC774 \uC544\uB2D9\uB2C8\uB2E4."},
+ {"No.certificate.from.the.SSL.server",
+ "SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
+ {"Incomplete.certificate.chain.in.reply",
+ "\uD68C\uC2E0\uC5D0 \uBD88\uC644\uC804\uD55C \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uC788\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\uD68C\uC2E0\uC758 \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uD655\uC778\uB418\uC9C0 \uC54A\uC74C: "},
+ {"Top.level.certificate.in.reply.",
+ "\uD68C\uC2E0\uC5D0 \uCD5C\uC0C1\uC704 \uB808\uBCA8 \uC778\uC99D\uC11C\uAC00 \uC788\uC74C:\n"},
+ {".is.not.trusted.", "...\uC744(\uB97C) \uC2E0\uB8B0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
+ {"Install.reply.anyway.no.", "\uD68C\uC2E0\uC744 \uC124\uCE58\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
+ {"NO", "\uC544\uB2C8\uC624"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uACF5\uC6A9 \uD0A4\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uC778\uC99D\uC11C\uAC00 \uB3D9\uC77C\uD569\uB2C8\uB2E4."},
+ {"Failed.to.establish.chain.from.reply",
+ "\uD68C\uC2E0\uC758 \uCCB4\uC778 \uC124\uC815\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "\uC798\uBABB\uB41C \uC751\uB2F5\uC785\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "\uBCF4\uC548 \uD0A4\uAC00 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD558\uB824\uBA74 -keysize\uB97C \uC81C\uACF5\uD558\uC2ED\uC2DC\uC624."},
+
+ {"Extensions.", "\uD655\uC7A5: "},
+ {".Empty.value.", "(\uBE44\uC5B4 \uC788\uB294 \uAC12)"},
+ {"Extension.Request.", "\uD655\uC7A5 \uC694\uCCAD:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 \uC778\uC99D\uC11C \uC694\uCCAD(1.0 \uBC84\uC804)\n\uC81C\uBAA9: %s\n\uACF5\uC6A9 \uD0A4: %s \uD615\uC2DD %s \uD0A4\n"},
+ {"Unknown.keyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 keyUsage \uC720\uD615: "},
+ {"Unknown.extendedkeyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 extendedkeyUsage \uC720\uD615: "},
+ {"Unknown.AccessDescription.type.", "\uC54C \uC218 \uC5C6\uB294 AccessDescription \uC720\uD615: "},
+ {"Unrecognized.GeneralName.type.", "\uC54C \uC218 \uC5C6\uB294 GeneralName \uC720\uD615: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "\uC774 \uD655\uC7A5\uC740 \uC911\uC694\uD55C \uAC83\uC73C\uB85C \uD45C\uC2DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
+ {"Odd.number.of.hex.digits.found.", "\uD640\uC218 \uAC1C\uC758 16\uC9C4\uC218\uAC00 \uBC1C\uACAC\uB428: "},
+ {"Unknown.extension.type.", "\uC54C \uC218 \uC5C6\uB294 \uD655\uC7A5 \uC720\uD615: "},
+ {"command.{0}.is.ambiguous.", "{0} \uBA85\uB839\uC774 \uBAA8\uD638\uD568:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
new file mode 100644
index 0000000..50b4d26
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_pt_BR extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Op\u00E7\u00E3o]..."},
+ {"Options.", "Op\u00E7\u00F5es:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "Use \"keytool -help\" para todos os comandos dispon\u00EDveis"},
+ {"Key.and.Certificate.Management.Tool",
+ "Ferramenta de Gerenciamento de Chave e Certificado"},
+ {"Commands.", "Comandos:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "Use \"keytool -command_name -help\" para uso de command_name"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Gera uma solicita\u00E7\u00E3o de certificado"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "Altera um alias de entrada"}, //-changealias
+ {"Deletes.an.entry",
+ "Deleta uma entrada"}, //-delete
+ {"Exports.certificate",
+ "Exporta o certificado"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Gera um par de chaves"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "Gera uma chave Secreta"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert
+ {"Generates.CRL", "Gera CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importa entradas de um banco de dados de identidade JDK 1.1.x-style"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importa um certificado ou uma cadeia de certificados"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importa uma ou todas as entradas de outra \u00E1rea de armazenamento de chaves"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Clona uma entrada de chave"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "Altera a senha da chave de uma entrada"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Lista entradas em uma \u00E1rea de armazenamento de chaves"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Imprime o conte\u00FAdo de um certificado"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Imprime o conte\u00FAdo de uma solicita\u00E7\u00E3o de certificado"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Imprime o conte\u00FAdo de um arquivo CRL"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Gera um certificado autoassinado"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "Altera a senha de armazenamento de uma \u00E1rea de armazenamento de chaves"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "nome do alias da entrada a ser processada"}, //-alias
+ {"destination.alias",
+ "alias de destino"}, //-destalias
+ {"destination.key.password",
+ "senha da chave de destino"}, //-destkeypass
+ {"destination.keystore.name",
+ "nome da \u00E1rea de armazenamento de chaves de destino"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "senha protegida da \u00E1rea de armazenamento de chaves de destino"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "nome do fornecedor da \u00E1rea de armazenamento de chaves de destino"}, //-destprovidername
+ {"destination.keystore.password",
+ "senha da \u00E1rea de armazenamento de chaves de destino"}, //-deststorepass
+ {"destination.keystore.type",
+ "tipo de \u00E1rea de armazenamento de chaves de destino"}, //-deststoretype
+ {"distinguished.name",
+ "nome distinto"}, //-dname
+ {"X.509.extension",
+ "extens\u00E3o X.509"}, //-ext
+ {"output.file.name",
+ "nome do arquivo de sa\u00EDda"}, //-file and -outfile
+ {"input.file.name",
+ "nome do arquivo de entrada"}, //-file and -infile
+ {"key.algorithm.name",
+ "nome do algoritmo da chave"}, //-keyalg
+ {"key.password",
+ "senha da chave"}, //-keypass
+ {"key.bit.size",
+ "tamanho do bit da chave"}, //-keysize
+ {"keystore.name",
+ "nome da \u00E1rea de armazenamento de chaves"}, //-keystore
+ {"new.password",
+ "nova senha"}, //-new
+ {"do.not.prompt",
+ "n\u00E3o perguntar"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "senha por meio de mecanismo protegido"}, //-protected
+ {"provider.argument",
+ "argumento do fornecedor"}, //-providerarg
+ {"provider.class.name",
+ "nome da classe do fornecedor"}, //-providerclass
+ {"provider.name",
+ "nome do fornecedor"}, //-providername
+ {"provider.classpath",
+ "classpath do fornecedor"}, //-providerpath
+ {"output.in.RFC.style",
+ "sa\u00EDda no estilo RFC"}, //-rfc
+ {"signature.algorithm.name",
+ "nome do algoritmo de assinatura"}, //-sigalg
+ {"source.alias",
+ "alias de origem"}, //-srcalias
+ {"source.key.password",
+ "senha da chave de origem"}, //-srckeypass
+ {"source.keystore.name",
+ "nome da \u00E1rea de armazenamento de chaves de origem"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "senha protegida da \u00E1rea de armazenamento de chaves de origem"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "nome do fornecedor da \u00E1rea de armazenamento de chaves de origem"}, //-srcprovidername
+ {"source.keystore.password",
+ "senha da \u00E1rea de armazenamento de chaves de origem"}, //-srcstorepass
+ {"source.keystore.type",
+ "tipo de \u00E1rea de armazenamento de chaves de origem"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "porta e host do servidor SSL"}, //-sslserver
+ {"signed.jar.file",
+ "arquivo jar assinado"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "data/hora inicial de validade do certificado"}, //-startdate
+ {"keystore.password",
+ "senha da \u00E1rea de armazenamento de chaves"}, //-storepass
+ {"keystore.type",
+ "tipo de \u00E1rea de armazenamento de chaves"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "certificados confi\u00E1veis do cacerts"}, //-trustcacerts
+ {"verbose.output",
+ "sa\u00EDda detalhada"}, //-v
+ {"validity.number.of.days",
+ "n\u00FAmero de dias da validade"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "ID de s\u00E9rie do certificado a ser revogado"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "erro de keytool: "},
+ {"Illegal.option.", "Op\u00E7\u00E3o inv\u00E1lida: "},
+ {"Illegal.value.", "Valor inv\u00E1lido: "},
+ {"Unknown.password.type.", "Tipo de senha desconhecido: "},
+ {"Cannot.find.environment.variable.",
+ "N\u00E3o \u00E9 poss\u00EDvel localizar a vari\u00E1vel do ambiente: "},
+ {"Cannot.find.file.", "N\u00E3o \u00E9 poss\u00EDvel localizar o arquivo: "},
+ {"Command.option.flag.needs.an.argument.", "A op\u00E7\u00E3o de comando {0} precisa de um argumento."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Advert\u00EAncia: Senhas de chave e de armazenamento diferentes n\u00E3o suportadas para KeyStores PKCS12. Ignorando valor {0} especificado pelo usu\u00E1rio."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore deve ser NONE se -storetype for {0}"},
+ {"Too.many.retries.program.terminated",
+ "Excesso de tentativas de repeti\u00E7\u00E3o; programa finalizado"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "comandos -storepasswd e -keypasswd n\u00E3o suportados se -storetype for {0}"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "comandos -keypasswd n\u00E3o suportados se -storetype for PKCS12"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-keypass e -new n\u00E3o podem ser especificados se -storetype for {0}"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "se -protected for especificado, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "se -srcprotected for especificado, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "se a \u00E1rea de armazenamento de chaves n\u00E3o estiver protegida por senha, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "se a \u00E1rea de armazenamento de chaves de origem n\u00E3o estiver protegida por senha, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
+ {"Illegal.startdate.value", "valor da data inicial inv\u00E1lido"},
+ {"Validity.must.be.greater.than.zero",
+ "A validade deve ser maior do que zero"},
+ {"provName.not.a.provider", "{0} n\u00E3o \u00E9 um fornecedor"},
+ {"Usage.error.no.command.provided", "Erro de uso: nenhum comando fornecido"},
+ {"Source.keystore.file.exists.but.is.empty.", "O arquivo da \u00E1rea de armazenamento de chaves de origem existe, mas est\u00E1 vazio: "},
+ {"Please.specify.srckeystore", "Especifique -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "N\u00E3o devem ser especificados -v e -rfc com o comando 'list'"},
+ {"Key.password.must.be.at.least.6.characters",
+ "A senha da chave deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"New.password.must.be.at.least.6.characters",
+ "A nova senha deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"Keystore.file.exists.but.is.empty.",
+ "O arquivo da \u00E1rea de armazenamento de chaves existe, mas est\u00E1 vazio: "},
+ {"Keystore.file.does.not.exist.",
+ "O arquivo da \u00E1rea de armazenamento de chaves n\u00E3o existe. "},
+ {"Must.specify.destination.alias", "Deve ser especificado um alias de destino"},
+ {"Must.specify.alias", "Deve ser especificado um alias"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "A senha da \u00E1rea de armazenamento de chaves deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"Enter.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves: "},
+ {"Enter.source.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de origem: "},
+ {"Enter.destination.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de destino: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "A senha da \u00E1rea de armazenamento de chaves \u00E9 muito curta - ela deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"Unknown.Entry.Type", "Tipo de Entrada Desconhecido"},
+ {"Too.many.failures.Alias.not.changed", "Excesso de falhas. Alias n\u00E3o alterado"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "Entrada do alias {0} importada com \u00EAxito."},
+ {"Entry.for.alias.alias.not.imported.", "Entrada do alias {0} n\u00E3o importada."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Problema ao importar a entrada do alias {0}: {1}.\nEntrada do alias {0} n\u00E3o importada."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Comando de importa\u00E7\u00E3o conclu\u00EDdo: {0} entradas importadas com \u00EAxito, {1} entradas falharam ou foram canceladas"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Advert\u00EAncia: Substitui\u00E7\u00E3o do alias {0} existente na \u00E1rea de armazenamento de chaves de destino"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "Entrada j\u00E1 existente no alias {0}, substituir? [n\u00E3o]: "},
+ {"Too.many.failures.try.later", "Excesso de falhas - tente mais tarde"},
+ {"Certification.request.stored.in.file.filename.",
+ "Solicita\u00E7\u00E3o de certificado armazenada no arquivo <{0}>"},
+ {"Submit.this.to.your.CA", "Submeter \u00E0 CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "se o alias n\u00E3o estiver especificado, destalias, srckeypass e destkeypass n\u00E3o dever\u00E3o ser especificados"},
+ {"Certificate.stored.in.file.filename.",
+ "Certificado armazenado no arquivo <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "A resposta do certificado foi instalada na \u00E1rea de armazenamento de chaves"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "A resposta do certificado n\u00E3o foi instalada na \u00E1rea de armazenamento de chaves"},
+ {"Certificate.was.added.to.keystore",
+ "O certificado foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
+ {"Certificate.was.not.added.to.keystore",
+ "O certificado n\u00E3o foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
+ {".Storing.ksfname.", "[Armazenando {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} n\u00E3o tem chave p\u00FAblica (certificado)"},
+ {"Cannot.derive.signature.algorithm",
+ "N\u00E3o \u00E9 poss\u00EDvel obter um algoritmo de assinatura"},
+ {"Alias.alias.does.not.exist",
+ "O alias <{0}> n\u00E3o existe"},
+ {"Alias.alias.has.no.certificate",
+ "O alias <{0}> n\u00E3o tem certificado"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Par de chaves n\u00E3o gerado; o alias <{0}> j\u00E1 existe"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Gerando o par de chaves {1} de {0} bit e o certificado autoassinado ({2}) com uma validade de {3} dias\n\tpara: {4}"},
+ {"Enter.key.password.for.alias.", "Informar a senha da chave de <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN se for igual \u00E0 senha da \u00E1rea do armazenamento de chaves): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "A senha da chave \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "Excesso de falhas - chave n\u00E3o adicionada a \u00E1rea de armazenamento de chaves"},
+ {"Destination.alias.dest.already.exists",
+ "O alias de destino <{0}> j\u00E1 existe"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "A senha \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "Excesso de falhas. Entrada da chave n\u00E3o clonada"},
+ {"key.password.for.alias.", "senha da chave de <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "A entrada da \u00E1rea do armazenamento de chaves de <{0}> j\u00E1 existe"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Criando entrada da \u00E1rea do armazenamento de chaves para <{0}> ..."},
+ {"No.entries.from.identity.database.added",
+ "Nenhuma entrada adicionada do banco de dados de identidades"},
+ {"Alias.name.alias", "Nome do alias: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Data de cria\u00E7\u00E3o: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Tipo de entrada: {0}"},
+ {"Certificate.chain.length.", "Comprimento da cadeia de certificados: "},
+ {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Fingerprint (MD5) do certificado: "},
+ {"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "},
+ {"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entrada"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entradas"},
+ {"Failed.to.parse.input", "Falha durante o parse da entrada"},
+ {"Empty.input", "Entrada vazia"},
+ {"Not.X.509.certificate", "N\u00E3o \u00E9 um certificado X.509"},
+ {"alias.has.no.public.key", "{0} n\u00E3o tem chave p\u00FAblica"},
+ {"alias.has.no.X.509.certificate", "{0} n\u00E3o tem certificado X.509"},
+ {"New.certificate.self.signed.", "Novo certificado (autoassinado):"},
+ {"Reply.has.no.certificates", "A resposta n\u00E3o tem certificado"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Certificado n\u00E3o importado, o alias <{0}> j\u00E1 existe"},
+ {"Input.not.an.X.509.certificate", "A entrada n\u00E3o \u00E9 um certificado X.509"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "O certificado j\u00E1 existe no armazenamento de chaves no alias <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "Ainda deseja adicion\u00E1-lo? [n\u00E3o]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "O certificado j\u00E1 existe na \u00E1rea de armazenamento de chaves da CA em todo o sistema no alias <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]: "},
+ {"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]: "},
+ {"YES", "Sim"},
+ {"New.prompt.", "Nova {0}: "},
+ {"Passwords.must.differ", "As senhas devem ser diferentes"},
+ {"Re.enter.new.prompt.", "Informe novamente a nova {0}: "},
+ {"Re.enter.new.password.", "Informe novamente a nova senha: "},
+ {"They.don.t.match.Try.again", "Elas n\u00E3o correspondem. Tente novamente"},
+ {"Enter.prompt.alias.name.", "Informe o nome do alias {0}: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Informe o novo nome do alias\t(RETURN para cancelar a importa\u00E7\u00E3o desta entrada): "},
+ {"Enter.alias.name.", "Informe o nome do alias: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN se for igual ao de <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Propriet\u00E1rio: {0}\nEmissor: {1}\nN\u00FAmero de s\u00E9rie: {2}\nV\u00E1lido de: {3} a: {4}\nFingerprints do certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome do algoritmo de assinatura: {8}\n\t Vers\u00E3o: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "Qual \u00E9 o seu nome e o seu sobrenome?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "Qual \u00E9 o nome da sua unidade organizacional?"},
+ {"What.is.the.name.of.your.organization.",
+ "Qual \u00E9 o nome da sua empresa?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "Qual \u00E9 o nome da sua Cidade ou Localidade?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "Qual \u00E9 o nome do seu Estado ou Munic\u00EDpio?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "Quais s\u00E3o as duas letras do c\u00F3digo do pa\u00EDs desta unidade?"},
+ {"Is.name.correct.", "{0} Est\u00E1 correto?"},
+ {"no", "n\u00E3o"},
+ {"yes", "sim"},
+ {"y", "s"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "O alias <{0}> n\u00E3o tem chave"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Advert\u00EAncia Advert\u00EAncia Advert\u00EAncia *****************"},
+ {"Signer.d.", "Signat\u00E1rio #%d:"},
+ {"Timestamp.", "Timestamp:"},
+ {"Signature.", "Assinatura:"},
+ {"CRLs.", "CRLs:"},
+ {"Certificate.owner.", "Propriet\u00E1rio do certificado: "},
+ {"Not.a.signed.jar.file", "N\u00E3o \u00E9 um arquivo jar assinado"},
+ {"No.certificate.from.the.SSL.server",
+ "N\u00E3o \u00E9 um certificado do servidor SSL"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Cadeia de certificados incompleta na resposta"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "A cadeia de certificados da resposta n\u00E3o verifica: "},
+ {"Top.level.certificate.in.reply.",
+ "Certificado de n\u00EDvel superior na resposta:\n"},
+ {".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "},
+ {"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]: "},
+ {"NO", "N\u00E3o"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "O certificado da resposta e o certificado da \u00E1rea de armazenamento de chaves s\u00E3o id\u00EAnticos"},
+ {"Failed.to.establish.chain.from.reply",
+ "Falha ao estabelecer a cadeia a partir da resposta"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "Resposta errada; tente novamente"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "Chave secreta n\u00E3o gerada; o alias <{0}> j\u00E1 existe"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Forne\u00E7a o -keysize para a gera\u00E7\u00E3o da chave secreta"},
+
+ {"Extensions.", "Extens\u00F5es: "},
+ {".Empty.value.", "(Valor vazio)"},
+ {"Extension.Request.", "Solicita\u00E7\u00E3o de Extens\u00E3o:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "Solicita\u00E7\u00E3o do Certificado PKCS #10 (Vers\u00E3o 1.0)\nAssunto: %s\nChave P\u00FAblica: %s formato %s chave\n"},
+ {"Unknown.keyUsage.type.", "Tipo de keyUsage desconhecido: "},
+ {"Unknown.extendedkeyUsage.type.", "Tipo de extendedkeyUsage desconhecido: "},
+ {"Unknown.AccessDescription.type.", "Tipo de AccessDescription desconhecido: "},
+ {"Unrecognized.GeneralName.type.", "Tipo de GeneralName n\u00E3o reconhecido: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Esta extens\u00E3o n\u00E3o pode ser marcada como cr\u00EDtica. "},
+ {"Odd.number.of.hex.digits.found.", "Encontrado n\u00FAmero \u00EDmpar de seis d\u00EDgitos: "},
+ {"Unknown.extension.type.", "Tipo de extens\u00E3o desconhecido: "},
+ {"command.{0}.is.ambiguous.", "o comando {0} \u00E9 amb\u00EDguo:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java
new file mode 100644
index 0000000..a4727e6
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_sv extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [Alternativ]..."},
+ {"Options.", "Alternativ:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"},
+ {"Key.and.Certificate.Management.Tool",
+ "Hanteringsverktyg f\u00F6r nycklar och certifikat"},
+ {"Commands.", "Kommandon:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg - command_name\" om anv\u00E4ndning av command_name"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "Genererar certifikatbeg\u00E4ran"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u00C4ndrar postalias"}, //-changealias
+ {"Deletes.an.entry",
+ "Tar bort post"}, //-delete
+ {"Exports.certificate",
+ "Exporterar certifikat"}, //-exportcert
+ {"Generates.a.key.pair",
+ "Genererar nyckelpar"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "Genererar hemlig nyckel"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "Genererar certifikat fr\u00E5n certifikatbeg\u00E4ran"}, //-gencert
+ {"Generates.CRL", "Genererar CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importerar poster fr\u00E5n identitetsdatabas i JDK 1.1.x-format"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "Importerar ett certifikat eller en certifikatkedja"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importerar en eller alla poster fr\u00E5n annat nyckellager"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "Klonar en nyckelpost"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u00C4ndrar nyckell\u00F6senordet f\u00F6r en post"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "Visar lista \u00F6ver poster i nyckellager"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "Skriver ut inneh\u00E5llet i ett certifikat"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "Skriver ut inneh\u00E5llet i en certifikatbeg\u00E4ran"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "Skriver ut inneh\u00E5llet i en CRL-fil"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "Genererar ett sj\u00E4lvsignerat certifikat"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u00C4ndrar lagerl\u00F6senordet f\u00F6r ett nyckellager"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "aliasnamn f\u00F6r post som ska bearbetas"}, //-alias
+ {"destination.alias",
+ "destinationsalias"}, //-destalias
+ {"destination.key.password",
+ "l\u00F6senord f\u00F6r destinationsnyckel"}, //-destkeypass
+ {"destination.keystore.name",
+ "namn p\u00E5 destinationsnyckellager"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "skyddat l\u00F6senord f\u00F6r destinationsnyckellager"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "leverant\u00F6rsnamn f\u00F6r destinationsnyckellager"}, //-destprovidername
+ {"destination.keystore.password",
+ "l\u00F6senord f\u00F6r destinationsnyckellager"}, //-deststorepass
+ {"destination.keystore.type",
+ "typ av destinationsnyckellager"}, //-deststoretype
+ {"distinguished.name",
+ "unikt namn"}, //-dname
+ {"X.509.extension",
+ "X.509-till\u00E4gg"}, //-ext
+ {"output.file.name",
+ "namn p\u00E5 utdatafil"}, //-file and -outfile
+ {"input.file.name",
+ "namn p\u00E5 indatafil"}, //-file and -infile
+ {"key.algorithm.name",
+ "namn p\u00E5 nyckelalgoritm"}, //-keyalg
+ {"key.password",
+ "nyckell\u00F6senord"}, //-keypass
+ {"key.bit.size",
+ "nyckelbitstorlek"}, //-keysize
+ {"keystore.name",
+ "namn p\u00E5 nyckellager"}, //-keystore
+ {"new.password",
+ "nytt l\u00F6senord"}, //-new
+ {"do.not.prompt",
+ "fr\u00E5ga inte"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "l\u00F6senord med skyddad mekanism"}, //-protected
+ {"provider.argument",
+ "leverant\u00F6rsargument"}, //-providerarg
+ {"provider.class.name",
+ "namn p\u00E5 leverant\u00F6rsklass"}, //-providerclass
+ {"provider.name",
+ "leverant\u00F6rsnamn"}, //-providername
+ {"provider.classpath",
+ "leverant\u00F6rsklass\u00F6kv\u00E4g"}, //-providerpath
+ {"output.in.RFC.style",
+ "utdata i RFC-format"}, //-rfc
+ {"signature.algorithm.name",
+ "namn p\u00E5 signaturalgoritm"}, //-sigalg
+ {"source.alias",
+ "k\u00E4llalias"}, //-srcalias
+ {"source.key.password",
+ "l\u00F6senord f\u00F6r k\u00E4llnyckel"}, //-srckeypass
+ {"source.keystore.name",
+ "namn p\u00E5 k\u00E4llnyckellager"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "skyddat l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "leverant\u00F6rsnamn f\u00F6r k\u00E4llnyckellager"}, //-srcprovidername
+ {"source.keystore.password",
+ "l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcstorepass
+ {"source.keystore.type",
+ "typ av k\u00E4llnyckellager"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL-serverv\u00E4rd och -port"}, //-sslserver
+ {"signed.jar.file",
+ "signerad jar-fil"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "startdatum/-tid f\u00F6r certifikatets giltighet"}, //-startdate
+ {"keystore.password",
+ "l\u00F6senord f\u00F6r nyckellager"}, //-storepass
+ {"keystore.type",
+ "nyckellagertyp"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "tillf\u00F6rlitliga certifikat fr\u00E5n cacerts"}, //-trustcacerts
+ {"verbose.output",
+ "utf\u00F6rliga utdata"}, //-v
+ {"validity.number.of.days",
+ "antal dagar f\u00F6r giltighet"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "Seriellt ID f\u00F6r certifikat som ska \u00E5terkallas"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "nyckelverktygsfel: "},
+ {"Illegal.option.", "Otill\u00E5tet alternativ: "},
+ {"Illegal.value.", "Otill\u00E5tet v\u00E4rde: "},
+ {"Unknown.password.type.", "Ok\u00E4nd l\u00F6senordstyp: "},
+ {"Cannot.find.environment.variable.",
+ "Kan inte hitta milj\u00F6variabel: "},
+ {"Cannot.find.file.", "Hittar inte fil: "},
+ {"Command.option.flag.needs.an.argument.", "Kommandoalternativet {0} beh\u00F6ver ett argument."},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "Varning! PKCS12-nyckellager har inte st\u00F6d f\u00F6r olika l\u00F6senord f\u00F6r lagret och nyckeln. Det anv\u00E4ndarspecificerade {0}-v\u00E4rdet ignoreras."},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "-keystore m\u00E5ste vara NONE om -storetype \u00E4r {0}"},
+ {"Too.many.retries.program.terminated",
+ "F\u00F6r m\u00E5nga f\u00F6rs\u00F6k. Programmet avslutas"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "-storepasswd- och -keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r {0}"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "-keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r PKCS12"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "-keypass och -new kan inte anges om -storetype \u00E4r {0}"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "om -protected har angetts f\u00E5r inte -storepass, -keypass och -new anges"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "om -srcprotected anges f\u00E5r -srcstorepass och -srckeypass inte anges"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "om nyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -storepass, -keypass och -new inte anges"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "om k\u00E4llnyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -srcstorepass och -srckeypass inte anges"},
+ {"Illegal.startdate.value", "Otill\u00E5tet v\u00E4rde f\u00F6r startdatum"},
+ {"Validity.must.be.greater.than.zero",
+ "Giltigheten m\u00E5ste vara st\u00F6rre \u00E4n noll"},
+ {"provName.not.a.provider", "{0} \u00E4r inte en leverant\u00F6r"},
+ {"Usage.error.no.command.provided", "Syntaxfel: inget kommando angivet"},
+ {"Source.keystore.file.exists.but.is.empty.", "Nyckellagrets k\u00E4llfil finns, men \u00E4r tom: "},
+ {"Please.specify.srckeystore", "Ange -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "Kan inte specificera b\u00E5de -v och -rfc med 'list'-kommandot"},
+ {"Key.password.must.be.at.least.6.characters",
+ "Nyckell\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"New.password.must.be.at.least.6.characters",
+ "Det nya l\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"Keystore.file.exists.but.is.empty.",
+ "Nyckellagerfilen finns, men \u00E4r tom: "},
+ {"Keystore.file.does.not.exist.",
+ "Nyckellagerfilen finns inte: "},
+ {"Must.specify.destination.alias", "Du m\u00E5ste ange destinationsalias"},
+ {"Must.specify.alias", "Du m\u00E5ste ange alias"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "Nyckellagerl\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"Enter.keystore.password.", "Ange nyckellagerl\u00F6senord: "},
+ {"Enter.source.keystore.password.", "Ange l\u00F6senord f\u00F6r k\u00E4llnyckellagret: "},
+ {"Enter.destination.keystore.password.", "Ange nyckellagerl\u00F6senord f\u00F6r destination: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "Nyckellagerl\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"Unknown.Entry.Type", "Ok\u00E4nd posttyp"},
+ {"Too.many.failures.Alias.not.changed", "F\u00F6r m\u00E5nga fel. Alias har inte \u00E4ndrats"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "Posten f\u00F6r alias {0} har importerats."},
+ {"Entry.for.alias.alias.not.imported.", "Posten f\u00F6r alias {0} har inte importerats."},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "Ett problem uppstod vid importen av posten f\u00F6r alias {0}: {1}.\nPosten {0} har inte importerats."},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "Kommandoimporten slutf\u00F6rd: {0} poster har importerats, {1} poster var felaktiga eller annullerades"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "Varning! Det befintliga aliaset {0} i destinationsnyckellagret skrivs \u00F6ver"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "Aliaset {0} finns redan. Vill du skriva \u00F6ver det? [nej]: "},
+ {"Too.many.failures.try.later", "F\u00F6r m\u00E5nga fel - f\u00F6rs\u00F6k igen senare"},
+ {"Certification.request.stored.in.file.filename.",
+ "Certifikatbeg\u00E4ran har lagrats i filen <{0}>"},
+ {"Submit.this.to.your.CA", "Skicka detta till certifikatutf\u00E4rdaren"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "om n\u00E5got alias inte anges f\u00E5r destalias, srckeypass och destkeypass inte anges"},
+ {"Certificate.stored.in.file.filename.",
+ "Certifikatet har lagrats i filen <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "Certifikatsvaret har installerats i nyckellagret"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "Certifikatsvaret har inte installerats i nyckellagret"},
+ {"Certificate.was.added.to.keystore",
+ "Certifikatet har lagts till i nyckellagret"},
+ {"Certificate.was.not.added.to.keystore",
+ "Certifikatet har inte lagts till i nyckellagret"},
+ {".Storing.ksfname.", "[Lagrar {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} saknar offentlig nyckel (certifikat)"},
+ {"Cannot.derive.signature.algorithm",
+ "Kan inte h\u00E4rleda signaturalgoritm"},
+ {"Alias.alias.does.not.exist",
+ "Aliaset <{0}> finns inte"},
+ {"Alias.alias.has.no.certificate",
+ "Aliaset <{0}> saknar certifikat"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "Nyckelparet genererades inte. Aliaset <{0}> finns redan"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "Genererar {0} bitars {1}-nyckelpar och sj\u00E4lvsignerat certifikat ({2}) med en giltighet p\u00E5 {3} dagar\n\tf\u00F6r: {4}"},
+ {"Enter.key.password.for.alias.", "Ange nyckell\u00F6senord f\u00F6r <{0}>"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN om det \u00E4r identiskt med nyckellagerl\u00F6senordet): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "Nyckell\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "F\u00F6r m\u00E5nga fel - nyckeln lades inte till i nyckellagret"},
+ {"Destination.alias.dest.already.exists",
+ "Destinationsaliaset <{0}> finns redan"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "L\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "F\u00F6r m\u00E5nga fel. Nyckelposten har inte klonats"},
+ {"key.password.for.alias.", "nyckell\u00F6senord f\u00F6r <{0}>"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "Nyckellagerpost f\u00F6r <{0}> finns redan"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "Skapar nyckellagerpost f\u00F6r <{0}> ..."},
+ {"No.entries.from.identity.database.added",
+ "Inga poster fr\u00E5n identitetsdatabasen har lagts till"},
+ {"Alias.name.alias", "Aliasnamn: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "Skapat den: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Posttyp: {0}"},
+ {"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "},
+ {"Certificate.i.1.", "Certifikat[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Certifikatets fingeravtryck (SHA1): "},
+ {"Keystore.type.", "Nyckellagertyp: "},
+ {"Keystore.provider.", "Nyckellagerleverant\u00F6r: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "Nyckellagret inneh\u00E5ller {0,number,integer} post"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "Nyckellagret inneh\u00E5ller {0,number,integer} poster"},
+ {"Failed.to.parse.input", "Kunde inte tolka indata"},
+ {"Empty.input", "Inga indata"},
+ {"Not.X.509.certificate", "Inte ett X.509-certifikat"},
+ {"alias.has.no.public.key", "{0} saknar offentlig nyckel"},
+ {"alias.has.no.X.509.certificate", "{0} saknar X.509-certifikat"},
+ {"New.certificate.self.signed.", "Nytt certifikat (sj\u00E4lvsignerat):"},
+ {"Reply.has.no.certificates", "Svaret saknar certifikat"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "Certifikatet importerades inte. Aliaset <{0}> finns redan"},
+ {"Input.not.an.X.509.certificate", "Indata \u00E4r inte ett X.509-certifikat"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "Certifikatet finns redan i nyckellagerfilen under aliaset <{0}>"},
+ {"Do.you.still.want.to.add.it.no.",
+ "Vill du fortfarande l\u00E4gga till det? [nej]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "Certifikatet finns redan i den systemomsp\u00E4nnande CA-nyckellagerfilen under aliaset <{0}>"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]: "},
+ {"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]: "},
+ {"YES", "Ja"},
+ {"New.prompt.", "Nytt {0}: "},
+ {"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"},
+ {"Re.enter.new.prompt.", "Ange nytt {0} igen: "},
+ {"Re.enter.new.password.", "Ange det nya l\u00F6senordet igen: "},
+ {"They.don.t.match.Try.again", "De matchar inte. F\u00F6rs\u00F6k igen"},
+ {"Enter.prompt.alias.name.", "Ange aliasnamn f\u00F6r {0}: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "Ange ett nytt aliasnamn\t(skriv RETURN f\u00F6r att avbryta importen av denna post): "},
+ {"Enter.alias.name.", "Ange aliasnamn: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN om det \u00E4r det samma som f\u00F6r <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "\u00C4gare: {0}\nUtf\u00E4rdare: {1}\nSerienummer: {2}\nGiltigt fr\u00E5n den: {3} till: {4}\nCertifikatets fingeravtryck:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Namn p\u00E5 signaturalgoritm: {8}\n\t Version: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "Vad heter du i f\u00F6r- och efternamn?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "Vad heter din avdelning inom organisationen?"},
+ {"What.is.the.name.of.your.organization.",
+ "Vad heter din organisation?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "Vad heter din ort eller plats?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "Vad heter ditt land eller din provins?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "Vilken \u00E4r den tv\u00E5st\u00E4lliga landskoden?"},
+ {"Is.name.correct.", "\u00C4r {0} korrekt?"},
+ {"no", "nej"},
+ {"yes", "ja"},
+ {"y", "j"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "Aliaset <{0}> saknar nyckel"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** Varning Varning Varning *****************"},
+ {"Signer.d.", "Signerare #%d:"},
+ {"Timestamp.", "Tidsst\u00E4mpel:"},
+ {"Signature.", "Underskrift:"},
+ {"CRLs.", "CRL:er:"},
+ {"Certificate.owner.", "Certifikat\u00E4gare: "},
+ {"Not.a.signed.jar.file", "Ingen signerad jar-fil"},
+ {"No.certificate.from.the.SSL.server",
+ "Inget certifikat fr\u00E5n SSL-servern"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret. *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore. *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "Certifikatsvaret inneh\u00E5ller inte n\u00E5gon offentlig nyckel f\u00F6r <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+ "Ofullst\u00E4ndig certifikatskedja i svaret"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "Certifikatskedjan i svaret g\u00E5r inte att verifiera: "},
+ {"Top.level.certificate.in.reply.",
+ "Toppniv\u00E5certifikatet i svaret:\n"},
+ {".is.not.trusted.", "... \u00E4r inte betrott. "},
+ {"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]: "},
+ {"NO", "Nej"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "Certifikatsvaret och certifikatet i nyckellagret \u00E4r identiska"},
+ {"Failed.to.establish.chain.from.reply",
+ "Kunde inte uppr\u00E4tta kedja fr\u00E5n svaret"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "Fel svar. F\u00F6rs\u00F6k p\u00E5 nytt."},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "Den hemliga nyckeln har inte genererats eftersom aliaset <{0}> redan finns"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "Ange -keysize f\u00F6r att skapa hemlig nyckel"},
+
+ {"Extensions.", "Till\u00E4gg: "},
+ {".Empty.value.", "(Tomt v\u00E4rde)"},
+ {"Extension.Request.", "Till\u00E4ggsbeg\u00E4ran:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 certifikatbeg\u00E4ran (version 1.0)\n\u00C4mne: %s\nAllm\u00E4n nyckel: %s-format %s-nyckel\n"},
+ {"Unknown.keyUsage.type.", "Ok\u00E4nd keyUsage-typ: "},
+ {"Unknown.extendedkeyUsage.type.", "Ok\u00E4nd extendedkeyUsage-typ: "},
+ {"Unknown.AccessDescription.type.", "Ok\u00E4nd AccessDescription-typ: "},
+ {"Unrecognized.GeneralName.type.", "Ok\u00E4nd GeneralName-typ: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "Detta till\u00E4gg kan inte markeras som kritiskt. "},
+ {"Odd.number.of.hex.digits.found.", "Udda antal hex-siffror p\u00E5tr\u00E4ffades: "},
+ {"Unknown.extension.type.", "Ok\u00E4nd till\u00E4ggstyp: "},
+ {"command.{0}.is.ambiguous.", "kommandot {0} \u00E4r tvetydigt:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
new file mode 100644
index 0000000..6836bd7
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_zh_CN extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [\u9009\u9879]..."},
+ {"Options.", "\u9009\u9879:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\u4F7F\u7528 \"keytool -help\" \u83B7\u53D6\u6240\u6709\u53EF\u7528\u547D\u4EE4"},
+ {"Key.and.Certificate.Management.Tool",
+ "\u5BC6\u94A5\u548C\u8BC1\u4E66\u7BA1\u7406\u5DE5\u5177"},
+ {"Commands.", "\u547D\u4EE4:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "\u4F7F\u7528 \"keytool -command_name -help\" \u83B7\u53D6 command_name \u7684\u7528\u6CD5"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "\u751F\u6210\u8BC1\u4E66\u8BF7\u6C42"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u66F4\u6539\u6761\u76EE\u7684\u522B\u540D"}, //-changealias
+ {"Deletes.an.entry",
+ "\u5220\u9664\u6761\u76EE"}, //-delete
+ {"Exports.certificate",
+ "\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert
+ {"Generates.a.key.pair",
+ "\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert
+ {"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "\u4ECE JDK 1.1.x \u6837\u5F0F\u7684\u8EAB\u4EFD\u6570\u636E\u5E93\u5BFC\u5165\u6761\u76EE"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "\u5BFC\u5165\u8BC1\u4E66\u6216\u8BC1\u4E66\u94FE"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "\u4ECE\u5176\u4ED6\u5BC6\u94A5\u5E93\u5BFC\u5165\u4E00\u4E2A\u6216\u6240\u6709\u6761\u76EE"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "\u514B\u9686\u5BC6\u94A5\u6761\u76EE"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u66F4\u6539\u6761\u76EE\u7684\u5BC6\u94A5\u53E3\u4EE4"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "\u5217\u51FA\u5BC6\u94A5\u5E93\u4E2D\u7684\u6761\u76EE"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "\u6253\u5370\u8BC1\u4E66\u5185\u5BB9"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "\u6253\u5370\u8BC1\u4E66\u8BF7\u6C42\u7684\u5185\u5BB9"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "\u6253\u5370 CRL \u6587\u4EF6\u7684\u5185\u5BB9"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "\u751F\u6210\u81EA\u7B7E\u540D\u8BC1\u4E66"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "\u8981\u5904\u7406\u7684\u6761\u76EE\u7684\u522B\u540D"}, //-alias
+ {"destination.alias",
+ "\u76EE\u6807\u522B\u540D"}, //-destalias
+ {"destination.key.password",
+ "\u76EE\u6807\u5BC6\u94A5\u53E3\u4EE4"}, //-destkeypass
+ {"destination.keystore.name",
+ "\u76EE\u6807\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "\u53D7\u4FDD\u62A4\u7684\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "\u76EE\u6807\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-destprovidername
+ {"destination.keystore.password",
+ "\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-deststorepass
+ {"destination.keystore.type",
+ "\u76EE\u6807\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-deststoretype
+ {"distinguished.name",
+ "\u552F\u4E00\u5224\u522B\u540D"}, //-dname
+ {"X.509.extension",
+ "X.509 \u6269\u5C55"}, //-ext
+ {"output.file.name",
+ "\u8F93\u51FA\u6587\u4EF6\u540D"}, //-file and -outfile
+ {"input.file.name",
+ "\u8F93\u5165\u6587\u4EF6\u540D"}, //-file and -infile
+ {"key.algorithm.name",
+ "\u5BC6\u94A5\u7B97\u6CD5\u540D\u79F0"}, //-keyalg
+ {"key.password",
+ "\u5BC6\u94A5\u53E3\u4EE4"}, //-keypass
+ {"key.bit.size",
+ "\u5BC6\u94A5\u4F4D\u5927\u5C0F"}, //-keysize
+ {"keystore.name",
+ "\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-keystore
+ {"new.password",
+ "\u65B0\u53E3\u4EE4"}, //-new
+ {"do.not.prompt",
+ "\u4E0D\u63D0\u793A"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "\u901A\u8FC7\u53D7\u4FDD\u62A4\u7684\u673A\u5236\u7684\u53E3\u4EE4"}, //-protected
+ {"provider.argument",
+ "\u63D0\u4F9B\u65B9\u53C2\u6570"}, //-providerarg
+ {"provider.class.name",
+ "\u63D0\u4F9B\u65B9\u7C7B\u540D"}, //-providerclass
+ {"provider.name",
+ "\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-providername
+ {"provider.classpath",
+ "\u63D0\u4F9B\u65B9\u7C7B\u8DEF\u5F84"}, //-providerpath
+ {"output.in.RFC.style",
+ "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
+ {"signature.algorithm.name",
+ "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
+ {"source.alias",
+ "\u6E90\u522B\u540D"}, //-srcalias
+ {"source.key.password",
+ "\u6E90\u5BC6\u94A5\u53E3\u4EE4"}, //-srckeypass
+ {"source.keystore.name",
+ "\u6E90\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "\u53D7\u4FDD\u62A4\u7684\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "\u6E90\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-srcprovidername
+ {"source.keystore.password",
+ "\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcstorepass
+ {"source.keystore.type",
+ "\u6E90\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL \u670D\u52A1\u5668\u4E3B\u673A\u548C\u7AEF\u53E3"}, //-sslserver
+ {"signed.jar.file",
+ "\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "\u8BC1\u4E66\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F/\u65F6\u95F4"}, //-startdate
+ {"keystore.password",
+ "\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-storepass
+ {"keystore.type",
+ "\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "\u4FE1\u4EFB\u6765\u81EA cacerts \u7684\u8BC1\u4E66"}, //-trustcacerts
+ {"verbose.output",
+ "\u8BE6\u7EC6\u8F93\u51FA"}, //-v
+ {"validity.number.of.days",
+ "\u6709\u6548\u5929\u6570"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "\u8981\u64A4\u9500\u7684\u8BC1\u4E66\u7684\u5E8F\u5217 ID"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "keytool \u9519\u8BEF: "},
+ {"Illegal.option.", "\u975E\u6CD5\u9009\u9879: "},
+ {"Illegal.value.", "\u975E\u6CD5\u503C: "},
+ {"Unknown.password.type.", "\u672A\u77E5\u53E3\u4EE4\u7C7B\u578B: "},
+ {"Cannot.find.environment.variable.",
+ "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
+ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
+ {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "\u8B66\u544A: PKCS12 KeyStore \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"},
+ {"Too.many.retries.program.terminated",
+ "\u91CD\u8BD5\u6B21\u6570\u8FC7\u591A, \u7A0B\u5E8F\u5DF2\u7EC8\u6B62"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u652F\u6301 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "\u5982\u679C -storetype \u4E3A PKCS12, \u5219\u4E0D\u652F\u6301 -keypasswd \u547D\u4EE4"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A\u4E86 -protected, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A\u4E86 -srcprotected, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"},
+ {"Validity.must.be.greater.than.zero",
+ "\u6709\u6548\u671F\u5FC5\u987B\u5927\u4E8E\u96F6"},
+ {"provName.not.a.provider", "{0}\u4E0D\u662F\u63D0\u4F9B\u65B9"},
+ {"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"},
+ {"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
+ {"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ "'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -v \u53CA -rfc"},
+ {"Key.password.must.be.at.least.6.characters",
+ "\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"New.password.must.be.at.least.6.characters",
+ "\u65B0\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"Keystore.file.exists.but.is.empty.",
+ "\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
+ {"Keystore.file.does.not.exist.",
+ "\u5BC6\u94A5\u5E93\u6587\u4EF6\u4E0D\u5B58\u5728: "},
+ {"Must.specify.destination.alias", "\u5FC5\u987B\u6307\u5B9A\u76EE\u6807\u522B\u540D"},
+ {"Must.specify.alias", "\u5FC5\u987B\u6307\u5B9A\u522B\u540D"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"Enter.keystore.password.", "\u8F93\u5165\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
+ {"Enter.source.keystore.password.", "\u8F93\u5165\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
+ {"Enter.destination.keystore.password.", "\u8F93\u5165\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"Unknown.Entry.Type", "\u672A\u77E5\u6761\u76EE\u7C7B\u578B"},
+ {"Too.many.failures.Alias.not.changed", "\u6545\u969C\u592A\u591A\u3002\u672A\u66F4\u6539\u522B\u540D"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "\u5DF2\u6210\u529F\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
+ {"Entry.for.alias.alias.not.imported.", "\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u65F6\u51FA\u73B0\u95EE\u9898: {1}\u3002\n\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "\u5DF2\u5B8C\u6210\u5BFC\u5165\u547D\u4EE4: {0} \u4E2A\u6761\u76EE\u6210\u529F\u5BFC\u5165, {1} \u4E2A\u6761\u76EE\u5931\u8D25\u6216\u53D6\u6D88"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [no]: "},
+ {"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"},
+ {"Certification.request.stored.in.file.filename.",
+ "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"},
+ {"Submit.this.to.your.CA", "\u5C06\u6B64\u63D0\u4EA4\u7ED9\u60A8\u7684 CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "\u5982\u679C\u6CA1\u6709\u6307\u5B9A\u522B\u540D, \u5219\u4E0D\u80FD\u6307\u5B9A\u76EE\u6807\u522B\u540D, \u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u548C\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"},
+ {"Certificate.stored.in.file.filename.",
+ "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BC1\u4E66"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "\u8BC1\u4E66\u56DE\u590D\u5DF2\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "\u8BC1\u4E66\u56DE\u590D\u672A\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
+ {"Certificate.was.added.to.keystore",
+ "\u8BC1\u4E66\u5DF2\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
+ {"Certificate.was.not.added.to.keystore",
+ "\u8BC1\u4E66\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
+ {".Storing.ksfname.", "[\u6B63\u5728\u5B58\u50A8{0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5 (\u8BC1\u4E66)"},
+ {"Cannot.derive.signature.algorithm",
+ "\u65E0\u6CD5\u6D3E\u751F\u7B7E\u540D\u7B97\u6CD5"},
+ {"Alias.alias.does.not.exist",
+ "\u522B\u540D <{0}> \u4E0D\u5B58\u5728"},
+ {"Alias.alias.has.no.certificate",
+ "\u522B\u540D <{0}> \u6CA1\u6709\u8BC1\u4E66"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
+ {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "\u5BC6\u94A5\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "\u6545\u969C\u592A\u591A - \u5BC6\u94A5\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
+ {"Destination.alias.dest.already.exists",
+ "\u76EE\u6807\u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "\u6545\u969C\u592A\u591A\u3002\u672A\u514B\u9686\u5BC6\u94A5\u6761\u76EE"},
+ {"key.password.for.alias.", "<{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "<{0}> \u7684\u5BC6\u94A5\u5E93\u6761\u76EE\u5DF2\u7ECF\u5B58\u5728"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "\u6B63\u5728\u521B\u5EFA <{0}> \u7684\u5BC6\u94A5\u5E93\u6761\u76EE..."},
+ {"No.entries.from.identity.database.added",
+ "\u672A\u4ECE\u8EAB\u4EFD\u6570\u636E\u5E93\u4E2D\u6DFB\u52A0\u4EFB\u4F55\u6761\u76EE"},
+ {"Alias.name.alias", "\u522B\u540D: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "\u521B\u5EFA\u65E5\u671F: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "\u6761\u76EE\u7C7B\u578B: {0}"},
+ {"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "},
+ {"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "\u8BC1\u4E66\u6307\u7EB9 (SHA1): "},
+ {"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "},
+ {"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
+ {"Failed.to.parse.input", "\u65E0\u6CD5\u5BF9\u8F93\u5165\u8FDB\u884C\u8BED\u6CD5\u5206\u6790"},
+ {"Empty.input", "\u7A7A\u8F93\u5165"},
+ {"Not.X.509.certificate", "\u975E X.509 \u8BC1\u4E66"},
+ {"alias.has.no.public.key", "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5"},
+ {"alias.has.no.X.509.certificate", "{0}\u6CA1\u6709 X.509 \u8BC1\u4E66"},
+ {"New.certificate.self.signed.", "\u65B0\u8BC1\u4E66 (\u81EA\u7B7E\u540D):"},
+ {"Reply.has.no.certificates", "\u56DE\u590D\u4E2D\u6CA1\u6709\u8BC1\u4E66"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "\u8BC1\u4E66\u672A\u5BFC\u5165, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
+ {"Input.not.an.X.509.certificate", "\u6240\u8F93\u5165\u7684\u4E0D\u662F X.509 \u8BC1\u4E66"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"},
+ {"Do.you.still.want.to.add.it.no.",
+ "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [no]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [no]: "},
+ {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [no]: "},
+ {"YES", "\u662F"},
+ {"New.prompt.", "\u65B0{0}: "},
+ {"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"},
+ {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "},
+ {"Re.enter.new.password.", "\u518D\u6B21\u8F93\u5165\u65B0\u53E3\u4EE4: "},
+ {"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"},
+ {"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "\u8F93\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "},
+ {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"},
+ {".PATTERN.printX509Cert",
+ "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F: {3}, \u622A\u6B62\u65E5\u671F: {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {8}\n\t \u7248\u672C: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\u60A8\u7684\u540D\u5B57\u4E0E\u59D3\u6C0F\u662F\u4EC0\u4E48?"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\u60A8\u7684\u7EC4\u7EC7\u5355\u4F4D\u540D\u79F0\u662F\u4EC0\u4E48?"},
+ {"What.is.the.name.of.your.organization.",
+ "\u60A8\u7684\u7EC4\u7EC7\u540D\u79F0\u662F\u4EC0\u4E48?"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u533A\u57DF\u540D\u79F0\u662F\u4EC0\u4E48?"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\u60A8\u6240\u5728\u7684\u7701/\u5E02/\u81EA\u6CBB\u533A\u540D\u79F0\u662F\u4EC0\u4E48?"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\u8BE5\u5355\u4F4D\u7684\u53CC\u5B57\u6BCD\u56FD\u5BB6/\u5730\u533A\u4EE3\u7801\u662F\u4EC0\u4E48?"},
+ {"Is.name.correct.", "{0}\u662F\u5426\u6B63\u786E?"},
+ {"no", "\u5426"},
+ {"yes", "\u662F"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "\u522B\u540D <{0}> \u6CA1\u6709\u5BC6\u94A5"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
+ {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
+ {"Timestamp.", "\u65F6\u95F4\u6233:"},
+ {"Signature.", "\u7B7E\u540D:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
+ {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
+ {"No.certificate.from.the.SSL.server",
+ "\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"},
+ {"Incomplete.certificate.chain.in.reply",
+ "\u56DE\u590D\u4E2D\u7684\u8BC1\u4E66\u94FE\u4E0D\u5B8C\u6574"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\u56DE\u590D\u4E2D\u7684\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1: "},
+ {"Top.level.certificate.in.reply.",
+ "\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"},
+ {".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"},
+ {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [no]: "},
+ {"NO", "\u5426"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "\u8BC1\u4E66\u56DE\u590D\u4E0E\u5BC6\u94A5\u5E93\u4E2D\u7684\u8BC1\u4E66\u662F\u76F8\u540C\u7684"},
+ {"Failed.to.establish.chain.from.reply",
+ "\u65E0\u6CD5\u4ECE\u56DE\u590D\u4E2D\u5EFA\u7ACB\u94FE"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "\u9519\u8BEF\u7684\u7B54\u6848, \u8BF7\u518D\u8BD5\u4E00\u6B21"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"},
+
+ {"Extensions.", "\u6269\u5C55: "},
+ {".Empty.value.", "(\u7A7A\u503C)"},
+ {"Extension.Request.", "\u6269\u5C55\u8BF7\u6C42:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 \u8BC1\u4E66\u8BF7\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9898: %s\n\u516C\u5171\u5BC6\u94A5: %s \u683C\u5F0F %s \u5BC6\u94A5\n"},
+ {"Unknown.keyUsage.type.", "\u672A\u77E5 keyUsage \u7C7B\u578B: "},
+ {"Unknown.extendedkeyUsage.type.", "\u672A\u77E5 extendedkeyUsage \u7C7B\u578B: "},
+ {"Unknown.AccessDescription.type.", "\u672A\u77E5 AccessDescription \u7C7B\u578B: "},
+ {"Unrecognized.GeneralName.type.", "\u65E0\u6CD5\u8BC6\u522B\u7684 GeneralName \u7C7B\u578B: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "\u65E0\u6CD5\u5C06\u6B64\u6269\u5C55\u6807\u8BB0\u4E3A\u201C\u4E25\u91CD\u201D\u3002"},
+ {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5947\u6570\u4E2A\u5341\u516D\u8FDB\u5236\u6570\u5B57: "},
+ {"Unknown.extension.type.", "\u672A\u77E5\u6269\u5C55\u7C7B\u578B: "},
+ {"command.{0}.is.ambiguous.", "\u547D\u4EE4{0}\u4E0D\u660E\u786E:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
new file mode 100644
index 0000000..90cb13f
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_zh_HK extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [\u9078\u9805]..."},
+ {"Options.", "\u9078\u9805:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
+ {"Key.and.Certificate.Management.Tool",
+ "\u91D1\u9470\u8207\u6191\u8B49\u7BA1\u7406\u5DE5\u5177"},
+ {"Commands.", "\u547D\u4EE4:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "\u4F7F\u7528 \"keytool -command_name -help\" \u53D6\u5F97 command_name \u7684\u7528\u6CD5"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "\u7522\u751F\u6191\u8B49\u8981\u6C42"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u8B8A\u66F4\u9805\u76EE\u7684\u5225\u540D"}, //-changealias
+ {"Deletes.an.entry",
+ "\u522A\u9664\u9805\u76EE"}, //-delete
+ {"Exports.certificate",
+ "\u532F\u51FA\u6191\u8B49"}, //-exportcert
+ {"Generates.a.key.pair",
+ "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "\u5F9E\u6191\u8B49\u8981\u6C42\u7522\u751F\u6191\u8B49"}, //-gencert
+ {"Generates.CRL", "\u7522\u751F CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "\u5F9E JDK 1.1.x-style \u8B58\u5225\u8CC7\u6599\u5EAB\u532F\u5165\u9805\u76EE"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "\u532F\u5165\u6191\u8B49\u6216\u6191\u8B49\u93C8"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "\u5F9E\u5176\u4ED6\u91D1\u9470\u5132\u5B58\u5EAB\u532F\u5165\u4E00\u500B\u6216\u5168\u90E8\u9805\u76EE"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "\u8907\u88FD\u91D1\u9470\u9805\u76EE"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u8B8A\u66F4\u9805\u76EE\u7684\u91D1\u9470\u5BC6\u78BC"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "\u5217\u793A\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u9805\u76EE"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "\u5217\u5370\u6191\u8B49\u7684\u5167\u5BB9"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "\u5217\u5370\u6191\u8B49\u8981\u6C42\u7684\u5167\u5BB9"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "\u5217\u5370 CRL \u6A94\u6848\u7684\u5167\u5BB9"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "\u7522\u751F\u81EA\u884C\u7C3D\u7F72\u7684\u6191\u8B49"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u8B8A\u66F4\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5132\u5B58\u5BC6\u78BC"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "\u8981\u8655\u7406\u9805\u76EE\u7684\u5225\u540D\u540D\u7A31"}, //-alias
+ {"destination.alias",
+ "\u76EE\u7684\u5730\u5225\u540D"}, //-destalias
+ {"destination.key.password",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5BC6\u78BC"}, //-destkeypass
+ {"destination.keystore.name",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-destprovidername
+ {"destination.keystore.password",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-deststorepass
+ {"destination.keystore.type",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-deststoretype
+ {"distinguished.name",
+ "\u8FA8\u5225\u540D\u7A31"}, //-dname
+ {"X.509.extension",
+ "X.509 \u64F4\u5145\u5957\u4EF6"}, //-ext
+ {"output.file.name",
+ "\u8F38\u51FA\u6A94\u6848\u540D\u7A31"}, //-file and -outfile
+ {"input.file.name",
+ "\u8F38\u5165\u6A94\u6848\u540D\u7A31"}, //-file and -infile
+ {"key.algorithm.name",
+ "\u91D1\u9470\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-keyalg
+ {"key.password",
+ "\u91D1\u9470\u5BC6\u78BC"}, //-keypass
+ {"key.bit.size",
+ "\u91D1\u9470\u4F4D\u5143\u5927\u5C0F"}, //-keysize
+ {"keystore.name",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-keystore
+ {"new.password",
+ "\u65B0\u5BC6\u78BC"}, //-new
+ {"do.not.prompt",
+ "\u4E0D\u8981\u63D0\u793A"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "\u7D93\u7531\u4FDD\u8B77\u6A5F\u5236\u7684\u5BC6\u78BC"}, //-protected
+ {"provider.argument",
+ "\u63D0\u4F9B\u8005\u5F15\u6578"}, //-providerarg
+ {"provider.class.name",
+ "\u63D0\u4F9B\u8005\u985E\u5225\u540D\u7A31"}, //-providerclass
+ {"provider.name",
+ "\u63D0\u4F9B\u8005\u540D\u7A31"}, //-providername
+ {"provider.classpath",
+ "\u63D0\u4F9B\u8005\u985E\u5225\u8DEF\u5F91"}, //-providerpath
+ {"output.in.RFC.style",
+ "\u4EE5 RFC \u6A23\u5F0F\u8F38\u51FA"}, //-rfc
+ {"signature.algorithm.name",
+ "\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-sigalg
+ {"source.alias",
+ "\u4F86\u6E90\u5225\u540D"}, //-srcalias
+ {"source.key.password",
+ "\u4F86\u6E90\u91D1\u9470\u5BC6\u78BC"}, //-srckeypass
+ {"source.keystore.name",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-srcprovidername
+ {"source.keystore.password",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-srcstorepass
+ {"source.keystore.type",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL \u4F3A\u670D\u5668\u4E3B\u6A5F\u8207\u9023\u63A5\u57E0"}, //-sslserver
+ {"signed.jar.file",
+ "\u7C3D\u7F72\u7684 jar \u6A94\u6848"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "\u6191\u8B49\u6709\u6548\u6027\u958B\u59CB\u65E5\u671F/\u6642\u9593"}, //-startdate
+ {"keystore.password",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-storepass
+ {"keystore.type",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "\u4F86\u81EA cacerts \u7684\u4FE1\u4EFB\u6191\u8B49"}, //-trustcacerts
+ {"verbose.output",
+ "\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA"}, //-v
+ {"validity.number.of.days",
+ "\u6709\u6548\u6027\u65E5\u6578"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "\u8981\u64A4\u92B7\u6191\u8B49\u7684\u5E8F\u5217 ID"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "\u91D1\u9470\u5DE5\u5177\u932F\u8AA4: "},
+ {"Illegal.option.", "\u7121\u6548\u7684\u9078\u9805:"},
+ {"Illegal.value.", "\u7121\u6548\u503C: "},
+ {"Unknown.password.type.", "\u4E0D\u660E\u7684\u5BC6\u78BC\u985E\u578B: "},
+ {"Cannot.find.environment.variable.",
+ "\u627E\u4E0D\u5230\u74B0\u5883\u8B8A\u6578: "},
+ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6A94\u6848: "},
+ {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9078\u9805 {0} \u9700\u8981\u5F15\u6578\u3002"},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "\u8B66\u544A: PKCS12 \u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u652F\u63F4\u4E0D\u540C\u7684\u5132\u5B58\u5EAB\u548C\u91D1\u9470\u5BC6\u78BC\u3002\u5FFD\u7565\u4F7F\u7528\u8005\u6307\u5B9A\u7684 {0} \u503C\u3002"},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247 -keystore \u5FC5\u9808\u70BA NONE"},
+ {"Too.many.retries.program.terminated",
+ "\u91CD\u8A66\u6B21\u6578\u592A\u591A\uFF0C\u7A0B\u5F0F\u5DF2\u7D42\u6B62"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u652F\u63F4 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "\u5982\u679C -storetype \u70BA PKCS12\uFF0C\u5247\u4E0D\u652F\u63F4 -keypasswd \u547D\u4EE4"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A -protected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A -srcprotected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"Illegal.startdate.value", "\u7121\u6548\u7684 startdate \u503C"},
+ {"Validity.must.be.greater.than.zero",
+ "\u6709\u6548\u6027\u5FC5\u9808\u5927\u65BC\u96F6"},
+ {"provName.not.a.provider", "{0} \u4E0D\u662F\u4E00\u500B\u63D0\u4F9B\u8005"},
+ {"Usage.error.no.command.provided", "\u7528\u6CD5\u932F\u8AA4: \u672A\u63D0\u4F9B\u547D\u4EE4"},
+ {"Source.keystore.file.exists.but.is.empty.", "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A: "},
+ {"Please.specify.srckeystore", "\u8ACB\u6307\u5B9A -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ " 'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u6642\u6307\u5B9A -v \u53CA -rfc"},
+ {"Key.password.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"New.password.must.be.at.least.6.characters",
+ "\u65B0\u7684\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Keystore.file.exists.but.is.empty.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A\u767D: "},
+ {"Keystore.file.does.not.exist.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u4E0D\u5B58\u5728: "},
+ {"Must.specify.destination.alias", "\u5FC5\u9808\u6307\u5B9A\u76EE\u7684\u5730\u5225\u540D"},
+ {"Must.specify.alias", "\u5FC5\u9808\u6307\u5B9A\u5225\u540D"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Enter.keystore.password.", "\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Enter.source.keystore.password.", "\u8ACB\u8F38\u5165\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Enter.destination.keystore.password.", "\u8ACB\u8F38\u5165\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Unknown.Entry.Type", "\u4E0D\u660E\u7684\u9805\u76EE\u985E\u578B"},
+ {"Too.many.failures.Alias.not.changed", "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8B8A\u66F4\u5225\u540D"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "\u5DF2\u6210\u529F\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Entry.for.alias.alias.not.imported.", "\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u6642\u51FA\u73FE\u554F\u984C: {1}\u3002\n\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "\u5DF2\u5B8C\u6210\u532F\u5165\u547D\u4EE4: \u6210\u529F\u532F\u5165 {0} \u500B\u9805\u76EE\uFF0C{1} \u500B\u9805\u76EE\u5931\u6557\u6216\u5DF2\u53D6\u6D88"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "\u8B66\u544A: \u6B63\u5728\u8986\u5BEB\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u73FE\u6709\u5225\u540D {0}"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "\u73FE\u6709\u9805\u76EE\u5225\u540D {0} \u5B58\u5728\uFF0C\u662F\u5426\u8986\u5BEB\uFF1F[\u5426]: "},
+ {"Too.many.failures.try.later", "\u592A\u591A\u932F\u8AA4 - \u8ACB\u7A0D\u5F8C\u518D\u8A66"},
+ {"Certification.request.stored.in.file.filename.",
+ "\u8A8D\u8B49\u8981\u6C42\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
+ {"Submit.this.to.your.CA", "\u5C07\u6B64\u9001\u51FA\u81F3\u60A8\u7684 CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "\u5982\u679C\u672A\u6307\u5B9A\u5225\u540D\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A destalias\u3001srckeypass \u53CA destkeypass"},
+ {"Certificate.stored.in.file.filename.",
+ "\u6191\u8B49\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "\u6191\u8B49\u56DE\u8986\u5DF2\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "\u6191\u8B49\u56DE\u8986\u672A\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.was.added.to.keystore",
+ "\u6191\u8B49\u5DF2\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.was.not.added.to.keystore",
+ "\u6191\u8B49\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {".Storing.ksfname.", "[\u5132\u5B58 {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} \u6C92\u6709\u516C\u958B\u91D1\u9470 (\u6191\u8B49)"},
+ {"Cannot.derive.signature.algorithm",
+ "\u7121\u6CD5\u53D6\u5F97\u7C3D\u7AE0\u6F14\u7B97\u6CD5"},
+ {"Alias.alias.does.not.exist",
+ "\u5225\u540D <{0}> \u4E0D\u5B58\u5728"},
+ {"Alias.alias.has.no.certificate",
+ "\u5225\u540D <{0}> \u6C92\u6709\u6191\u8B49"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "\u6C92\u6709\u5EFA\u7ACB\u91D1\u9470\u7D44\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "\u91DD\u5C0D {4} \u7522\u751F\u6709\u6548\u671F {3} \u5929\u7684 {0} \u4F4D\u5143 {1} \u91D1\u9470\u7D44\u4EE5\u53CA\u81EA\u6211\u7C3D\u7F72\u6191\u8B49 ({2})\n\t"},
+ {"Enter.key.password.for.alias.", "\u8F38\u5165 <{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN \u5982\u679C\u548C\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u76F8\u540C): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "\u592A\u591A\u932F\u8AA4 - \u91D1\u9470\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB"},
+ {"Destination.alias.dest.already.exists",
+ "\u76EE\u7684\u5730\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8907\u88FD\u91D1\u9470\u9805\u76EE"},
+ {"key.password.for.alias.", "<{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "<{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE\u5DF2\u7D93\u5B58\u5728"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "\u5EFA\u7ACB <{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE..."},
+ {"No.entries.from.identity.database.added",
+ "\u6C92\u6709\u65B0\u589E\u4F86\u81EA\u8B58\u5225\u8CC7\u6599\u5EAB\u7684\u9805\u76EE"},
+ {"Alias.name.alias", "\u5225\u540D\u540D\u7A31: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "\u5EFA\u7ACB\u65E5\u671F: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "\u9805\u76EE\u985E\u578B: {0}"},
+ {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
+ {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "},
+ {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
+ {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
+ {"Failed.to.parse.input", "\u7121\u6CD5\u5256\u6790\u8F38\u5165"},
+ {"Empty.input", "\u7A7A\u8F38\u5165"},
+ {"Not.X.509.certificate", "\u975E X.509 \u6191\u8B49"},
+ {"alias.has.no.public.key", "{0} \u7121\u516C\u958B\u91D1\u9470"},
+ {"alias.has.no.X.509.certificate", "{0} \u7121 X.509 \u6191\u8B49"},
+ {"New.certificate.self.signed.", "\u65B0\u6191\u8B49 (\u81EA\u6211\u7C3D\u7F72): "},
+ {"Reply.has.no.certificates", "\u56DE\u8986\u4E0D\u542B\u6191\u8B49"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "\u6191\u8B49\u672A\u8F38\u5165\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Input.not.an.X.509.certificate", "\u8F38\u5165\u7684\u4E0D\u662F X.509 \u6191\u8B49"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
+ {"Do.you.still.want.to.add.it.no.",
+ "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u55CE\uFF1F [\u5426]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "\u6574\u500B\u7CFB\u7D71 CA \u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u81F3\u81EA\u5DF1\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u55CE\uFF1F [\u5426]: "},
+ {"Trust.this.certificate.no.", "\u4FE1\u4EFB\u9019\u500B\u6191\u8B49\uFF1F [\u5426]: "},
+ {"YES", "\u662F"},
+ {"New.prompt.", "\u65B0 {0}: "},
+ {"Passwords.must.differ", "\u5FC5\u9808\u662F\u4E0D\u540C\u7684\u5BC6\u78BC"},
+ {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F38\u5165\u65B0 {0}: "},
+ {"Re.enter.new.password.", "\u91CD\u65B0\u8F38\u5165\u65B0\u5BC6\u78BC: "},
+ {"They.don.t.match.Try.again", "\u5B83\u5011\u4E0D\u76F8\u7B26\u3002\u8ACB\u91CD\u8A66"},
+ {"Enter.prompt.alias.name.", "\u8F38\u5165 {0} \u5225\u540D\u540D\u7A31: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "\u8ACB\u8F38\u5165\u65B0\u7684\u5225\u540D\u540D\u7A31\t(RETURN \u4EE5\u53D6\u6D88\u532F\u5165\u6B64\u9805\u76EE):"},
+ {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"},
+ {".PATTERN.printX509Cert",
+ "\u64C1\u6709\u8005: {0}\n\u767C\u51FA\u8005: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\t \u7248\u672C: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\u60A8\u7684\u7D44\u7E54\u55AE\u4F4D\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.organization.",
+ "\u60A8\u7684\u7D44\u7E54\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u5730\u5340\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\u60A8\u6240\u5728\u7684\u5DDE\u53CA\u7701\u4EFD\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\u6B64\u55AE\u4F4D\u7684\u5169\u500B\u5B57\u6BCD\u570B\u5225\u4EE3\u78BC\u70BA\u4F55\uFF1F"},
+ {"Is.name.correct.", "{0} \u6B63\u78BA\u55CE\uFF1F"},
+ {"no", "\u5426"},
+ {"yes", "\u662F"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "\u5225\u540D <{0}> \u6C92\u6709\u91D1\u9470"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
+ {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
+ {"Timestamp.", "\u6642\u6233:"},
+ {"Signature.", "\u7C3D\u7AE0:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "\u6191\u8B49\u64C1\u6709\u8005: "},
+ {"Not.a.signed.jar.file", "\u4E0D\u662F\u7C3D\u7F72\u7684 jar \u6A94\u6848"},
+ {"No.certificate.from.the.SSL.server",
+ "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
+ {"Incomplete.certificate.chain.in.reply",
+ "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u4E0D\u5B8C\u6574"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
+ {"Top.level.certificate.in.reply.",
+ "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
+ {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
+ {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "},
+ {"NO", "\u5426"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "\u56DE\u8986\u6642\u7684\u516C\u958B\u91D1\u9470\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u7B26"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "\u6191\u8B49\u56DE\u8986\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u6191\u8B49\u662F\u76F8\u540C\u7684"},
+ {"Failed.to.establish.chain.from.reply",
+ "\u7121\u6CD5\u5F9E\u56DE\u8986\u4E2D\u5C07\u93C8\u5EFA\u7ACB\u8D77\u4F86"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "\u932F\u8AA4\u7684\u7B54\u6848\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "\u672A\u7522\u751F\u79D8\u5BC6\u91D1\u9470\uFF0C\u5225\u540D <{0}> \u5DF2\u5B58\u5728"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"},
+
+ {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "},
+ {".Empty.value.", "(\u7A7A\u767D\u503C)"},
+ {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u516C\u7528\u91D1\u9470: %s \u683C\u5F0F %s \u91D1\u9470\n"},
+ {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "},
+ {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "},
+ {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "},
+ {"Unrecognized.GeneralName.type.", "\u7121\u6CD5\u8FA8\u8B58\u7684 GeneralName \u985E\u578B: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"},
+ {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "},
+ {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "},
+ {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
new file mode 100644
index 0000000..2c7bdf5
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.keytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the keytool.
+ *
+ */
+public class Resources_zh_TW extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"STAR",
+ "*******************************************"},
+ {"STARNN",
+ "*******************************************\n\n"},
+
+ // keytool: Help part
+// "Option" should be translated.
+ {".OPTION.", " [\u9078\u9805]..."},
+ {"Options.", "\u9078\u9805:"},
+ {"Use.keytool.help.for.all.available.commands",
+ "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
+ {"Key.and.Certificate.Management.Tool",
+ "\u91D1\u9470\u8207\u6191\u8B49\u7BA1\u7406\u5DE5\u5177"},
+ {"Commands.", "\u547D\u4EE4:"},
+ {"Use.keytool.command.name.help.for.usage.of.command.name",
+ "\u4F7F\u7528 \"keytool -command_name -help\" \u53D6\u5F97 command_name \u7684\u7528\u6CD5"},
+ // keytool: help: commands
+ {"Generates.a.certificate.request",
+ "\u7522\u751F\u6191\u8B49\u8981\u6C42"}, //-certreq
+ {"Changes.an.entry.s.alias",
+ "\u8B8A\u66F4\u9805\u76EE\u7684\u5225\u540D"}, //-changealias
+ {"Deletes.an.entry",
+ "\u522A\u9664\u9805\u76EE"}, //-delete
+ {"Exports.certificate",
+ "\u532F\u51FA\u6191\u8B49"}, //-exportcert
+ {"Generates.a.key.pair",
+ "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
+// translation of "secret" key should be different to "private" key.
+ {"Generates.a.secret.key",
+ "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
+ {"Generates.certificate.from.a.certificate.request",
+ "\u5F9E\u6191\u8B49\u8981\u6C42\u7522\u751F\u6191\u8B49"}, //-gencert
+ {"Generates.CRL", "\u7522\u751F CRL"}, //-gencrl
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "\u5F9E JDK 1.1.x-style \u8B58\u5225\u8CC7\u6599\u5EAB\u532F\u5165\u9805\u76EE"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+ "\u532F\u5165\u6191\u8B49\u6216\u6191\u8B49\u93C8"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "\u5F9E\u5176\u4ED6\u91D1\u9470\u5132\u5B58\u5EAB\u532F\u5165\u4E00\u500B\u6216\u5168\u90E8\u9805\u76EE"}, //-importkeystore
+ {"Clones.a.key.entry",
+ "\u8907\u88FD\u91D1\u9470\u9805\u76EE"}, //-keyclone
+ {"Changes.the.key.password.of.an.entry",
+ "\u8B8A\u66F4\u9805\u76EE\u7684\u91D1\u9470\u5BC6\u78BC"}, //-keypasswd
+ {"Lists.entries.in.a.keystore",
+ "\u5217\u793A\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u9805\u76EE"}, //-list
+ {"Prints.the.content.of.a.certificate",
+ "\u5217\u5370\u6191\u8B49\u7684\u5167\u5BB9"}, //-printcert
+ {"Prints.the.content.of.a.certificate.request",
+ "\u5217\u5370\u6191\u8B49\u8981\u6C42\u7684\u5167\u5BB9"}, //-printcertreq
+ {"Prints.the.content.of.a.CRL.file",
+ "\u5217\u5370 CRL \u6A94\u6848\u7684\u5167\u5BB9"}, //-printcrl
+ {"Generates.a.self.signed.certificate",
+ "\u7522\u751F\u81EA\u884C\u7C3D\u7F72\u7684\u6191\u8B49"}, //-selfcert
+ {"Changes.the.store.password.of.a.keystore",
+ "\u8B8A\u66F4\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5132\u5B58\u5BC6\u78BC"}, //-storepasswd
+ // keytool: help: options
+ {"alias.name.of.the.entry.to.process",
+ "\u8981\u8655\u7406\u9805\u76EE\u7684\u5225\u540D\u540D\u7A31"}, //-alias
+ {"destination.alias",
+ "\u76EE\u7684\u5730\u5225\u540D"}, //-destalias
+ {"destination.key.password",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5BC6\u78BC"}, //-destkeypass
+ {"destination.keystore.name",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-destkeystore
+ {"destination.keystore.password.protected",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-destprotected
+ {"destination.keystore.provider.name",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-destprovidername
+ {"destination.keystore.password",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-deststorepass
+ {"destination.keystore.type",
+ "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-deststoretype
+ {"distinguished.name",
+ "\u8FA8\u5225\u540D\u7A31"}, //-dname
+ {"X.509.extension",
+ "X.509 \u64F4\u5145\u5957\u4EF6"}, //-ext
+ {"output.file.name",
+ "\u8F38\u51FA\u6A94\u6848\u540D\u7A31"}, //-file and -outfile
+ {"input.file.name",
+ "\u8F38\u5165\u6A94\u6848\u540D\u7A31"}, //-file and -infile
+ {"key.algorithm.name",
+ "\u91D1\u9470\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-keyalg
+ {"key.password",
+ "\u91D1\u9470\u5BC6\u78BC"}, //-keypass
+ {"key.bit.size",
+ "\u91D1\u9470\u4F4D\u5143\u5927\u5C0F"}, //-keysize
+ {"keystore.name",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-keystore
+ {"new.password",
+ "\u65B0\u5BC6\u78BC"}, //-new
+ {"do.not.prompt",
+ "\u4E0D\u8981\u63D0\u793A"}, //-noprompt
+ {"password.through.protected.mechanism",
+ "\u7D93\u7531\u4FDD\u8B77\u6A5F\u5236\u7684\u5BC6\u78BC"}, //-protected
+ {"provider.argument",
+ "\u63D0\u4F9B\u8005\u5F15\u6578"}, //-providerarg
+ {"provider.class.name",
+ "\u63D0\u4F9B\u8005\u985E\u5225\u540D\u7A31"}, //-providerclass
+ {"provider.name",
+ "\u63D0\u4F9B\u8005\u540D\u7A31"}, //-providername
+ {"provider.classpath",
+ "\u63D0\u4F9B\u8005\u985E\u5225\u8DEF\u5F91"}, //-providerpath
+ {"output.in.RFC.style",
+ "\u4EE5 RFC \u6A23\u5F0F\u8F38\u51FA"}, //-rfc
+ {"signature.algorithm.name",
+ "\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-sigalg
+ {"source.alias",
+ "\u4F86\u6E90\u5225\u540D"}, //-srcalias
+ {"source.key.password",
+ "\u4F86\u6E90\u91D1\u9470\u5BC6\u78BC"}, //-srckeypass
+ {"source.keystore.name",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-srckeystore
+ {"source.keystore.password.protected",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-srcprotected
+ {"source.keystore.provider.name",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-srcprovidername
+ {"source.keystore.password",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-srcstorepass
+ {"source.keystore.type",
+ "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-srcstoretype
+ {"SSL.server.host.and.port",
+ "SSL \u4F3A\u670D\u5668\u4E3B\u6A5F\u8207\u9023\u63A5\u57E0"}, //-sslserver
+ {"signed.jar.file",
+ "\u7C3D\u7F72\u7684 jar \u6A94\u6848"}, //=jarfile
+ {"certificate.validity.start.date.time",
+ "\u6191\u8B49\u6709\u6548\u6027\u958B\u59CB\u65E5\u671F/\u6642\u9593"}, //-startdate
+ {"keystore.password",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-storepass
+ {"keystore.type",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-storetype
+ {"trust.certificates.from.cacerts",
+ "\u4F86\u81EA cacerts \u7684\u4FE1\u4EFB\u6191\u8B49"}, //-trustcacerts
+ {"verbose.output",
+ "\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA"}, //-v
+ {"validity.number.of.days",
+ "\u6709\u6548\u6027\u65E5\u6578"}, //-validity
+ {"Serial.ID.of.cert.to.revoke",
+ "\u8981\u64A4\u92B7\u6191\u8B49\u7684\u5E8F\u5217 ID"}, //-id
+ // keytool: Running part
+ {"keytool.error.", "\u91D1\u9470\u5DE5\u5177\u932F\u8AA4: "},
+ {"Illegal.option.", "\u7121\u6548\u7684\u9078\u9805:"},
+ {"Illegal.value.", "\u7121\u6548\u503C: "},
+ {"Unknown.password.type.", "\u4E0D\u660E\u7684\u5BC6\u78BC\u985E\u578B: "},
+ {"Cannot.find.environment.variable.",
+ "\u627E\u4E0D\u5230\u74B0\u5883\u8B8A\u6578: "},
+ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6A94\u6848: "},
+ {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9078\u9805 {0} \u9700\u8981\u5F15\u6578\u3002"},
+ {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
+ "\u8B66\u544A: PKCS12 \u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u652F\u63F4\u4E0D\u540C\u7684\u5132\u5B58\u5EAB\u548C\u91D1\u9470\u5BC6\u78BC\u3002\u5FFD\u7565\u4F7F\u7528\u8005\u6307\u5B9A\u7684 {0} \u503C\u3002"},
+ {".keystore.must.be.NONE.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247 -keystore \u5FC5\u9808\u70BA NONE"},
+ {"Too.many.retries.program.terminated",
+ "\u91CD\u8A66\u6B21\u6578\u592A\u591A\uFF0C\u7A0B\u5F0F\u5DF2\u7D42\u6B62"},
+ {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u652F\u63F4 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
+ {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
+ "\u5982\u679C -storetype \u70BA PKCS12\uFF0C\u5247\u4E0D\u652F\u63F4 -keypasswd \u547D\u4EE4"},
+ {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
+ "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
+ {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A -protected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
+ {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u6307\u5B9A -srcprotected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
+ "\u5982\u679C\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
+ {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
+ "\u5982\u679C\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
+ {"Illegal.startdate.value", "\u7121\u6548\u7684 startdate \u503C"},
+ {"Validity.must.be.greater.than.zero",
+ "\u6709\u6548\u6027\u5FC5\u9808\u5927\u65BC\u96F6"},
+ {"provName.not.a.provider", "{0} \u4E0D\u662F\u4E00\u500B\u63D0\u4F9B\u8005"},
+ {"Usage.error.no.command.provided", "\u7528\u6CD5\u932F\u8AA4: \u672A\u63D0\u4F9B\u547D\u4EE4"},
+ {"Source.keystore.file.exists.but.is.empty.", "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A: "},
+ {"Please.specify.srckeystore", "\u8ACB\u6307\u5B9A -srckeystore"},
+ {"Must.not.specify.both.v.and.rfc.with.list.command",
+ " 'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u6642\u6307\u5B9A -v \u53CA -rfc"},
+ {"Key.password.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"New.password.must.be.at.least.6.characters",
+ "\u65B0\u7684\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Keystore.file.exists.but.is.empty.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A\u767D: "},
+ {"Keystore.file.does.not.exist.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u4E0D\u5B58\u5728: "},
+ {"Must.specify.destination.alias", "\u5FC5\u9808\u6307\u5B9A\u76EE\u7684\u5730\u5225\u540D"},
+ {"Must.specify.alias", "\u5FC5\u9808\u6307\u5B9A\u5225\u540D"},
+ {"Keystore.password.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Enter.keystore.password.", "\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Enter.source.keystore.password.", "\u8ACB\u8F38\u5165\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Enter.destination.keystore.password.", "\u8ACB\u8F38\u5165\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
+ {"Keystore.password.is.too.short.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Unknown.Entry.Type", "\u4E0D\u660E\u7684\u9805\u76EE\u985E\u578B"},
+ {"Too.many.failures.Alias.not.changed", "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8B8A\u66F4\u5225\u540D"},
+ {"Entry.for.alias.alias.successfully.imported.",
+ "\u5DF2\u6210\u529F\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Entry.for.alias.alias.not.imported.", "\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
+ "\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u6642\u51FA\u73FE\u554F\u984C: {1}\u3002\n\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
+ {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
+ "\u5DF2\u5B8C\u6210\u532F\u5165\u547D\u4EE4: \u6210\u529F\u532F\u5165 {0} \u500B\u9805\u76EE\uFF0C{1} \u500B\u9805\u76EE\u5931\u6557\u6216\u5DF2\u53D6\u6D88"},
+ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
+ "\u8B66\u544A: \u6B63\u5728\u8986\u5BEB\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u73FE\u6709\u5225\u540D {0}"},
+ {"Existing.entry.alias.alias.exists.overwrite.no.",
+ "\u73FE\u6709\u9805\u76EE\u5225\u540D {0} \u5B58\u5728\uFF0C\u662F\u5426\u8986\u5BEB\uFF1F[\u5426]: "},
+ {"Too.many.failures.try.later", "\u592A\u591A\u932F\u8AA4 - \u8ACB\u7A0D\u5F8C\u518D\u8A66"},
+ {"Certification.request.stored.in.file.filename.",
+ "\u8A8D\u8B49\u8981\u6C42\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
+ {"Submit.this.to.your.CA", "\u5C07\u6B64\u9001\u51FA\u81F3\u60A8\u7684 CA"},
+ {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
+ "\u5982\u679C\u672A\u6307\u5B9A\u5225\u540D\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A destalias\u3001srckeypass \u53CA destkeypass"},
+ {"Certificate.stored.in.file.filename.",
+ "\u6191\u8B49\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
+ {"Certificate.reply.was.installed.in.keystore",
+ "\u6191\u8B49\u56DE\u8986\u5DF2\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.reply.was.not.installed.in.keystore",
+ "\u6191\u8B49\u56DE\u8986\u672A\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.was.added.to.keystore",
+ "\u6191\u8B49\u5DF2\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {"Certificate.was.not.added.to.keystore",
+ "\u6191\u8B49\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
+ {".Storing.ksfname.", "[\u5132\u5B58 {0}]"},
+ {"alias.has.no.public.key.certificate.",
+ "{0} \u6C92\u6709\u516C\u958B\u91D1\u9470 (\u6191\u8B49)"},
+ {"Cannot.derive.signature.algorithm",
+ "\u7121\u6CD5\u53D6\u5F97\u7C3D\u7AE0\u6F14\u7B97\u6CD5"},
+ {"Alias.alias.does.not.exist",
+ "\u5225\u540D <{0}> \u4E0D\u5B58\u5728"},
+ {"Alias.alias.has.no.certificate",
+ "\u5225\u540D <{0}> \u6C92\u6709\u6191\u8B49"},
+ {"Key.pair.not.generated.alias.alias.already.exists",
+ "\u6C92\u6709\u5EFA\u7ACB\u91D1\u9470\u7D44\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
+ "\u91DD\u5C0D {4} \u7522\u751F\u6709\u6548\u671F {3} \u5929\u7684 {0} \u4F4D\u5143 {1} \u91D1\u9470\u7D44\u4EE5\u53CA\u81EA\u6211\u7C3D\u7F72\u6191\u8B49 ({2})\n\t"},
+ {"Enter.key.password.for.alias.", "\u8F38\u5165 <{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
+ {".RETURN.if.same.as.keystore.password.",
+ "\t(RETURN \u5982\u679C\u548C\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u76F8\u540C): "},
+ {"Key.password.is.too.short.must.be.at.least.6.characters",
+ "\u91D1\u9470\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Too.many.failures.key.not.added.to.keystore",
+ "\u592A\u591A\u932F\u8AA4 - \u91D1\u9470\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB"},
+ {"Destination.alias.dest.already.exists",
+ "\u76EE\u7684\u5730\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Password.is.too.short.must.be.at.least.6.characters",
+ "\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
+ {"Too.many.failures.Key.entry.not.cloned",
+ "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8907\u88FD\u91D1\u9470\u9805\u76EE"},
+ {"key.password.for.alias.", "<{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
+ {"Keystore.entry.for.id.getName.already.exists",
+ "<{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE\u5DF2\u7D93\u5B58\u5728"},
+ {"Creating.keystore.entry.for.id.getName.",
+ "\u5EFA\u7ACB <{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE..."},
+ {"No.entries.from.identity.database.added",
+ "\u6C92\u6709\u65B0\u589E\u4F86\u81EA\u8B58\u5225\u8CC7\u6599\u5EAB\u7684\u9805\u76EE"},
+ {"Alias.name.alias", "\u5225\u540D\u540D\u7A31: {0}"},
+ {"Creation.date.keyStore.getCreationDate.alias.",
+ "\u5EFA\u7ACB\u65E5\u671F: {0,date}"},
+ {"alias.keyStore.getCreationDate.alias.",
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "\u9805\u76EE\u985E\u578B: {0}"},
+ {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
+ {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "},
+ {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
+ {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
+ {"Your.keystore.contains.keyStore.size.entry",
+ "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
+ {"Failed.to.parse.input", "\u7121\u6CD5\u5256\u6790\u8F38\u5165"},
+ {"Empty.input", "\u7A7A\u8F38\u5165"},
+ {"Not.X.509.certificate", "\u975E X.509 \u6191\u8B49"},
+ {"alias.has.no.public.key", "{0} \u7121\u516C\u958B\u91D1\u9470"},
+ {"alias.has.no.X.509.certificate", "{0} \u7121 X.509 \u6191\u8B49"},
+ {"New.certificate.self.signed.", "\u65B0\u6191\u8B49 (\u81EA\u6211\u7C3D\u7F72): "},
+ {"Reply.has.no.certificates", "\u56DE\u8986\u4E0D\u542B\u6191\u8B49"},
+ {"Certificate.not.imported.alias.alias.already.exists",
+ "\u6191\u8B49\u672A\u8F38\u5165\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
+ {"Input.not.an.X.509.certificate", "\u8F38\u5165\u7684\u4E0D\u662F X.509 \u6191\u8B49"},
+ {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
+ "\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
+ {"Do.you.still.want.to.add.it.no.",
+ "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u55CE\uFF1F [\u5426]: "},
+ {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
+ "\u6574\u500B\u7CFB\u7D71 CA \u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
+ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
+ "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u81F3\u81EA\u5DF1\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u55CE\uFF1F [\u5426]: "},
+ {"Trust.this.certificate.no.", "\u4FE1\u4EFB\u9019\u500B\u6191\u8B49\uFF1F [\u5426]: "},
+ {"YES", "\u662F"},
+ {"New.prompt.", "\u65B0 {0}: "},
+ {"Passwords.must.differ", "\u5FC5\u9808\u662F\u4E0D\u540C\u7684\u5BC6\u78BC"},
+ {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F38\u5165\u65B0 {0}: "},
+ {"Re.enter.new.password.", "\u91CD\u65B0\u8F38\u5165\u65B0\u5BC6\u78BC: "},
+ {"They.don.t.match.Try.again", "\u5B83\u5011\u4E0D\u76F8\u7B26\u3002\u8ACB\u91CD\u8A66"},
+ {"Enter.prompt.alias.name.", "\u8F38\u5165 {0} \u5225\u540D\u540D\u7A31: "},
+ {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
+ "\u8ACB\u8F38\u5165\u65B0\u7684\u5225\u540D\u540D\u7A31\t(RETURN \u4EE5\u53D6\u6D88\u532F\u5165\u6B64\u9805\u76EE):"},
+ {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+ "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"},
+ {".PATTERN.printX509Cert",
+ "\u64C1\u6709\u8005: {0}\n\u767C\u51FA\u8005: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\t \u7248\u672C: {9}"},
+ {"What.is.your.first.and.last.name.",
+ "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.organizational.unit.",
+ "\u60A8\u7684\u7D44\u7E54\u55AE\u4F4D\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.organization.",
+ "\u60A8\u7684\u7D44\u7E54\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.City.or.Locality.",
+ "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u5730\u5340\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.name.of.your.State.or.Province.",
+ "\u60A8\u6240\u5728\u7684\u5DDE\u53CA\u7701\u4EFD\u540D\u7A31\u70BA\u4F55\uFF1F"},
+ {"What.is.the.two.letter.country.code.for.this.unit.",
+ "\u6B64\u55AE\u4F4D\u7684\u5169\u500B\u5B57\u6BCD\u570B\u5225\u4EE3\u78BC\u70BA\u4F55\uFF1F"},
+ {"Is.name.correct.", "{0} \u6B63\u78BA\u55CE\uFF1F"},
+ {"no", "\u5426"},
+ {"yes", "\u662F"},
+ {"y", "y"},
+ {".defaultValue.", " [{0}]: "},
+ {"Alias.alias.has.no.key",
+ "\u5225\u540D <{0}> \u6C92\u6709\u91D1\u9470"},
+ {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
+ "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
+
+ {".WARNING.WARNING.WARNING.",
+ "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
+ {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
+ {"Timestamp.", "\u6642\u6233:"},
+ {"Signature.", "\u7C3D\u7AE0:"},
+ {"CRLs.", "CRL:"},
+ {"Certificate.owner.", "\u6191\u8B49\u64C1\u6709\u8005: "},
+ {"Not.a.signed.jar.file", "\u4E0D\u662F\u7C3D\u7F72\u7684 jar \u6A94\u6848"},
+ {"No.certificate.from.the.SSL.server",
+ "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
+
+ {".The.integrity.of.the.information.stored.in.your.keystore.",
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"},
+ {".The.integrity.of.the.information.stored.in.the.srckeystore.",
+ "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"},
+
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
+ {"Incomplete.certificate.chain.in.reply",
+ "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u4E0D\u5B8C\u6574"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
+ {"Top.level.certificate.in.reply.",
+ "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
+ {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
+ {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "},
+ {"NO", "\u5426"},
+ {"Public.keys.in.reply.and.keystore.don.t.match",
+ "\u56DE\u8986\u6642\u7684\u516C\u958B\u91D1\u9470\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u7B26"},
+ {"Certificate.reply.and.certificate.in.keystore.are.identical",
+ "\u6191\u8B49\u56DE\u8986\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u6191\u8B49\u662F\u76F8\u540C\u7684"},
+ {"Failed.to.establish.chain.from.reply",
+ "\u7121\u6CD5\u5F9E\u56DE\u8986\u4E2D\u5C07\u93C8\u5EFA\u7ACB\u8D77\u4F86"},
+ {"n", "n"},
+ {"Wrong.answer.try.again", "\u932F\u8AA4\u7684\u7B54\u6848\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21"},
+ {"Secret.key.not.generated.alias.alias.already.exists",
+ "\u672A\u7522\u751F\u79D8\u5BC6\u91D1\u9470\uFF0C\u5225\u540D <{0}> \u5DF2\u5B58\u5728"},
+ {"Please.provide.keysize.for.secret.key.generation",
+ "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"},
+
+ {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "},
+ {".Empty.value.", "(\u7A7A\u767D\u503C)"},
+ {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"},
+ {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
+ "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u516C\u7528\u91D1\u9470: %s \u683C\u5F0F %s \u91D1\u9470\n"},
+ {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "},
+ {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "},
+ {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "},
+ {"Unrecognized.GeneralName.type.", "\u7121\u6CD5\u8FA8\u8B58\u7684 GeneralName \u985E\u578B: "},
+ {"This.extension.cannot.be.marked.as.critical.",
+ "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"},
+ {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "},
+ {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "},
+ {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
index 267cc01..5835ce9 100644
--- a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -60,7 +60,8 @@
// for i18n
static final java.util.ResourceBundle rb =
- java.util.ResourceBundle.getBundle("sun.security.util.Resources");
+ java.util.ResourceBundle.getBundle(
+ "sun.security.tools.policytool.Resources");
static final Collator collator = Collator.getInstance();
static {
// this is for case insensitive string comparisons
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
new file mode 100644
index 0000000..c155dce
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Warning: A public key for alias {0} does not exist. Make sure a KeyStore is properly configured."},
+ {"Warning.Class.not.found.class", "Warning: Class not found: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Warning: Invalid argument(s) for constructor: {0}"},
+ {"Illegal.Principal.Type.type", "Illegal Principal Type: {0}"},
+ {"Illegal.option.option", "Illegal option: {0}"},
+ {"Usage.policytool.options.", "Usage: policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] policy file location"},
+ {"New", "New"},
+ {"Open", "Open"},
+ {"Save", "Save"},
+ {"Save.As", "Save As"},
+ {"View.Warning.Log", "View Warning Log"},
+ {"Exit", "Exit"},
+ {"Add.Policy.Entry", "Add Policy Entry"},
+ {"Edit.Policy.Entry", "Edit Policy Entry"},
+ {"Remove.Policy.Entry", "Remove Policy Entry"},
+ {"Edit", "Edit"},
+ {"Retain", "Retain"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Warning: File name may include escaped backslash characters. " +
+ "It is not necessary to escape backslash characters " +
+ "(the tool escapes characters as necessary when writing " +
+ "the policy contents to the persistent store).\n\n" +
+ "Click on Retain to retain the entered name, or click on " +
+ "Edit to edit the name."},
+
+ {"Add.Public.Key.Alias", "Add Public Key Alias"},
+ {"Remove.Public.Key.Alias", "Remove Public Key Alias"},
+ {"File", "File"},
+ {"KeyStore", "KeyStore"},
+ {"Policy.File.", "Policy File:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "Could not open policy file: {0}: {1}"},
+ {"Policy.Tool", "Policy Tool"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Errors have occurred while opening the policy configuration. View the Warning Log for more information."},
+ {"Error", "Error"},
+ {"OK", "OK"},
+ {"Status", "Status"},
+ {"Warning", "Warning"},
+ {"Permission.",
+ "Permission: "},
+ {"Principal.Type.", "Principal Type:"},
+ {"Principal.Name.", "Principal Name:"},
+ {"Target.Name.",
+ "Target Name: "},
+ {"Actions.",
+ "Actions: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "OK to overwrite existing file {0}?"},
+ {"Cancel", "Cancel"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "Add Principal"},
+ {"Edit.Principal", "Edit Principal"},
+ {"Remove.Principal", "Remove Principal"},
+ {"Principals.", "Principals:"},
+ {".Add.Permission", " Add Permission"},
+ {".Edit.Permission", " Edit Permission"},
+ {"Remove.Permission", "Remove Permission"},
+ {"Done", "Done"},
+ {"KeyStore.URL.", "KeyStore URL:"},
+ {"KeyStore.Type.", "KeyStore Type:"},
+ {"KeyStore.Provider.", "KeyStore Provider:"},
+ {"KeyStore.Password.URL.", "KeyStore Password URL:"},
+ {"Principals", "Principals"},
+ {".Edit.Principal.", " Edit Principal:"},
+ {".Add.New.Principal.", " Add New Principal:"},
+ {"Permissions", "Permissions"},
+ {".Edit.Permission.", " Edit Permission:"},
+ {".Add.New.Permission.", " Add New Permission:"},
+ {"Signed.By.", "Signed By:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "Cannot Specify Principal with a Wildcard Class without a Wildcard Name"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "Cannot Specify Principal without a Name"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "Permission and Target Name must have a value"},
+ {"Remove.this.Policy.Entry.", "Remove this Policy Entry?"},
+ {"Overwrite.File", "Overwrite File"},
+ {"Policy.successfully.written.to.filename",
+ "Policy successfully written to {0}"},
+ {"null.filename", "null filename"},
+ {"Save.changes.", "Save changes?"},
+ {"Yes", "Yes"},
+ {"No", "No"},
+ {"Policy.Entry", "Policy Entry"},
+ {"Save.Changes", "Save Changes"},
+ {"No.Policy.Entry.selected", "No Policy Entry selected"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "Unable to open KeyStore: {0}"},
+ {"No.principal.selected", "No principal selected"},
+ {"No.permission.selected", "No permission selected"},
+ {"name", "name"},
+ {"configuration.type", "configuration type"},
+ {"environment.variable.name", "environment variable name"},
+ {"library.name", "library name"},
+ {"package.name", "package name"},
+ {"policy.type", "policy type"},
+ {"property.name", "property name"},
+ {"provider.name", "provider name"},
+ {"Principal.List", "Principal List"},
+ {"Permission.List", "Permission List"},
+ {"Code.Base", "Code Base"},
+ {"KeyStore.U.R.L.", "KeyStore U R L:"},
+ {"KeyStore.Password.U.R.L.", "KeyStore Password U R L:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java
new file mode 100644
index 0000000..4ca4c7e
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_de extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Warnung: Kein Public Key f\u00FCr Alias {0} vorhanden. Vergewissern Sie sich, dass der KeyStore ordnungsgem\u00E4\u00DF konfiguriert ist."},
+ {"Warning.Class.not.found.class", "Warnung: Klasse nicht gefunden: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Warnung: Ung\u00FCltige(s) Argument(e) f\u00FCr Constructor: {0}"},
+ {"Illegal.Principal.Type.type", "Ung\u00FCltiger Principal-Typ: {0}"},
+ {"Illegal.option.option", "Ung\u00FCltige Option: {0}"},
+ {"Usage.policytool.options.", "Verwendung: policytool [Optionen]"},
+ {".file.file.policy.file.location",
+ " [-file <Datei>] Policy-Dateiverzeichnis"},
+ {"New", "Neu"},
+ {"Open", "\u00D6ffnen"},
+ {"Save", "Speichern"},
+ {"Save.As", "Speichern unter"},
+ {"View.Warning.Log", "Warnungslog anzeigen"},
+ {"Exit", "Beenden"},
+ {"Add.Policy.Entry", "Policy-Eintrag hinzuf\u00FCgen"},
+ {"Edit.Policy.Entry", "Policy-Eintrag bearbeiten"},
+ {"Remove.Policy.Entry", "Policy-Eintrag entfernen"},
+ {"Edit", "Bearbeiten"},
+ {"Retain", "Beibehalten"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escape-Zeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
+
+ {"Add.Public.Key.Alias", "Public Key-Alias hinzuf\u00FCgen"},
+ {"Remove.Public.Key.Alias", "Public Key-Alias entfernen"},
+ {"File", "Datei"},
+ {"KeyStore", "KeyStore"},
+ {"Policy.File.", "Policy-Datei:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "Policy-Datei konnte nicht ge\u00F6ffnet werden: {0}: {1}"},
+ {"Policy.Tool", "Policy-Tool"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Beim \u00D6ffnen der Policy-Konfiguration sind Fehler aufgetreten. Weitere Informationen finden Sie im Warnungslog."},
+ {"Error", "Fehler"},
+ {"OK", "OK"},
+ {"Status", "Status"},
+ {"Warning", "Warnung"},
+ {"Permission.",
+ "Berechtigung: "},
+ {"Principal.Type.", "Principal-Typ:"},
+ {"Principal.Name.", "Principal-Name:"},
+ {"Target.Name.",
+ "Zielname: "},
+ {"Actions.",
+ "Aktionen: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "Vorhandene Datei {0} \u00FCberschreiben?"},
+ {"Cancel", "Abbrechen"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "Principal hinzuf\u00FCgen"},
+ {"Edit.Principal", "Principal bearbeiten"},
+ {"Remove.Principal", "Principal entfernen"},
+ {"Principals.", "Principals:"},
+ {".Add.Permission", " Berechtigung hinzuf\u00FCgen"},
+ {".Edit.Permission", " Berechtigung bearbeiten"},
+ {"Remove.Permission", "Berechtigung entfernen"},
+ {"Done", "Fertig"},
+ {"KeyStore.URL.", "KeyStore-URL:"},
+ {"KeyStore.Type.", "KeyStore-Typ:"},
+ {"KeyStore.Provider.", "KeyStore-Provider:"},
+ {"KeyStore.Password.URL.", "KeyStore-Kennwort-URL:"},
+ {"Principals", "Principals"},
+ {".Edit.Principal.", " Principal bearbeiten:"},
+ {".Add.New.Principal.", " Neuen Principal hinzuf\u00FCgen:"},
+ {"Permissions", "Berechtigungen"},
+ {".Edit.Permission.", " Berechtigung bearbeiten:"},
+ {".Add.New.Permission.", " Neue Berechtigung hinzuf\u00FCgen:"},
+ {"Signed.By.", "Signiert von:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "Principal kann nicht mit einer Platzhalterklasse ohne Platzhalternamen angegeben werden"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "Principal kann nicht ohne einen Namen angegeben werden"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "Berechtigung und Zielname m\u00FCssen einen Wert haben"},
+ {"Remove.this.Policy.Entry.", "Diesen Policy-Eintrag entfernen?"},
+ {"Overwrite.File", "Datei \u00FCberschreiben"},
+ {"Policy.successfully.written.to.filename",
+ "Policy erfolgreich in {0} geschrieben"},
+ {"null.filename", "Null-Dateiname"},
+ {"Save.changes.", "\u00C4nderungen speichern?"},
+ {"Yes", "Ja"},
+ {"No", "Nein"},
+ {"Policy.Entry", "Policy-Eintrag"},
+ {"Save.Changes", "\u00C4nderungen speichern"},
+ {"No.Policy.Entry.selected", "Kein Policy-Eintrag ausgew\u00E4hlt"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "KeyStore kann nicht ge\u00F6ffnet werden: {0}"},
+ {"No.principal.selected", "Kein Principal ausgew\u00E4hlt"},
+ {"No.permission.selected", "Keine Berechtigung ausgew\u00E4hlt"},
+ {"name", "Name"},
+ {"configuration.type", "Konfigurationstyp"},
+ {"environment.variable.name", "Umgebungsvariablenname"},
+ {"library.name", "Library-Name"},
+ {"package.name", "Packagename"},
+ {"policy.type", "Policy-Typ"},
+ {"property.name", "Eigenschaftsname"},
+ {"provider.name", "Providername"},
+ {"Principal.List", "Principal-Liste"},
+ {"Permission.List", "Berechtigungsliste"},
+ {"Code.Base", "Codebase"},
+ {"KeyStore.U.R.L.", "KeyStore-URL:"},
+ {"KeyStore.Password.U.R.L.", "KeyStore-Kennwort-URL:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java
new file mode 100644
index 0000000..1425500
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_es extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Advertencia: no hay clave p\u00FAblica para el alias {0}. Aseg\u00FArese de que se ha configurado correctamente un almac\u00E9n de claves."},
+ {"Warning.Class.not.found.class", "Advertencia: no se ha encontrado la clase: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Advertencia: argumento(s) no v\u00E1lido(s) para el constructor: {0}"},
+ {"Illegal.Principal.Type.type", "Tipo de principal no permitido: {0}"},
+ {"Illegal.option.option", "Opci\u00F3n no permitida: {0}"},
+ {"Usage.policytool.options.", "Sintaxis: policytool [opciones]"},
+ {".file.file.policy.file.location",
+ " [-file <archivo>] ubicaci\u00F3n del archivo de normas"},
+ {"New", "Nuevo"},
+ {"Open", "Abrir"},
+ {"Save", "Guardar"},
+ {"Save.As", "Guardar como"},
+ {"View.Warning.Log", "Ver Log de Advertencias"},
+ {"Exit", "Salir"},
+ {"Add.Policy.Entry", "Agregar Entrada de Pol\u00EDtica"},
+ {"Edit.Policy.Entry", "Editar Entrada de Pol\u00EDtica"},
+ {"Remove.Policy.Entry", "Eliminar Entrada de Pol\u00EDtica"},
+ {"Edit", "Editar"},
+ {"Retain", "Mantener"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Advertencia: el nombre del archivo puede contener caracteres de barra invertida de escape. No es necesario utilizar barras invertidas de escape (la herramienta aplica caracteres de escape seg\u00FAn sea necesario al escribir el contenido de las pol\u00EDticas en el almac\u00E9n persistente).\n\nHaga clic en Mantener para conservar el nombre introducido o en Editar para modificarlo."},
+
+ {"Add.Public.Key.Alias", "Agregar Alias de Clave P\u00FAblico"},
+ {"Remove.Public.Key.Alias", "Eliminar Alias de Clave P\u00FAblico"},
+ {"File", "Archivo"},
+ {"KeyStore", "Almac\u00E9n de Claves"},
+ {"Policy.File.", "Archivo de Pol\u00EDtica:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "No se ha podido abrir el archivo de pol\u00EDtica: {0}: {1}"},
+ {"Policy.Tool", "Herramienta de Pol\u00EDticas"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Ha habido errores al abrir la configuraci\u00F3n de pol\u00EDticas. V\u00E9ase el log de advertencias para obtener m\u00E1s informaci\u00F3n."},
+ {"Error", "Error"},
+ {"OK", "Aceptar"},
+ {"Status", "Estado"},
+ {"Warning", "Advertencia"},
+ {"Permission.",
+ "Permiso: "},
+ {"Principal.Type.", "Tipo de Principal:"},
+ {"Principal.Name.", "Nombre de Principal:"},
+ {"Target.Name.",
+ "Nombre de Destino: "},
+ {"Actions.",
+ "Acciones: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\u00BFSobrescribir el archivo existente {0}?"},
+ {"Cancel", "Cancelar"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "Agregar Principal"},
+ {"Edit.Principal", "Editar Principal"},
+ {"Remove.Principal", "Eliminar Principal"},
+ {"Principals.", "Principales:"},
+ {".Add.Permission", " Agregar Permiso"},
+ {".Edit.Permission", " Editar Permiso"},
+ {"Remove.Permission", "Eliminar Permiso"},
+ {"Done", "Listo"},
+ {"KeyStore.URL.", "URL de Almac\u00E9n de Claves:"},
+ {"KeyStore.Type.", "Tipo de Almac\u00E9n de Claves:"},
+ {"KeyStore.Provider.", "Proveedor de Almac\u00E9n de Claves:"},
+ {"KeyStore.Password.URL.", "URL de Contrase\u00F1a de Almac\u00E9n de Claves:"},
+ {"Principals", "Principales"},
+ {".Edit.Principal.", " Editar Principal:"},
+ {".Add.New.Principal.", " Agregar Nuevo Principal:"},
+ {"Permissions", "Permisos"},
+ {".Edit.Permission.", " Editar Permiso:"},
+ {".Add.New.Permission.", " Agregar Permiso Nuevo:"},
+ {"Signed.By.", "Firmado Por:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "No se puede especificar un principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "No se puede especificar el principal sin un nombre"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "Permiso y Nombre de Destino deben tener un valor"},
+ {"Remove.this.Policy.Entry.", "\u00BFEliminar esta entrada de pol\u00EDtica?"},
+ {"Overwrite.File", "Sobrescribir Archivo"},
+ {"Policy.successfully.written.to.filename",
+ "Pol\u00EDtica escrita correctamente en {0}"},
+ {"null.filename", "nombre de archivo nulo"},
+ {"Save.changes.", "\u00BFGuardar los cambios?"},
+ {"Yes", "S\u00ED"},
+ {"No", "No"},
+ {"Policy.Entry", "Entrada de Pol\u00EDtica"},
+ {"Save.Changes", "Guardar Cambios"},
+ {"No.Policy.Entry.selected", "No se ha seleccionado la entrada de pol\u00EDtica"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "No se ha podido abrir el almac\u00E9n de claves: {0}"},
+ {"No.principal.selected", "No se ha seleccionado un principal"},
+ {"No.permission.selected", "No se ha seleccionado un permiso"},
+ {"name", "nombre"},
+ {"configuration.type", "tipo de configuraci\u00F3n"},
+ {"environment.variable.name", "nombre de variable de entorno"},
+ {"library.name", "nombre de la biblioteca"},
+ {"package.name", "nombre del paquete"},
+ {"policy.type", "tipo de pol\u00EDtica"},
+ {"property.name", "nombre de la propiedad"},
+ {"provider.name", "nombre del proveedor"},
+ {"Principal.List", "Lista de Principales"},
+ {"Permission.List", "Lista de Permisos"},
+ {"Code.Base", "Base de C\u00F3digo"},
+ {"KeyStore.U.R.L.", "URL de Almac\u00E9n de Claves:"},
+ {"KeyStore.Password.U.R.L.", "URL de Contrase\u00F1a de Almac\u00E9n de Claves:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java
new file mode 100644
index 0000000..898e9cc
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_fr extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Avertissement\u00A0: il n''existe pas de cl\u00E9 publique pour l''alias {0}. V\u00E9rifiez que le fichier de cl\u00E9s d''acc\u00E8s est correctement configur\u00E9."},
+ {"Warning.Class.not.found.class", "Avertissement : classe introuvable - {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Avertissement\u00A0: arguments non valides pour le constructeur\u00A0- {0}"},
+ {"Illegal.Principal.Type.type", "Type de principal non admis : {0}"},
+ {"Illegal.option.option", "Option non admise : {0}"},
+ {"Usage.policytool.options.", "Syntaxe : policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] emplacement du fichier de r\u00E8gles"},
+ {"New", "Nouveau"},
+ {"Open", "Ouvrir"},
+ {"Save", "Enregistrer"},
+ {"Save.As", "Enregistrer sous"},
+ {"View.Warning.Log", "Afficher le journal des avertissements"},
+ {"Exit", "Quitter"},
+ {"Add.Policy.Entry", "Ajouter une r\u00E8gle"},
+ {"Edit.Policy.Entry", "Modifier une r\u00E8gle"},
+ {"Remove.Policy.Entry", "Enlever une r\u00E8gle"},
+ {"Edit", "Modifier"},
+ {"Retain", "Conserver"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
+
+ {"Add.Public.Key.Alias", "Ajouter un alias de cl\u00E9 publique"},
+ {"Remove.Public.Key.Alias", "Enlever un alias de cl\u00E9 publique"},
+ {"File", "Fichier"},
+ {"KeyStore", "Fichier de cl\u00E9s"},
+ {"Policy.File.", "Fichier de r\u00E8gles :"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "Impossible d''ouvrir le fichier de r\u00E8gles\u00A0: {0}: {1}"},
+ {"Policy.Tool", "Policy Tool"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Des erreurs se sont produites \u00E0 l'ouverture de la configuration de r\u00E8gles. Pour plus d'informations, consultez le journal des avertissements."},
+ {"Error", "Erreur"},
+ {"OK", "OK"},
+ {"Status", "Statut"},
+ {"Warning", "Avertissement"},
+ {"Permission.",
+ "Droit : "},
+ {"Principal.Type.", "Type de principal :"},
+ {"Principal.Name.", "Nom de principal :"},
+ {"Target.Name.",
+ "Nom de cible : "},
+ {"Actions.",
+ "Actions : "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "Remplacer le fichier existant {0} ?"},
+ {"Cancel", "Annuler"},
+ {"CodeBase.", "Base de code :"},
+ {"SignedBy.", "Sign\u00E9 par :"},
+ {"Add.Principal", "Ajouter un principal"},
+ {"Edit.Principal", "Modifier un principal"},
+ {"Remove.Principal", "Enlever un principal"},
+ {"Principals.", "Principaux :"},
+ {".Add.Permission", " Ajouter un droit"},
+ {".Edit.Permission", " Modifier un droit"},
+ {"Remove.Permission", "Enlever un droit"},
+ {"Done", "Termin\u00E9"},
+ {"KeyStore.URL.", "URL du fichier de cl\u00E9s :"},
+ {"KeyStore.Type.", "Type du fichier de cl\u00E9s :"},
+ {"KeyStore.Provider.", "Fournisseur du fichier de cl\u00E9s :"},
+ {"KeyStore.Password.URL.", "URL du mot de passe du fichier de cl\u00E9s :"},
+ {"Principals", "Principaux"},
+ {".Edit.Principal.", " Modifier un principal :"},
+ {".Add.New.Principal.", " Ajouter un principal :"},
+ {"Permissions", "Droits"},
+ {".Edit.Permission.", " Modifier un droit :"},
+ {".Add.New.Permission.", " Ajouter un droit :"},
+ {"Signed.By.", "Sign\u00E9 par :"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "Impossible de sp\u00E9cifier un principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "Impossible de sp\u00E9cifier un principal sans nom"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "Le droit et le nom de cible doivent avoir une valeur"},
+ {"Remove.this.Policy.Entry.", "Enlever cette r\u00E8gle ?"},
+ {"Overwrite.File", "Remplacer le fichier"},
+ {"Policy.successfully.written.to.filename",
+ "R\u00E8gle \u00E9crite dans {0}"},
+ {"null.filename", "nom de fichier NULL"},
+ {"Save.changes.", "Enregistrer les modifications ?"},
+ {"Yes", "Oui"},
+ {"No", "Non"},
+ {"Policy.Entry", "R\u00E8gle"},
+ {"Save.Changes", "Enregistrer les modifications"},
+ {"No.Policy.Entry.selected", "Aucune r\u00E8gle s\u00E9lectionn\u00E9e"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "Impossible d''ouvrir le fichier de cl\u00E9s d''acc\u00E8s : {0}"},
+ {"No.principal.selected", "Aucun principal s\u00E9lectionn\u00E9"},
+ {"No.permission.selected", "Aucun droit s\u00E9lectionn\u00E9"},
+ {"name", "nom"},
+ {"configuration.type", "type de configuration"},
+ {"environment.variable.name", "Nom de variable d'environnement"},
+ {"library.name", "nom de biblioth\u00E8que"},
+ {"package.name", "nom de package"},
+ {"policy.type", "type de r\u00E8gle"},
+ {"property.name", "nom de propri\u00E9t\u00E9"},
+ {"provider.name", "nom du fournisseur"},
+ {"Principal.List", "Liste de principaux"},
+ {"Permission.List", "Liste de droits"},
+ {"Code.Base", "Base de code"},
+ {"KeyStore.U.R.L.", "URL du fichier de cl\u00E9s :"},
+ {"KeyStore.Password.U.R.L.", "URL du mot de passe du fichier de cl\u00E9s :"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java
new file mode 100644
index 0000000..3daf861
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_it extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Avvertenza: non esiste una chiave pubblica per l''alias {0}. Verificare che il keystore sia configurato correttamente."},
+ {"Warning.Class.not.found.class", "Avvertenza: classe non trovata: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Avvertenza: argomento o argomenti non validi per il costruttore {0}"},
+ {"Illegal.Principal.Type.type", "Tipo principal non valido: {0}"},
+ {"Illegal.option.option", "Opzione non valida: {0}"},
+ {"Usage.policytool.options.", "Utilizzo: policytool [opzioni]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] posizione del file dei criteri"},
+ {"New", "Nuovo"},
+ {"Open", "Apri"},
+ {"Save", "Salva"},
+ {"Save.As", "Salva con nome"},
+ {"View.Warning.Log", "Visualizza registro avvertenze"},
+ {"Exit", "Esci"},
+ {"Add.Policy.Entry", "Aggiungi voce dei criteri"},
+ {"Edit.Policy.Entry", "Modifica voce dei criteri"},
+ {"Remove.Policy.Entry", "Rimuovi voce dei criteri"},
+ {"Edit", "Modifica"},
+ {"Retain", "Mantieni"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Avvertenza: il nome file pu\u00F2 includere barre rovesciate con escape. Non \u00E8 necessario eseguire l'escape delle barre rovesciate (se necessario lo strumento esegue l'escape dei caratteri al momento della scrittura del contenuto dei criteri nell'area di memorizzazione persistente).\n\nFare click su Mantieni per conservare il nome immesso, oppure su Modifica per modificare il nome."},
+
+ {"Add.Public.Key.Alias", "Aggiungi alias chiave pubblica"},
+ {"Remove.Public.Key.Alias", "Rimuovi alias chiave pubblica"},
+ {"File", "File"},
+ {"KeyStore", "Keystore"},
+ {"Policy.File.", "File dei criteri:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "Impossibile aprire il file di criteri {0}: {1}"},
+ {"Policy.Tool", "Strumento criteri"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Si sono verificati errori durante l'apertura della configurazione dei criteri. Consultare il registro delle avvertenze per ulteriori informazioni."},
+ {"Error", "Errore"},
+ {"OK", "OK"},
+ {"Status", "Stato"},
+ {"Warning", "Avvertenza"},
+ {"Permission.",
+ "Autorizzazione: "},
+ {"Principal.Type.", "Tipo principal:"},
+ {"Principal.Name.", "Nome principal:"},
+ {"Target.Name.",
+ "Nome destinazione: "},
+ {"Actions.",
+ "Azioni: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "OK per sovrascrivere il file {0}?"},
+ {"Cancel", "Annulla"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "Aggiungi principal"},
+ {"Edit.Principal", "Modifica principal"},
+ {"Remove.Principal", "Rimuovi principal"},
+ {"Principals.", "Principal:"},
+ {".Add.Permission", " Aggiungi autorizzazione"},
+ {".Edit.Permission", " Modifica autorizzazione"},
+ {"Remove.Permission", "Rimuovi autorizzazione"},
+ {"Done", "Fine"},
+ {"KeyStore.URL.", "URL keystore:"},
+ {"KeyStore.Type.", "Tipo keystore:"},
+ {"KeyStore.Provider.", "Provider keystore:"},
+ {"KeyStore.Password.URL.", "URL password keystore:"},
+ {"Principals", "Principal:"},
+ {".Edit.Principal.", " Modifica principal:"},
+ {".Add.New.Principal.", " Aggiungi nuovo principal:"},
+ {"Permissions", "Autorizzazioni"},
+ {".Edit.Permission.", " Modifica autorizzazione:"},
+ {".Add.New.Permission.", " Aggiungi nuova autorizzazione:"},
+ {"Signed.By.", "Firmato da:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "Impossibile specificare principal con una classe carattere jolly senza un nome carattere jolly"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "Impossibile specificare principal senza un nome"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "L'autorizzazione e il nome destinazione non possono essere nulli"},
+ {"Remove.this.Policy.Entry.", "Rimuovere questa voce dei criteri?"},
+ {"Overwrite.File", "Sovrascrivi file"},
+ {"Policy.successfully.written.to.filename",
+ "I criteri sono stati scritti in {0}"},
+ {"null.filename", "nome file nullo"},
+ {"Save.changes.", "Salvare le modifiche?"},
+ {"Yes", "S\u00EC"},
+ {"No", "No"},
+ {"Policy.Entry", "Voce dei criteri"},
+ {"Save.Changes", "Salva le modifiche"},
+ {"No.Policy.Entry.selected", "Nessuna voce dei criteri selezionata"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "Impossibile aprire il keystore: {0}"},
+ {"No.principal.selected", "Nessun principal selezionato"},
+ {"No.permission.selected", "Nessuna autorizzazione selezionata"},
+ {"name", "nome"},
+ {"configuration.type", "tipo di configurazione"},
+ {"environment.variable.name", "nome variabile ambiente"},
+ {"library.name", "nome libreria"},
+ {"package.name", "nome package"},
+ {"policy.type", "tipo di criteri"},
+ {"property.name", "nome propriet\u00E0"},
+ {"provider.name", "nome provider"},
+ {"Principal.List", "Lista principal"},
+ {"Permission.List", "Lista autorizzazioni"},
+ {"Code.Base", "Codebase"},
+ {"KeyStore.U.R.L.", "URL keystore:"},
+ {"KeyStore.Password.U.R.L.", "URL password keystore:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java
new file mode 100644
index 0000000..a3f901a
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_ja extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "\u8B66\u544A: \u5225\u540D{0}\u306E\u516C\u958B\u9375\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u6B63\u3057\u304F\u69CB\u6210\u3055\u308C\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"Warning.Class.not.found.class", "\u8B66\u544A: \u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "\u8B66\u544A: \u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}"},
+ {"Illegal.Principal.Type.type", "\u4E0D\u6B63\u306A\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30BF\u30A4\u30D7: {0}"},
+ {"Illegal.option.option", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}"},
+ {"Usage.policytool.options.", "\u4F7F\u7528\u65B9\u6CD5: policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] \u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240"},
+ {"New", "\u65B0\u898F"},
+ {"Open", "\u958B\u304F"},
+ {"Save", "\u4FDD\u5B58"},
+ {"Save.As", "\u5225\u540D\u4FDD\u5B58"},
+ {"View.Warning.Log", "\u8B66\u544A\u30ED\u30B0\u306E\u8868\u793A"},
+ {"Exit", "\u7D42\u4E86"},
+ {"Add.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u8FFD\u52A0"},
+ {"Edit.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u7DE8\u96C6"},
+ {"Remove.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u524A\u9664"},
+ {"Edit", "\u7DE8\u96C6"},
+ {"Retain", "\u4FDD\u6301"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "\u8B66\u544A: \u30D5\u30A1\u30A4\u30EB\u540D\u306B\u30A8\u30B9\u30B1\u30FC\u30D7\u3055\u308C\u305F\u30D0\u30C3\u30AF\u30B9\u30E9\u30C3\u30B7\u30E5\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30D0\u30C3\u30AF\u30B9\u30E9\u30C3\u30B7\u30E5\u6587\u5B57\u3092\u30A8\u30B9\u30B1\u30FC\u30D7\u3059\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093(\u30C4\u30FC\u30EB\u306F\u30DD\u30EA\u30B7\u30FC\u5185\u5BB9\u3092\u6C38\u7D9A\u30B9\u30C8\u30A2\u306B\u66F8\u304D\u8FBC\u3080\u3068\u304D\u306B\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u6587\u5B57\u3092\u30A8\u30B9\u30B1\u30FC\u30D7\u3057\u307E\u3059)\u3002\n\n\u5165\u529B\u6E08\u306E\u540D\u524D\u3092\u4FDD\u6301\u3059\u308B\u306B\u306F\u300C\u4FDD\u6301\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3001\u540D\u524D\u3092\u7DE8\u96C6\u3059\u308B\u306B\u306F\u300C\u7DE8\u96C6\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+
+ {"Add.Public.Key.Alias", "\u516C\u958B\u9375\u306E\u5225\u540D\u306E\u8FFD\u52A0"},
+ {"Remove.Public.Key.Alias", "\u516C\u958B\u9375\u306E\u5225\u540D\u3092\u524A\u9664"},
+ {"File", "\u30D5\u30A1\u30A4\u30EB"},
+ {"KeyStore", "\u30AD\u30FC\u30B9\u30C8\u30A2"},
+ {"Policy.File.", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "\u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F: {0}: {1}"},
+ {"Policy.Tool", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30C4\u30FC\u30EB"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "\u30DD\u30EA\u30B7\u30FC\u69CB\u6210\u3092\u958B\u304F\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u8A73\u7D30\u306F\u8B66\u544A\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
+ {"Error", "\u30A8\u30E9\u30FC"},
+ {"OK", "OK"},
+ {"Status", "\u72B6\u614B"},
+ {"Warning", "\u8B66\u544A"},
+ {"Permission.",
+ "\u30A2\u30AF\u30BB\u30B9\u6A29: "},
+ {"Principal.Type.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30BF\u30A4\u30D7:"},
+ {"Principal.Name.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u540D\u524D:"},
+ {"Target.Name.",
+ "\u30BF\u30FC\u30B2\u30C3\u30C8\u540D: "},
+ {"Actions.",
+ "\u30A2\u30AF\u30B7\u30E7\u30F3: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\u65E2\u5B58\u306E\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002"},
+ {"Cancel", "\u53D6\u6D88"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u8FFD\u52A0"},
+ {"Edit.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u7DE8\u96C6"},
+ {"Remove.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u524A\u9664"},
+ {"Principals.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB:"},
+ {".Add.Permission", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u8FFD\u52A0"},
+ {".Edit.Permission", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u7DE8\u96C6"},
+ {"Remove.Permission", "\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u524A\u9664"},
+ {"Done", "\u5B8C\u4E86"},
+ {"KeyStore.URL.", "\u30AD\u30FC\u30B9\u30C8\u30A2URL:"},
+ {"KeyStore.Type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7:"},
+ {"KeyStore.Provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0:"},
+ {"KeyStore.Password.URL.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9URL:"},
+ {"Principals", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB"},
+ {".Edit.Principal.", " \u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u7DE8\u96C6:"},
+ {".Add.New.Principal.", " \u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u65B0\u898F\u8FFD\u52A0:"},
+ {"Permissions", "\u30A2\u30AF\u30BB\u30B9\u6A29"},
+ {".Edit.Permission.", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u7DE8\u96C6:"},
+ {".Add.New.Permission.", " \u65B0\u898F\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u8FFD\u52A0:"},
+ {"Signed.By.", "\u7F72\u540D\u8005:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "\u540D\u524D\u3092\u4F7F\u7528\u305B\u305A\u306B\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "\u30A2\u30AF\u30BB\u30B9\u6A29\u3068\u30BF\u30FC\u30B2\u30C3\u30C8\u540D\u306F\u3001\u5024\u3092\u4FDD\u6301\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
+ {"Remove.this.Policy.Entry.", "\u3053\u306E\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059\u304B\u3002"},
+ {"Overwrite.File", "\u30D5\u30A1\u30A4\u30EB\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059"},
+ {"Policy.successfully.written.to.filename",
+ "\u30DD\u30EA\u30B7\u30FC\u306E{0}\u3078\u306E\u66F8\u8FBC\u307F\u306B\u6210\u529F\u3057\u307E\u3057\u305F"},
+ {"null.filename", "\u30D5\u30A1\u30A4\u30EB\u540D\u304Cnull\u3067\u3059"},
+ {"Save.changes.", "\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059\u304B\u3002"},
+ {"Yes", "\u306F\u3044"},
+ {"No", "\u3044\u3044\u3048"},
+ {"Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA"},
+ {"Save.Changes", "\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059"},
+ {"No.Policy.Entry.selected", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "\u30AD\u30FC\u30B9\u30C8\u30A2{0}\u3092\u958B\u3051\u307E\u305B\u3093"},
+ {"No.principal.selected", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+ {"No.permission.selected", "\u30A2\u30AF\u30BB\u30B9\u6A29\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+ {"name", "\u540D\u524D"},
+ {"configuration.type", "\u69CB\u6210\u30BF\u30A4\u30D7"},
+ {"environment.variable.name", "\u74B0\u5883\u5909\u6570\u540D"},
+ {"library.name", "\u30E9\u30A4\u30D6\u30E9\u30EA\u540D"},
+ {"package.name", "\u30D1\u30C3\u30B1\u30FC\u30B8\u540D"},
+ {"policy.type", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30BF\u30A4\u30D7"},
+ {"property.name", "\u30D7\u30ED\u30D1\u30C6\u30A3\u540D"},
+ {"provider.name", "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"},
+ {"Principal.List", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30EA\u30B9\u30C8"},
+ {"Permission.List", "\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u30EA\u30B9\u30C8"},
+ {"Code.Base", "\u30B3\u30FC\u30C9\u30FB\u30D9\u30FC\u30B9"},
+ {"KeyStore.U.R.L.", "\u30AD\u30FC\u30B9\u30C8\u30A2U R L:"},
+ {"KeyStore.Password.U.R.L.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9U R L:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java
new file mode 100644
index 0000000..7797ec8
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_ko extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "\uACBD\uACE0: {0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uD0A4 \uC800\uC7A5\uC18C\uAC00 \uC81C\uB300\uB85C \uAD6C\uC131\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
+ {"Warning.Class.not.found.class", "\uACBD\uACE0: \uD074\uB798\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "\uACBD\uACE0: \uC0DD\uC131\uC790\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uC778\uC218: {0}"},
+ {"Illegal.Principal.Type.type", "\uC798\uBABB\uB41C \uC8FC\uCCB4 \uC720\uD615: {0}"},
+ {"Illegal.option.option", "\uC798\uBABB\uB41C \uC635\uC158: {0}"},
+ {"Usage.policytool.options.", "\uC0AC\uC6A9\uBC95: policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] \uC815\uCC45 \uD30C\uC77C \uC704\uCE58"},
+ {"New", "\uC0C8\uB85C \uB9CC\uB4E4\uAE30"},
+ {"Open", "\uC5F4\uAE30"},
+ {"Save", "\uC800\uC7A5"},
+ {"Save.As", "\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5"},
+ {"View.Warning.Log", "\uACBD\uACE0 \uB85C\uADF8 \uBCF4\uAE30"},
+ {"Exit", "\uC885\uB8CC"},
+ {"Add.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uCD94\uAC00"},
+ {"Edit.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uD3B8\uC9D1"},
+ {"Remove.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uC81C\uAC70"},
+ {"Edit", "\uD3B8\uC9D1"},
+ {"Retain", "\uC720\uC9C0"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "\uACBD\uACE0: \uD30C\uC77C \uC774\uB984\uC5D0 \uC774\uC2A4\uCF00\uC774\uD504\uB41C \uBC31\uC2AC\uB798\uC2DC \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uBC31\uC2AC\uB798\uC2DC \uBB38\uC790\uB294 \uC774\uC2A4\uCF00\uC774\uD504\uD560 \uD544\uC694\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \uC601\uAD6C \uC800\uC7A5\uC18C\uC5D0 \uC815\uCC45 \uCF58\uD150\uCE20\uB97C \uC4F8 \uB54C \uD544\uC694\uC5D0 \uB530\uB77C \uC790\uB3D9\uC73C\uB85C \uBB38\uC790\uAC00 \uC774\uC2A4\uCF00\uC774\uD504\uB429\uB2C8\uB2E4.\n\n\uC785\uB825\uB41C \uC774\uB984\uC744 \uADF8\uB300\uB85C \uC720\uC9C0\uD558\uB824\uBA74 [\uC720\uC9C0]\uB97C \uB204\uB974\uACE0, \uC774\uB984\uC744 \uD3B8\uC9D1\uD558\uB824\uBA74 [\uD3B8\uC9D1]\uC744 \uB204\uB974\uC2ED\uC2DC\uC624."},
+
+ {"Add.Public.Key.Alias", "\uACF5\uC6A9 \uD0A4 \uBCC4\uCE6D \uCD94\uAC00"},
+ {"Remove.Public.Key.Alias", "\uACF5\uC6A9 \uD0A4 \uBCC4\uCE6D \uC81C\uAC70"},
+ {"File", "\uD30C\uC77C"},
+ {"KeyStore", "\uD0A4 \uC800\uC7A5\uC18C"},
+ {"Policy.File.", "\uC815\uCC45 \uD30C\uC77C:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "\uC815\uCC45 \uD30C\uC77C\uC744 \uC5F4 \uC218 \uC5C6\uC74C: {0}: {1}"},
+ {"Policy.Tool", "\uC815\uCC45 \uD234"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "\uC815\uCC45 \uAD6C\uC131\uC744 \uC5EC\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC790\uC138\uD55C \uB0B4\uC6A9\uC740 \uACBD\uACE0 \uB85C\uADF8\uB97C \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
+ {"Error", "\uC624\uB958"},
+ {"OK", "\uD655\uC778"},
+ {"Status", "\uC0C1\uD0DC"},
+ {"Warning", "\uACBD\uACE0"},
+ {"Permission.",
+ "\uAD8C\uD55C: "},
+ {"Principal.Type.", "\uC8FC\uCCB4 \uC720\uD615:"},
+ {"Principal.Name.", "\uC8FC\uCCB4 \uC774\uB984:"},
+ {"Target.Name.",
+ "\uB300\uC0C1 \uC774\uB984: "},
+ {"Actions.",
+ "\uC791\uC5C5: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\uAE30\uC874 \uD30C\uC77C {0}\uC744(\uB97C) \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C?"},
+ {"Cancel", "\uCDE8\uC18C"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "\uC8FC\uCCB4 \uCD94\uAC00"},
+ {"Edit.Principal", "\uC8FC\uCCB4 \uD3B8\uC9D1"},
+ {"Remove.Principal", "\uC8FC\uCCB4 \uC81C\uAC70"},
+ {"Principals.", "\uC8FC\uCCB4:"},
+ {".Add.Permission", " \uAD8C\uD55C \uCD94\uAC00"},
+ {".Edit.Permission", " \uAD8C\uD55C \uD3B8\uC9D1"},
+ {"Remove.Permission", "\uAD8C\uD55C \uC81C\uAC70"},
+ {"Done", "\uC644\uB8CC"},
+ {"KeyStore.URL.", "\uD0A4 \uC800\uC7A5\uC18C URL:"},
+ {"KeyStore.Type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615:"},
+ {"KeyStore.Provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790:"},
+ {"KeyStore.Password.URL.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 URL:"},
+ {"Principals", "\uC8FC\uCCB4"},
+ {".Edit.Principal.", " \uC8FC\uCCB4 \uD3B8\uC9D1:"},
+ {".Add.New.Principal.", " \uC0C8 \uC8FC\uCCB4 \uCD94\uAC00:"},
+ {"Permissions", "\uAD8C\uD55C"},
+ {".Edit.Permission.", " \uAD8C\uD55C \uD3B8\uC9D1:"},
+ {".Add.New.Permission.", " \uC0C8 \uAD8C\uD55C \uCD94\uAC00:"},
+ {"Signed.By.", "\uC11C\uBA85\uC790:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "\uC774\uB984 \uC5C6\uC774 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "\uAD8C\uD55C\uACFC \uB300\uC0C1 \uC774\uB984\uC758 \uAC12\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
+ {"Remove.this.Policy.Entry.", "\uC774 \uC815\uCC45 \uD56D\uBAA9\uC744 \uC81C\uAC70\uD558\uACA0\uC2B5\uB2C8\uAE4C?"},
+ {"Overwrite.File", "\uD30C\uC77C \uACB9\uCCD0\uC4F0\uAE30"},
+ {"Policy.successfully.written.to.filename",
+ "{0}\uC5D0 \uC131\uACF5\uC801\uC73C\uB85C \uC815\uCC45\uC744 \uC37C\uC2B5\uB2C8\uB2E4."},
+ {"null.filename", "\uB110 \uD30C\uC77C \uC774\uB984"},
+ {"Save.changes.", "\uBCC0\uACBD \uC0AC\uD56D\uC744 \uC800\uC7A5\uD558\uACA0\uC2B5\uB2C8\uAE4C?"},
+ {"Yes", "\uC608"},
+ {"No", "\uC544\uB2C8\uC624"},
+ {"Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9"},
+ {"Save.Changes", "\uBCC0\uACBD \uC0AC\uD56D \uC800\uC7A5"},
+ {"No.Policy.Entry.selected", "\uC120\uD0DD\uB41C \uC815\uCC45 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "\uD0A4 \uC800\uC7A5\uC18C\uB97C \uC5F4 \uC218 \uC5C6\uC74C: {0}"},
+ {"No.principal.selected", "\uC120\uD0DD\uB41C \uC8FC\uCCB4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"No.permission.selected", "\uC120\uD0DD\uB41C \uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ {"name", "\uC774\uB984"},
+ {"configuration.type", "\uAD6C\uC131 \uC720\uD615"},
+ {"environment.variable.name", "\uD658\uACBD \uBCC0\uC218 \uC774\uB984"},
+ {"library.name", "\uB77C\uC774\uBE0C\uB7EC\uB9AC \uC774\uB984"},
+ {"package.name", "\uD328\uD0A4\uC9C0 \uC774\uB984"},
+ {"policy.type", "\uC815\uCC45 \uC720\uD615"},
+ {"property.name", "\uC18D\uC131 \uC774\uB984"},
+ {"provider.name", "\uC81C\uACF5\uC790 \uC774\uB984"},
+ {"Principal.List", "\uC8FC\uCCB4 \uBAA9\uB85D"},
+ {"Permission.List", "\uAD8C\uD55C \uBAA9\uB85D"},
+ {"Code.Base", "\uCF54\uB4DC \uBCA0\uC774\uC2A4"},
+ {"KeyStore.U.R.L.", "\uD0A4 \uC800\uC7A5\uC18C URL:"},
+ {"KeyStore.Password.U.R.L.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 URL:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
new file mode 100644
index 0000000..9bd9808
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_pt_BR extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Advert\u00EAncia: N\u00E3o existe uma chave p\u00FAblica para o alias {0}. Certifique-se de que um KeyStore esteja configurado adequadamente."},
+ {"Warning.Class.not.found.class", "Advert\u00EAncia: Classe n\u00E3o encontrada: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Advert\u00EAncia: Argumento(s) inv\u00E1lido(s) para o construtor: {0}"},
+ {"Illegal.Principal.Type.type", "Tipo Principal Inv\u00E1lido: {0}"},
+ {"Illegal.option.option", "Op\u00E7\u00E3o inv\u00E1lida: {0}"},
+ {"Usage.policytool.options.", "Uso: policytool [op\u00E7\u00F5es]"},
+ {".file.file.policy.file.location",
+ " [-file <arquivo>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"},
+ {"New", "Novo"},
+ {"Open", "Abrir"},
+ {"Save", "Salvar"},
+ {"Save.As", "Salvar Como"},
+ {"View.Warning.Log", "Exibir Log de Advert\u00EAncias"},
+ {"Exit", "Sair"},
+ {"Add.Policy.Entry", "Adicionar Entrada de Pol\u00EDtica"},
+ {"Edit.Policy.Entry", "Editar Entrada de Pol\u00EDtica"},
+ {"Remove.Policy.Entry", "Remover Entrada de Pol\u00EDtica"},
+ {"Edit", "Editar"},
+ {"Retain", "Reter"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Advert\u00EAncia: O nome do arquivo pode conter caracteres de escape barra invertida. N\u00E3o \u00E9 necess\u00E1rio fazer o escape dos caracteres de barra invertida (a ferramenta faz o escape dos caracteres conforme necess\u00E1rio ao gravar o conte\u00FAdo da pol\u00EDtica no armazenamento persistente).\n\nClique em Reter para reter o nome da entrada ou clique em Editar para edit\u00E1-lo."},
+
+ {"Add.Public.Key.Alias", "Adicionar Alias de Chave P\u00FAblica"},
+ {"Remove.Public.Key.Alias", "Remover Alias de Chave P\u00FAblica"},
+ {"File", "Arquivo"},
+ {"KeyStore", "KeyStore"},
+ {"Policy.File.", "Arquivo de Pol\u00EDtica:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "N\u00E3o foi poss\u00EDvel abrir o arquivo de pol\u00EDtica: {0}: {1}"},
+ {"Policy.Tool", "Ferramenta de Pol\u00EDtica"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Erros durante a abertura da configura\u00E7\u00E3o da pol\u00EDtica. Consulte o Log de Advert\u00EAncias para obter mais informa\u00E7\u00F5es."},
+ {"Error", "Erro"},
+ {"OK", "OK"},
+ {"Status", "Status"},
+ {"Warning", "Advert\u00EAncia"},
+ {"Permission.",
+ "Permiss\u00E3o: "},
+ {"Principal.Type.", "Tipo do Principal:"},
+ {"Principal.Name.", "Nome do Principal:"},
+ {"Target.Name.",
+ "Nome do Alvo: "},
+ {"Actions.",
+ "A\u00E7\u00F5es: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "Est\u00E1 correto substituir o arquivo existente {0}?"},
+ {"Cancel", "Cancelar"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "Adicionar Principal"},
+ {"Edit.Principal", "Editar Principal"},
+ {"Remove.Principal", "Remover Principal"},
+ {"Principals.", "Principais:"},
+ {".Add.Permission", " Adicionar Permiss\u00E3o"},
+ {".Edit.Permission", " Editar Permiss\u00E3o"},
+ {"Remove.Permission", "Remover Permiss\u00E3o"},
+ {"Done", "Conclu\u00EDdo"},
+ {"KeyStore.URL.", "URL do KeyStore:"},
+ {"KeyStore.Type.", "Tipo de KeyStore:"},
+ {"KeyStore.Provider.", "Fornecedor de KeyStore:"},
+ {"KeyStore.Password.URL.", "URL da Senha do KeyStore:"},
+ {"Principals", "Principais"},
+ {".Edit.Principal.", " Editar Principal:"},
+ {".Add.New.Principal.", " Adicionar Novo Principal:"},
+ {"Permissions", "Permiss\u00F5es"},
+ {".Edit.Permission.", " Editar Permiss\u00E3o:"},
+ {".Add.New.Permission.", " Adicionar Nova Permiss\u00E3o:"},
+ {"Signed.By.", "Assinado por:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "N\u00E3o \u00E9 Poss\u00EDvel Especificar um Principal com uma Classe de Curinga sem um Nome de Curinga"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "N\u00E3o \u00E9 Poss\u00EDvel Especificar um Principal sem um Nome"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "O Nome de Destino e a Permiss\u00E3o devem ter um Valor"},
+ {"Remove.this.Policy.Entry.", "Remover esta Entrada de Pol\u00EDtica?"},
+ {"Overwrite.File", "Substituir Arquivo"},
+ {"Policy.successfully.written.to.filename",
+ "Pol\u00EDtica gravada com \u00EAxito em {0}"},
+ {"null.filename", "nome de arquivo nulo"},
+ {"Save.changes.", "Salvar altera\u00E7\u00F5es?"},
+ {"Yes", "Sim"},
+ {"No", "N\u00E3o"},
+ {"Policy.Entry", "Entrada de Pol\u00EDtica"},
+ {"Save.Changes", "Salvar Altera\u00E7\u00F5es"},
+ {"No.Policy.Entry.selected", "Nenhuma Entrada de Pol\u00EDtica Selecionada"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "N\u00E3o \u00E9 poss\u00EDvel abrir a KeyStore: {0}"},
+ {"No.principal.selected", "Nenhum principal selecionado"},
+ {"No.permission.selected", "Nenhuma permiss\u00E3o selecionada"},
+ {"name", "nome"},
+ {"configuration.type", "tipo de configura\u00E7\u00E3o"},
+ {"environment.variable.name", "nome da vari\u00E1vel de ambiente"},
+ {"library.name", "nome da biblioteca"},
+ {"package.name", "nome do pacote"},
+ {"policy.type", "tipo de pol\u00EDtica"},
+ {"property.name", "nome da propriedade"},
+ {"provider.name", "nome do fornecedor"},
+ {"Principal.List", "Lista de Principais"},
+ {"Permission.List", "Lista de Permiss\u00F5es"},
+ {"Code.Base", "Base de C\u00F3digo"},
+ {"KeyStore.U.R.L.", "U R L da KeyStore:"},
+ {"KeyStore.Password.U.R.L.", "U R L da Senha do KeyStore:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java
new file mode 100644
index 0000000..f0bf734
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_sv extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "Varning! Det finns ingen offentlig nyckel f\u00F6r aliaset {0}. Kontrollera att det aktuella nyckellagret \u00E4r korrekt konfigurerat."},
+ {"Warning.Class.not.found.class", "Varning! Klassen hittades inte: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "Varning! Ogiltiga argument f\u00F6r konstruktor: {0}"},
+ {"Illegal.Principal.Type.type", "Otill\u00E5ten identitetshavaretyp: {0}"},
+ {"Illegal.option.option", "Otill\u00E5tet alternativ: {0}"},
+ {"Usage.policytool.options.", "Syntax: policytool [alternativ]"},
+ {".file.file.policy.file.location",
+ " [-file <fil>] policyfilens plats"},
+ {"New", "Nytt"},
+ {"Open", "\u00D6ppna"},
+ {"Save", "Spara"},
+ {"Save.As", "Spara som"},
+ {"View.Warning.Log", "Visa varningslogg"},
+ {"Exit", "Avsluta"},
+ {"Add.Policy.Entry", "L\u00E4gg till policypost"},
+ {"Edit.Policy.Entry", "Redigera policypost"},
+ {"Remove.Policy.Entry", "Ta bort policypost"},
+ {"Edit", "Redigera"},
+ {"Retain", "Beh\u00E5ll"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "Varning! Filnamnet kan inneh\u00E5lla omv\u00E4nda snedstreck inom citattecken. Citattecken kr\u00E4vs inte f\u00F6r omv\u00E4nda snedstreck (verktyget hanterar detta n\u00E4r policyinneh\u00E5llet skrivs till det best\u00E4ndiga lagret).\n\nKlicka p\u00E5 Beh\u00E5ll f\u00F6r att beh\u00E5lla det angivna namnet, eller klicka p\u00E5 Redigera f\u00F6r att \u00E4ndra det."},
+
+ {"Add.Public.Key.Alias", "L\u00E4gg till offentligt nyckelalias"},
+ {"Remove.Public.Key.Alias", "Ta bort offentligt nyckelalias"},
+ {"File", "Fil"},
+ {"KeyStore", "Nyckellager"},
+ {"Policy.File.", "Policyfil:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "Kan inte \u00F6ppna policyfilen: {0}: {1}"},
+ {"Policy.Tool", "Policyverktyg"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "Det uppstod ett fel n\u00E4r policykonfigurationen skulle \u00F6ppnas. Se varningsloggen f\u00F6r mer information."},
+ {"Error", "Fel"},
+ {"OK", "OK"},
+ {"Status", "Status"},
+ {"Warning", "Varning"},
+ {"Permission.",
+ "Beh\u00F6righet: "},
+ {"Principal.Type.", "Identitetshavaretyp:"},
+ {"Principal.Name.", "Identitetshavare:"},
+ {"Target.Name.",
+ "M\u00E5l: "},
+ {"Actions.",
+ "Funktioner: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "Ska den befintliga filen {0} skrivas \u00F6ver?"},
+ {"Cancel", "Avbryt"},
+ {"CodeBase.", "Kodbas:"},
+ {"SignedBy.", "Signerad av:"},
+ {"Add.Principal", "L\u00E4gg till identitetshavare"},
+ {"Edit.Principal", "Redigera identitetshavare"},
+ {"Remove.Principal", "Ta bort identitetshavare"},
+ {"Principals.", "Identitetshavare:"},
+ {".Add.Permission", " L\u00E4gg till beh\u00F6righet"},
+ {".Edit.Permission", " Redigera beh\u00F6righet"},
+ {"Remove.Permission", "Ta bort beh\u00F6righet"},
+ {"Done", "Utf\u00F6rd"},
+ {"KeyStore.URL.", "URL f\u00F6r nyckellager:"},
+ {"KeyStore.Type.", "Nyckellagertyp:"},
+ {"KeyStore.Provider.", "Nyckellagerleverant\u00F6r:"},
+ {"KeyStore.Password.URL.", "URL f\u00F6r l\u00F6senord till nyckellager:"},
+ {"Principals", "Identitetshavare"},
+ {".Edit.Principal.", " Redigera identitetshavare:"},
+ {".Add.New.Principal.", " L\u00E4gg till ny identitetshavare:"},
+ {"Permissions", "Beh\u00F6righet"},
+ {".Edit.Permission.", " Redigera beh\u00F6righet:"},
+ {".Add.New.Permission.", " L\u00E4gg till ny beh\u00F6righet:"},
+ {"Signed.By.", "Signerad av:"},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "Kan inte specificera identitetshavare med jokerteckenklass utan jokerteckennamn"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "Kan inte specificera identitetshavare utan namn"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"},
+ {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"},
+ {"Overwrite.File", "Skriv \u00F6ver fil"},
+ {"Policy.successfully.written.to.filename",
+ "Policy har skrivits till {0}"},
+ {"null.filename", "nullfilnamn"},
+ {"Save.changes.", "Vill du spara \u00E4ndringarna?"},
+ {"Yes", "Ja"},
+ {"No", "Nej"},
+ {"Policy.Entry", "Policyfel"},
+ {"Save.Changes", "Spara \u00E4ndringar"},
+ {"No.Policy.Entry.selected", "Ingen policypost har valts"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "Kan inte \u00F6ppna nyckellagret: {0}"},
+ {"No.principal.selected", "Ingen identitetshavare har valts"},
+ {"No.permission.selected", "Ingen beh\u00F6righet har valts"},
+ {"name", "namn"},
+ {"configuration.type", "konfigurationstyp"},
+ {"environment.variable.name", "variabelnamn f\u00F6r milj\u00F6"},
+ {"library.name", "biblioteksnamn"},
+ {"package.name", "paketnamn"},
+ {"policy.type", "policytyp"},
+ {"property.name", "egenskapsnamn"},
+ {"provider.name", "leverant\u00F6rsnamn"},
+ {"Principal.List", "Lista \u00F6ver identitetshavare"},
+ {"Permission.List", "Beh\u00F6righetslista"},
+ {"Code.Base", "Kodbas"},
+ {"KeyStore.U.R.L.", "URL f\u00F6r nyckellager:"},
+ {"KeyStore.Password.U.R.L.", "URL f\u00F6r l\u00F6senord till nyckellager:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
new file mode 100644
index 0000000..fcf8e12
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_zh_CN extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "\u8B66\u544A: \u522B\u540D {0} \u7684\u516C\u5171\u5BC6\u94A5\u4E0D\u5B58\u5728\u3002\u8BF7\u786E\u4FDD\u5DF2\u6B63\u786E\u914D\u7F6E KeyStore\u3002"},
+ {"Warning.Class.not.found.class", "\u8B66\u544A: \u627E\u4E0D\u5230\u7C7B: {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "\u8B66\u544A: \u6784\u9020\u5668\u7684\u53C2\u6570\u65E0\u6548: {0}"},
+ {"Illegal.Principal.Type.type", "\u975E\u6CD5\u7684\u4E3B\u7528\u6237\u7C7B\u578B: {0}"},
+ {"Illegal.option.option", "\u975E\u6CD5\u9009\u9879: {0}"},
+ {"Usage.policytool.options.", "\u7528\u6CD5: policytool [\u9009\u9879]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] \u7B56\u7565\u6587\u4EF6\u4F4D\u7F6E"},
+ {"New", "\u65B0\u5EFA"},
+ {"Open", "\u6253\u5F00"},
+ {"Save", "\u4FDD\u5B58"},
+ {"Save.As", "\u53E6\u5B58\u4E3A"},
+ {"View.Warning.Log", "\u67E5\u770B\u8B66\u544A\u65E5\u5FD7"},
+ {"Exit", "\u9000\u51FA"},
+ {"Add.Policy.Entry", "\u6DFB\u52A0\u7B56\u7565\u6761\u76EE"},
+ {"Edit.Policy.Entry", "\u7F16\u8F91\u7B56\u7565\u6761\u76EE"},
+ {"Remove.Policy.Entry", "\u5220\u9664\u7B56\u7565\u6761\u76EE"},
+ {"Edit", "\u7F16\u8F91"},
+ {"Retain", "\u4FDD\u7559"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "\u8B66\u544A: \u6587\u4EF6\u540D\u5305\u542B\u8F6C\u4E49\u7684\u53CD\u659C\u6760\u5B57\u7B26\u3002\u4E0D\u9700\u8981\u5BF9\u53CD\u659C\u6760\u5B57\u7B26\u8FDB\u884C\u8F6C\u4E49 (\u8BE5\u5DE5\u5177\u5728\u5C06\u7B56\u7565\u5185\u5BB9\u5199\u5165\u6C38\u4E45\u5B58\u50A8\u65F6\u4F1A\u6839\u636E\u9700\u8981\u5BF9\u5B57\u7B26\u8FDB\u884C\u8F6C\u4E49)\u3002\n\n\u5355\u51FB\u201C\u4FDD\u7559\u201D\u53EF\u4FDD\u7559\u8F93\u5165\u7684\u540D\u79F0, \u6216\u8005\u5355\u51FB\u201C\u7F16\u8F91\u201D\u53EF\u7F16\u8F91\u8BE5\u540D\u79F0\u3002"},
+
+ {"Add.Public.Key.Alias", "\u6DFB\u52A0\u516C\u5171\u5BC6\u94A5\u522B\u540D"},
+ {"Remove.Public.Key.Alias", "\u5220\u9664\u516C\u5171\u5BC6\u94A5\u522B\u540D"},
+ {"File", "\u6587\u4EF6"},
+ {"KeyStore", "KeyStore"},
+ {"Policy.File.", "\u7B56\u7565\u6587\u4EF6:"},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "\u65E0\u6CD5\u6253\u5F00\u7B56\u7565\u6587\u4EF6: {0}: {1}"},
+ {"Policy.Tool", "\u7B56\u7565\u5DE5\u5177"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "\u6253\u5F00\u7B56\u7565\u914D\u7F6E\u65F6\u51FA\u9519\u3002\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u67E5\u770B\u8B66\u544A\u65E5\u5FD7\u3002"},
+ {"Error", "\u9519\u8BEF"},
+ {"OK", "\u786E\u5B9A"},
+ {"Status", "\u72B6\u6001"},
+ {"Warning", "\u8B66\u544A"},
+ {"Permission.",
+ "\u6743\u9650: "},
+ {"Principal.Type.", "\u4E3B\u7528\u6237\u7C7B\u578B:"},
+ {"Principal.Name.", "\u4E3B\u7528\u6237\u540D\u79F0:"},
+ {"Target.Name.",
+ "\u76EE\u6807\u540D\u79F0: "},
+ {"Actions.",
+ "\u64CD\u4F5C: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\u786E\u8BA4\u8986\u76D6\u73B0\u6709\u7684\u6587\u4EF6{0}?"},
+ {"Cancel", "\u53D6\u6D88"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "\u6DFB\u52A0\u4E3B\u7528\u6237"},
+ {"Edit.Principal", "\u7F16\u8F91\u4E3B\u7528\u6237"},
+ {"Remove.Principal", "\u5220\u9664\u4E3B\u7528\u6237"},
+ {"Principals.", "\u4E3B\u7528\u6237:"},
+ {".Add.Permission", " \u6DFB\u52A0\u6743\u9650"},
+ {".Edit.Permission", " \u7F16\u8F91\u6743\u9650"},
+ {"Remove.Permission", "\u5220\u9664\u6743\u9650"},
+ {"Done", "\u5B8C\u6210"},
+ {"KeyStore.URL.", "KeyStore URL:"},
+ {"KeyStore.Type.", "KeyStore \u7C7B\u578B:"},
+ {"KeyStore.Provider.", "KeyStore \u63D0\u4F9B\u65B9:"},
+ {"KeyStore.Password.URL.", "KeyStore \u53E3\u4EE4 URL:"},
+ {"Principals", "\u4E3B\u7528\u6237"},
+ {".Edit.Principal.", " \u7F16\u8F91\u4E3B\u7528\u6237:"},
+ {".Add.New.Principal.", " \u6DFB\u52A0\u65B0\u4E3B\u7528\u6237:"},
+ {"Permissions", "\u6743\u9650"},
+ {".Edit.Permission.", " \u7F16\u8F91\u6743\u9650:"},
+ {".Add.New.Permission.", " \u52A0\u5165\u65B0\u7684\u6743\u9650:"},
+ {"Signed.By.", "\u7B7E\u7F72\u4EBA: "},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "\u6CA1\u6709\u540D\u79F0, \u65E0\u6CD5\u6307\u5B9A\u4E3B\u7528\u6237"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "\u6743\u9650\u53CA\u76EE\u6807\u540D\u5FC5\u987B\u6709\u4E00\u4E2A\u503C"},
+ {"Remove.this.Policy.Entry.", "\u662F\u5426\u5220\u9664\u6B64\u7B56\u7565\u6761\u76EE?"},
+ {"Overwrite.File", "\u8986\u76D6\u6587\u4EF6"},
+ {"Policy.successfully.written.to.filename",
+ "\u7B56\u7565\u5DF2\u6210\u529F\u5199\u5165\u5230{0}"},
+ {"null.filename", "\u7A7A\u6587\u4EF6\u540D"},
+ {"Save.changes.", "\u662F\u5426\u4FDD\u5B58\u6240\u505A\u7684\u66F4\u6539?"},
+ {"Yes", "\u662F"},
+ {"No", "\u5426"},
+ {"Policy.Entry", "\u7B56\u7565\u6761\u76EE"},
+ {"Save.Changes", "\u4FDD\u5B58\u66F4\u6539"},
+ {"No.Policy.Entry.selected", "\u6CA1\u6709\u9009\u62E9\u7B56\u7565\u6761\u76EE"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "\u65E0\u6CD5\u6253\u5F00 KeyStore: {0}"},
+ {"No.principal.selected", "\u672A\u9009\u62E9\u4E3B\u7528\u6237"},
+ {"No.permission.selected", "\u6CA1\u6709\u9009\u62E9\u6743\u9650"},
+ {"name", "\u540D\u79F0"},
+ {"configuration.type", "\u914D\u7F6E\u7C7B\u578B"},
+ {"environment.variable.name", "\u73AF\u5883\u53D8\u91CF\u540D"},
+ {"library.name", "\u5E93\u540D\u79F0"},
+ {"package.name", "\u7A0B\u5E8F\u5305\u540D\u79F0"},
+ {"policy.type", "\u7B56\u7565\u7C7B\u578B"},
+ {"property.name", "\u5C5E\u6027\u540D\u79F0"},
+ {"provider.name", "\u63D0\u4F9B\u65B9\u540D\u79F0"},
+ {"Principal.List", "\u4E3B\u7528\u6237\u5217\u8868"},
+ {"Permission.List", "\u6743\u9650\u5217\u8868"},
+ {"Code.Base", "\u4EE3\u7801\u5E93"},
+ {"KeyStore.U.R.L.", "KeyStore URL:"},
+ {"KeyStore.Password.U.R.L.", "KeyStore \u53E3\u4EE4 URL:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
new file mode 100644
index 0000000..a67441a
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_zh_HK extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "\u8B66\u544A: \u5225\u540D {0} \u7684\u516C\u958B\u91D1\u9470\u4E0D\u5B58\u5728\u3002\u8ACB\u78BA\u5B9A\u91D1\u9470\u5132\u5B58\u5EAB\u914D\u7F6E\u6B63\u78BA\u3002"},
+ {"Warning.Class.not.found.class", "\u8B66\u544A: \u627E\u4E0D\u5230\u985E\u5225 {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "\u8B66\u544A: \u7121\u6548\u7684\u5EFA\u69CB\u5B50\u5F15\u6578: {0}"},
+ {"Illegal.Principal.Type.type", "\u7121\u6548\u7684 Principal \u985E\u578B: {0}"},
+ {"Illegal.option.option", "\u7121\u6548\u7684\u9078\u9805: {0}"},
+ {"Usage.policytool.options.", "\u7528\u6CD5: policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] \u539F\u5247\u6A94\u6848\u4F4D\u7F6E"},
+ {"New", "\u65B0\u589E"},
+ {"Open", "\u958B\u555F"},
+ {"Save", "\u5132\u5B58"},
+ {"Save.As", "\u53E6\u5B58\u65B0\u6A94"},
+ {"View.Warning.Log", "\u6AA2\u8996\u8B66\u544A\u8A18\u9304"},
+ {"Exit", "\u7D50\u675F"},
+ {"Add.Policy.Entry", "\u65B0\u589E\u539F\u5247\u9805\u76EE"},
+ {"Edit.Policy.Entry", "\u7DE8\u8F2F\u539F\u5247\u9805\u76EE"},
+ {"Remove.Policy.Entry", "\u79FB\u9664\u539F\u5247\u9805\u76EE"},
+ {"Edit", "\u7DE8\u8F2F"},
+ {"Retain", "\u4FDD\u7559"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "\u8B66\u544A: \u6A94\u6848\u540D\u7A31\u5305\u542B\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143\u3002\u4E0D\u9700\u8981\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143 (\u64B0\u5BEB\u539F\u5247\u5167\u5BB9\u81F3\u6C38\u4E45\u5B58\u653E\u5340\u6642\u9700\u8981\u5DE5\u5177\u9041\u96E2\u5B57\u5143)\u3002\n\n\u6309\u4E00\u4E0B\u300C\u4FDD\u7559\u300D\u4EE5\u4FDD\u7559\u8F38\u5165\u7684\u540D\u7A31\uFF0C\u6216\u6309\u4E00\u4E0B\u300C\u7DE8\u8F2F\u300D\u4EE5\u7DE8\u8F2F\u540D\u7A31\u3002"},
+
+ {"Add.Public.Key.Alias", "\u65B0\u589E\u516C\u958B\u91D1\u9470\u5225\u540D"},
+ {"Remove.Public.Key.Alias", "\u79FB\u9664\u516C\u958B\u91D1\u9470\u5225\u540D"},
+ {"File", "\u6A94\u6848"},
+ {"KeyStore", "\u91D1\u9470\u5132\u5B58\u5EAB"},
+ {"Policy.File.", "\u539F\u5247\u6A94\u6848: "},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "\u7121\u6CD5\u958B\u555F\u539F\u5247\u6A94\u6848: {0}: {1}"},
+ {"Policy.Tool", "\u539F\u5247\u5DE5\u5177"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "\u958B\u555F\u539F\u5247\u8A18\u7F6E\u6642\u767C\u751F\u932F\u8AA4\u3002\u8ACB\u6AA2\u8996\u8B66\u544A\u8A18\u9304\u4EE5\u53D6\u5F97\u66F4\u591A\u7684\u8CC7\u8A0A"},
+ {"Error", "\u932F\u8AA4"},
+ {"OK", "\u78BA\u5B9A"},
+ {"Status", "\u72C0\u614B"},
+ {"Warning", "\u8B66\u544A"},
+ {"Permission.",
+ "\u6B0A\u9650: "},
+ {"Principal.Type.", "Principal \u985E\u578B: "},
+ {"Principal.Name.", "Principal \u540D\u7A31: "},
+ {"Target.Name.",
+ "\u76EE\u6A19\u540D\u7A31: "},
+ {"Actions.",
+ "\u52D5\u4F5C: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\u78BA\u8A8D\u8986\u5BEB\u73FE\u5B58\u7684\u6A94\u6848 {0}\uFF1F"},
+ {"Cancel", "\u53D6\u6D88"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "\u65B0\u589E Principal"},
+ {"Edit.Principal", "\u7DE8\u8F2F Principal"},
+ {"Remove.Principal", "\u79FB\u9664 Principal"},
+ {"Principals.", "Principal:"},
+ {".Add.Permission", " \u65B0\u589E\u6B0A\u9650"},
+ {".Edit.Permission", " \u7DE8\u8F2F\u6B0A\u9650"},
+ {"Remove.Permission", "\u79FB\u9664\u6B0A\u9650"},
+ {"Done", "\u5B8C\u6210"},
+ {"KeyStore.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB URL: "},
+ {"KeyStore.Type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B:"},
+ {"KeyStore.Provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005:"},
+ {"KeyStore.Password.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL: "},
+ {"Principals", "Principal"},
+ {".Edit.Principal.", " \u7DE8\u8F2F Principal: "},
+ {".Add.New.Principal.", " \u65B0\u589E Principal: "},
+ {"Permissions", "\u6B0A\u9650"},
+ {".Edit.Permission.", " \u7DE8\u8F2F\u6B0A\u9650:"},
+ {".Add.New.Permission.", " \u65B0\u589E\u6B0A\u9650:"},
+ {"Signed.By.", "\u7C3D\u7F72\u4EBA: "},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "\u6C92\u6709\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A Principal"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "\u6B0A\u9650\u53CA\u76EE\u6A19\u540D\u7A31\u5FC5\u9808\u6709\u4E00\u500B\u503C\u3002"},
+ {"Remove.this.Policy.Entry.", "\u79FB\u9664\u9019\u500B\u539F\u5247\u9805\u76EE\uFF1F"},
+ {"Overwrite.File", "\u8986\u5BEB\u6A94\u6848"},
+ {"Policy.successfully.written.to.filename",
+ "\u539F\u5247\u6210\u529F\u5BEB\u5165\u81F3 {0}"},
+ {"null.filename", "\u7A7A\u503C\u6A94\u540D"},
+ {"Save.changes.", "\u5132\u5B58\u8B8A\u66F4\uFF1F"},
+ {"Yes", "\u662F"},
+ {"No", "\u5426"},
+ {"Policy.Entry", "\u539F\u5247\u9805\u76EE"},
+ {"Save.Changes", "\u5132\u5B58\u8B8A\u66F4"},
+ {"No.Policy.Entry.selected", "\u6C92\u6709\u9078\u53D6\u539F\u5247\u9805\u76EE"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "\u7121\u6CD5\u958B\u555F\u91D1\u9470\u5132\u5B58\u5EAB: {0}"},
+ {"No.principal.selected", "\u672A\u9078\u53D6 Principal"},
+ {"No.permission.selected", "\u6C92\u6709\u9078\u53D6\u6B0A\u9650"},
+ {"name", "\u540D\u7A31"},
+ {"configuration.type", "\u7D44\u614B\u985E\u578B"},
+ {"environment.variable.name", "\u74B0\u5883\u8B8A\u6578\u540D\u7A31"},
+ {"library.name", "\u7A0B\u5F0F\u5EAB\u540D\u7A31"},
+ {"package.name", "\u5957\u88DD\u7A0B\u5F0F\u540D\u7A31"},
+ {"policy.type", "\u539F\u5247\u985E\u578B"},
+ {"property.name", "\u5C6C\u6027\u540D\u7A31"},
+ {"provider.name", "\u63D0\u4F9B\u8005\u540D\u7A31"},
+ {"Principal.List", "Principal \u6E05\u55AE"},
+ {"Permission.List", "\u6B0A\u9650\u6E05\u55AE"},
+ {"Code.Base", "\u4EE3\u78BC\u57FA\u6E96"},
+ {"KeyStore.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB URL:"},
+ {"KeyStore.Password.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
new file mode 100644
index 0000000..1c241a6
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2000, 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.
+ */
+
+package sun.security.tools.policytool;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the policytool.
+ *
+ */
+public class Resources_zh_TW extends java.util.ListResourceBundle {
+
+ private static final Object[][] contents = {
+ {"NEWLINE", "\n"},
+ {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
+ "\u8B66\u544A: \u5225\u540D {0} \u7684\u516C\u958B\u91D1\u9470\u4E0D\u5B58\u5728\u3002\u8ACB\u78BA\u5B9A\u91D1\u9470\u5132\u5B58\u5EAB\u914D\u7F6E\u6B63\u78BA\u3002"},
+ {"Warning.Class.not.found.class", "\u8B66\u544A: \u627E\u4E0D\u5230\u985E\u5225 {0}"},
+ {"Warning.Invalid.argument.s.for.constructor.arg",
+ "\u8B66\u544A: \u7121\u6548\u7684\u5EFA\u69CB\u5B50\u5F15\u6578: {0}"},
+ {"Illegal.Principal.Type.type", "\u7121\u6548\u7684 Principal \u985E\u578B: {0}"},
+ {"Illegal.option.option", "\u7121\u6548\u7684\u9078\u9805: {0}"},
+ {"Usage.policytool.options.", "\u7528\u6CD5: policytool [options]"},
+ {".file.file.policy.file.location",
+ " [-file <file>] \u539F\u5247\u6A94\u6848\u4F4D\u7F6E"},
+ {"New", "\u65B0\u589E"},
+ {"Open", "\u958B\u555F"},
+ {"Save", "\u5132\u5B58"},
+ {"Save.As", "\u53E6\u5B58\u65B0\u6A94"},
+ {"View.Warning.Log", "\u6AA2\u8996\u8B66\u544A\u8A18\u9304"},
+ {"Exit", "\u7D50\u675F"},
+ {"Add.Policy.Entry", "\u65B0\u589E\u539F\u5247\u9805\u76EE"},
+ {"Edit.Policy.Entry", "\u7DE8\u8F2F\u539F\u5247\u9805\u76EE"},
+ {"Remove.Policy.Entry", "\u79FB\u9664\u539F\u5247\u9805\u76EE"},
+ {"Edit", "\u7DE8\u8F2F"},
+ {"Retain", "\u4FDD\u7559"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+ "\u8B66\u544A: \u6A94\u6848\u540D\u7A31\u5305\u542B\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143\u3002\u4E0D\u9700\u8981\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143 (\u64B0\u5BEB\u539F\u5247\u5167\u5BB9\u81F3\u6C38\u4E45\u5B58\u653E\u5340\u6642\u9700\u8981\u5DE5\u5177\u9041\u96E2\u5B57\u5143)\u3002\n\n\u6309\u4E00\u4E0B\u300C\u4FDD\u7559\u300D\u4EE5\u4FDD\u7559\u8F38\u5165\u7684\u540D\u7A31\uFF0C\u6216\u6309\u4E00\u4E0B\u300C\u7DE8\u8F2F\u300D\u4EE5\u7DE8\u8F2F\u540D\u7A31\u3002"},
+
+ {"Add.Public.Key.Alias", "\u65B0\u589E\u516C\u958B\u91D1\u9470\u5225\u540D"},
+ {"Remove.Public.Key.Alias", "\u79FB\u9664\u516C\u958B\u91D1\u9470\u5225\u540D"},
+ {"File", "\u6A94\u6848"},
+ {"KeyStore", "\u91D1\u9470\u5132\u5B58\u5EAB"},
+ {"Policy.File.", "\u539F\u5247\u6A94\u6848: "},
+ {"Could.not.open.policy.file.policyFile.e.toString.",
+ "\u7121\u6CD5\u958B\u555F\u539F\u5247\u6A94\u6848: {0}: {1}"},
+ {"Policy.Tool", "\u539F\u5247\u5DE5\u5177"},
+ {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
+ "\u958B\u555F\u539F\u5247\u8A18\u7F6E\u6642\u767C\u751F\u932F\u8AA4\u3002\u8ACB\u6AA2\u8996\u8B66\u544A\u8A18\u9304\u4EE5\u53D6\u5F97\u66F4\u591A\u7684\u8CC7\u8A0A"},
+ {"Error", "\u932F\u8AA4"},
+ {"OK", "\u78BA\u5B9A"},
+ {"Status", "\u72C0\u614B"},
+ {"Warning", "\u8B66\u544A"},
+ {"Permission.",
+ "\u6B0A\u9650: "},
+ {"Principal.Type.", "Principal \u985E\u578B: "},
+ {"Principal.Name.", "Principal \u540D\u7A31: "},
+ {"Target.Name.",
+ "\u76EE\u6A19\u540D\u7A31: "},
+ {"Actions.",
+ "\u52D5\u4F5C: "},
+ {"OK.to.overwrite.existing.file.filename.",
+ "\u78BA\u8A8D\u8986\u5BEB\u73FE\u5B58\u7684\u6A94\u6848 {0}\uFF1F"},
+ {"Cancel", "\u53D6\u6D88"},
+ {"CodeBase.", "CodeBase:"},
+ {"SignedBy.", "SignedBy:"},
+ {"Add.Principal", "\u65B0\u589E Principal"},
+ {"Edit.Principal", "\u7DE8\u8F2F Principal"},
+ {"Remove.Principal", "\u79FB\u9664 Principal"},
+ {"Principals.", "Principal:"},
+ {".Add.Permission", " \u65B0\u589E\u6B0A\u9650"},
+ {".Edit.Permission", " \u7DE8\u8F2F\u6B0A\u9650"},
+ {"Remove.Permission", "\u79FB\u9664\u6B0A\u9650"},
+ {"Done", "\u5B8C\u6210"},
+ {"KeyStore.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB URL: "},
+ {"KeyStore.Type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B:"},
+ {"KeyStore.Provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005:"},
+ {"KeyStore.Password.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL: "},
+ {"Principals", "Principal"},
+ {".Edit.Principal.", " \u7DE8\u8F2F Principal: "},
+ {".Add.New.Principal.", " \u65B0\u589E Principal: "},
+ {"Permissions", "\u6B0A\u9650"},
+ {".Edit.Permission.", " \u7DE8\u8F2F\u6B0A\u9650:"},
+ {".Add.New.Permission.", " \u65B0\u589E\u6B0A\u9650:"},
+ {"Signed.By.", "\u7C3D\u7F72\u4EBA: "},
+ {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
+ "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
+ {"Cannot.Specify.Principal.without.a.Name",
+ "\u6C92\u6709\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A Principal"},
+ {"Permission.and.Target.Name.must.have.a.value",
+ "\u6B0A\u9650\u53CA\u76EE\u6A19\u540D\u7A31\u5FC5\u9808\u6709\u4E00\u500B\u503C\u3002"},
+ {"Remove.this.Policy.Entry.", "\u79FB\u9664\u9019\u500B\u539F\u5247\u9805\u76EE\uFF1F"},
+ {"Overwrite.File", "\u8986\u5BEB\u6A94\u6848"},
+ {"Policy.successfully.written.to.filename",
+ "\u539F\u5247\u6210\u529F\u5BEB\u5165\u81F3 {0}"},
+ {"null.filename", "\u7A7A\u503C\u6A94\u540D"},
+ {"Save.changes.", "\u5132\u5B58\u8B8A\u66F4\uFF1F"},
+ {"Yes", "\u662F"},
+ {"No", "\u5426"},
+ {"Policy.Entry", "\u539F\u5247\u9805\u76EE"},
+ {"Save.Changes", "\u5132\u5B58\u8B8A\u66F4"},
+ {"No.Policy.Entry.selected", "\u6C92\u6709\u9078\u53D6\u539F\u5247\u9805\u76EE"},
+ {"Unable.to.open.KeyStore.ex.toString.",
+ "\u7121\u6CD5\u958B\u555F\u91D1\u9470\u5132\u5B58\u5EAB: {0}"},
+ {"No.principal.selected", "\u672A\u9078\u53D6 Principal"},
+ {"No.permission.selected", "\u6C92\u6709\u9078\u53D6\u6B0A\u9650"},
+ {"name", "\u540D\u7A31"},
+ {"configuration.type", "\u7D44\u614B\u985E\u578B"},
+ {"environment.variable.name", "\u74B0\u5883\u8B8A\u6578\u540D\u7A31"},
+ {"library.name", "\u7A0B\u5F0F\u5EAB\u540D\u7A31"},
+ {"package.name", "\u5957\u88DD\u7A0B\u5F0F\u540D\u7A31"},
+ {"policy.type", "\u539F\u5247\u985E\u578B"},
+ {"property.name", "\u5C6C\u6027\u540D\u7A31"},
+ {"provider.name", "\u63D0\u4F9B\u8005\u540D\u7A31"},
+ {"Principal.List", "Principal \u6E05\u55AE"},
+ {"Permission.List", "\u6B0A\u9650\u6E05\u55AE"},
+ {"Code.Base", "\u4EE3\u78BC\u57FA\u6E96"},
+ {"KeyStore.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB URL:"},
+ {"KeyStore.Password.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL:"}
+ };
+
+
+ /**
+ * Returns the contents of this <code>ResourceBundle</code>.
+ *
+ * <p>
+ *
+ * @return the contents of this <code>ResourceBundle</code>.
+ */
+ @Override
+ public Object[][] getContents() {
+ return contents;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/util/Resources.java b/jdk/src/share/classes/sun/security/util/Resources.java
index a7ba9e2e..ef073b0 100644
--- a/jdk/src/share/classes/sun/security/util/Resources.java
+++ b/jdk/src/share/classes/sun/security/util/Resources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,513 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
- {".OPTION.", " [OPTION]..."},
- {"Options.", "Options:"},
- {"Use.keytool.help.for.all.available.commands",
- "Use \"keytool -help\" for all available commands"},
- {"Key.and.Certificate.Management.Tool",
- "Key and Certificate Management Tool"},
- {"Commands.", "Commands:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "Use \"keytool -command_name -help\" for usage of command_name"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Generates a certificate request"}, //-certreq
- {"Changes.an.entry.s.alias",
- "Changes an entry's alias"}, //-changealias
- {"Deletes.an.entry",
- "Deletes an entry"}, //-delete
- {"Exports.certificate",
- "Exports certificate"}, //-exportcert
- {"Generates.a.key.pair",
- "Generates a key pair"}, //-genkeypair
- {"Generates.a.secret.key",
- "Generates a secret key"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Generates certificate from a certificate request"}, //-gencert
- {"Generates.CRL", "Generates CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Imports entries from a JDK 1.1.x-style identity database"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Imports a certificate or a certificate chain"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Imports one or all entries from another keystore"}, //-importkeystore
- {"Clones.a.key.entry",
- "Clones a key entry"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "Changes the key password of an entry"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Lists entries in a keystore"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Prints the content of a certificate"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Prints the content of a certificate request"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Prints the content of a CRL file"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Generates a self-signed certificate"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "Changes the store password of a keystore"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "alias name of the entry to process"}, //-alias
- {"destination.alias",
- "destination alias"}, //-destalias
- {"destination.key.password",
- "destination key password"}, //-destkeypass
- {"destination.keystore.name",
- "destination keystore name"}, //-destkeystore
- {"destination.keystore.password.protected",
- "destination keystore password protected"}, //-destprotected
- {"destination.keystore.provider.name",
- "destination keystore provider name"}, //-destprovidername
- {"destination.keystore.password",
- "destination keystore password"}, //-deststorepass
- {"destination.keystore.type",
- "destination keystore type"}, //-deststoretype
- {"distinguished.name",
- "distinguished name"}, //-dname
- {"X.509.extension",
- "X.509 extension"}, //-ext
- {"output.file.name",
- "output file name"}, //-file and -outfile
- {"input.file.name",
- "input file name"}, //-file and -infile
- {"key.algorithm.name",
- "key algorithm name"}, //-keyalg
- {"key.password",
- "key password"}, //-keypass
- {"key.bit.size",
- "key bit size"}, //-keysize
- {"keystore.name",
- "keystore name"}, //-keystore
- {"new.password",
- "new password"}, //-new
- {"do.not.prompt",
- "do not prompt"}, //-noprompt
- {"password.through.protected.mechanism",
- "password through protected mechanism"}, //-protected
- {"provider.argument",
- "provider argument"}, //-providerarg
- {"provider.class.name",
- "provider class name"}, //-providerclass
- {"provider.name",
- "provider name"}, //-providername
- {"provider.classpath",
- "provider classpath"}, //-providerpath
- {"output.in.RFC.style",
- "output in RFC style"}, //-rfc
- {"signature.algorithm.name",
- "signature algorithm name"}, //-sigalg
- {"source.alias",
- "source alias"}, //-srcalias
- {"source.key.password",
- "source key password"}, //-srckeypass
- {"source.keystore.name",
- "source keystore name"}, //-srckeystore
- {"source.keystore.password.protected",
- "source keystore password protected"}, //-srcprotected
- {"source.keystore.provider.name",
- "source keystore provider name"}, //-srcprovidername
- {"source.keystore.password",
- "source keystore password"}, //-srcstorepass
- {"source.keystore.type",
- "source keystore type"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL server host and port"}, //-sslserver
- {"signed.jar.file",
- "signed jar file"}, //=jarfile
- {"certificate.validity.start.date.time",
- "certificate validity start date/time"}, //-startdate
- {"keystore.password",
- "keystore password"}, //-storepass
- {"keystore.type",
- "keystore type"}, //-storetype
- {"trust.certificates.from.cacerts",
- "trust certificates from cacerts"}, //-trustcacerts
- {"verbose.output",
- "verbose output"}, //-v
- {"validity.number.of.days",
- "validity number of days"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "Serial ID of cert to revoke"}, //-id
- // keytool: Running part
- {"keytool.error.", "keytool error: "},
- {"Illegal.option.", "Illegal option: "},
- {"Illegal.value.", "Illegal value: "},
- {"Unknown.password.type.", "Unknown password type: "},
- {"Cannot.find.environment.variable.",
- "Cannot find environment variable: "},
- {"Cannot.find.file.", "Cannot find file: "},
- {"Command.option.flag.needs.an.argument.", "Command option {0} needs an argument."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Warning: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified {0} value."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore must be NONE if -storetype is {0}"},
- {"Too.many.retries.program.terminated",
- "Too many retries, program terminated"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "-storepasswd and -keypasswd commands not supported if -storetype is {0}"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "-keypasswd commands not supported if -storetype is PKCS12"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-keypass and -new can not be specified if -storetype is {0}"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "if -protected is specified, then -storepass, -keypass, and -new must not be specified"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "if -srcprotected is specified, then -srcstorepass and -srckeypass must not be specified"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "if keystore is not password protected, then -storepass, -keypass, and -new must not be specified"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "if source keystore is not password protected, then -srcstorepass and -srckeypass must not be specified"},
- {"Illegal.startdate.value", "Illegal startdate value"},
- {"Validity.must.be.greater.than.zero",
- "Validity must be greater than zero"},
- {"provName.not.a.provider", "{0} not a provider"},
- {"Usage.error.no.command.provided", "Usage error: no command provided"},
- {"Source.keystore.file.exists.but.is.empty.", "Source keystore file exists, but is empty: "},
- {"Please.specify.srckeystore", "Please specify -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "Must not specify both -v and -rfc with 'list' command"},
- {"Key.password.must.be.at.least.6.characters",
- "Key password must be at least 6 characters"},
- {"New.password.must.be.at.least.6.characters",
- "New password must be at least 6 characters"},
- {"Keystore.file.exists.but.is.empty.",
- "Keystore file exists, but is empty: "},
- {"Keystore.file.does.not.exist.",
- "Keystore file does not exist: "},
- {"Must.specify.destination.alias", "Must specify destination alias"},
- {"Must.specify.alias", "Must specify alias"},
- {"Keystore.password.must.be.at.least.6.characters",
- "Keystore password must be at least 6 characters"},
- {"Enter.keystore.password.", "Enter keystore password: "},
- {"Enter.source.keystore.password.", "Enter source keystore password: "},
- {"Enter.destination.keystore.password.", "Enter destination keystore password: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "Keystore password is too short - must be at least 6 characters"},
- {"Unknown.Entry.Type", "Unknown Entry Type"},
- {"Too.many.failures.Alias.not.changed", "Too many failures. Alias not changed"},
- {"Entry.for.alias.alias.successfully.imported.",
- "Entry for alias {0} successfully imported."},
- {"Entry.for.alias.alias.not.imported.", "Entry for alias {0} not imported."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Problem importing entry for alias {0}: {1}.\nEntry for alias {0} not imported."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Import command completed: {0} entries successfully imported, {1} entries failed or cancelled"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Warning: Overwriting existing alias {0} in destination keystore"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "Existing entry alias {0} exists, overwrite? [no]: "},
- {"Too.many.failures.try.later", "Too many failures - try later"},
- {"Certification.request.stored.in.file.filename.",
- "Certification request stored in file <{0}>"},
- {"Submit.this.to.your.CA", "Submit this to your CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "if alias not specified, destalias, srckeypass, and destkeypass must not be specified"},
- {"Certificate.stored.in.file.filename.",
- "Certificate stored in file <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "Certificate reply was installed in keystore"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "Certificate reply was not installed in keystore"},
- {"Certificate.was.added.to.keystore",
- "Certificate was added to keystore"},
- {"Certificate.was.not.added.to.keystore",
- "Certificate was not added to keystore"},
- {".Storing.ksfname.", "[Storing {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} has no public key (certificate)"},
- {"Cannot.derive.signature.algorithm",
- "Cannot derive signature algorithm"},
- {"Alias.alias.does.not.exist",
- "Alias <{0}> does not exist"},
- {"Alias.alias.has.no.certificate",
- "Alias <{0}> has no certificate"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Key pair not generated, alias <{0}> already exists"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Generating {0} bit {1} key pair and self-signed certificate ({2}) with a validity of {3} days\n\tfor: {4}"},
- {"Enter.key.password.for.alias.", "Enter key password for <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(RETURN if same as keystore password): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "Key password is too short - must be at least 6 characters"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Too many failures - key not added to keystore"},
- {"Destination.alias.dest.already.exists",
- "Destination alias <{0}> already exists"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "Password is too short - must be at least 6 characters"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Too many failures. Key entry not cloned"},
- {"key.password.for.alias.", "key password for <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "Keystore entry for <{0}> already exists"},
- {"Creating.keystore.entry.for.id.getName.",
- "Creating keystore entry for <{0}> ..."},
- {"No.entries.from.identity.database.added",
- "No entries from identity database added"},
- {"Alias.name.alias", "Alias name: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Creation date: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Entry type: {0}"},
- {"Certificate.chain.length.", "Certificate chain length: "},
- {"Certificate.i.1.", "Certificate[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Certificate fingerprint (SHA1): "},
- {"Keystore.type.", "Keystore type: "},
- {"Keystore.provider.", "Keystore provider: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Your keystore contains {0,number,integer} entry"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Your keystore contains {0,number,integer} entries"},
- {"Failed.to.parse.input", "Failed to parse input"},
- {"Empty.input", "Empty input"},
- {"Not.X.509.certificate", "Not X.509 certificate"},
- {"alias.has.no.public.key", "{0} has no public key"},
- {"alias.has.no.X.509.certificate", "{0} has no X.509 certificate"},
- {"New.certificate.self.signed.", "New certificate (self-signed):"},
- {"Reply.has.no.certificates", "Reply has no certificates"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Certificate not imported, alias <{0}> already exists"},
- {"Input.not.an.X.509.certificate", "Input not an X.509 certificate"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "Certificate already exists in keystore under alias <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "Do you still want to add it? [no]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "Certificate already exists in system-wide CA keystore under alias <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "Do you still want to add it to your own keystore? [no]: "},
- {"Trust.this.certificate.no.", "Trust this certificate? [no]: "},
- {"YES", "YES"},
- {"New.prompt.", "New {0}: "},
- {"Passwords.must.differ", "Passwords must differ"},
- {"Re.enter.new.prompt.", "Re-enter new {0}: "},
- {"Re.enter.new.password.", "Re-enter new password: "},
- {"They.don.t.match.Try.again", "They don't match. Try again"},
- {"Enter.prompt.alias.name.", "Enter {0} alias name: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Enter new alias name\t(RETURN to cancel import for this entry): "},
- {"Enter.alias.name.", "Enter alias name: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(RETURN if same as for <{0}>)"},
- {".PATTERN.printX509Cert",
- "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signature algorithm name: {8}\n\t Version: {9}"},
- {"What.is.your.first.and.last.name.",
- "What is your first and last name?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "What is the name of your organizational unit?"},
- {"What.is.the.name.of.your.organization.",
- "What is the name of your organization?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "What is the name of your City or Locality?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "What is the name of your State or Province?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "What is the two-letter country code for this unit?"},
- {"Is.name.correct.", "Is {0} correct?"},
- {"no", "no"},
- {"yes", "yes"},
- {"y", "y"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "Alias <{0}> has no key"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "Alias <{0}> references an entry type that is not a private key entry. The -keyclone command only supports cloning of private key entries"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** WARNING WARNING WARNING *****************"},
- {"Signer.d.", "Signer #%d:"},
- {"Timestamp.", "Timestamp:"},
- {"Signature.", "Signature:"},
- {"CRLs.", "CRLs:"},
- {"Certificate.owner.", "Certificate owner: "},
- {"Not.a.signed.jar.file", "Not a signed jar file"},
- {"No.certificate.from.the.SSL.server",
- "No certificate from the SSL server"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* The integrity of the information stored in your keystore *\n" +
- "* has NOT been verified! In order to verify its integrity, *\n" +
- "* you must provide your keystore password. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* The integrity of the information stored in the srckeystore*\n" +
- "* has NOT been verified! In order to verify its integrity, *\n" +
- "* you must provide the srckeystore password. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "Certificate reply does not contain public key for <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Incomplete certificate chain in reply"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "Certificate chain in reply does not verify: "},
- {"Top.level.certificate.in.reply.",
- "Top-level certificate in reply:\n"},
- {".is.not.trusted.", "... is not trusted. "},
- {"Install.reply.anyway.no.", "Install reply anyway? [no]: "},
- {"NO", "NO"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "Public keys in reply and keystore don't match"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "Certificate reply and certificate in keystore are identical"},
- {"Failed.to.establish.chain.from.reply",
- "Failed to establish chain from reply"},
- {"n", "n"},
- {"Wrong.answer.try.again", "Wrong answer, try again"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "Secret Key not generated, alias <{0}> already exists"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Please provide -keysize for secret key generation"},
-
- {"verified.by.s.in.s", "Verified by %s in %s"},
- {"warning.not.verified.make.sure.keystore.is.correct",
- "WARNING: not verified. Make sure -keystore is correct."},
-
- {"Extensions.", "Extensions: "},
- {".Empty.value.", "(Empty value)"},
- {"Extension.Request.", "Extension Request:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10 Certificate Request (Version 1.0)\n" +
- "Subject: %s\nPublic Key: %s format %s key\n"},
- {"Unknown.keyUsage.type.", "Unknown keyUsage type: "},
- {"Unknown.extendedkeyUsage.type.", "Unknown extendedkeyUsage type: "},
- {"Unknown.AccessDescription.type.", "Unknown AccessDescription type: "},
- {"Unrecognized.GeneralName.type.", "Unrecognized GeneralName type: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "This extension cannot be marked as critical. "},
- {"Odd.number.of.hex.digits.found.", "Odd number of hex digits found: "},
- {"Unknown.extension.type.", "Unknown extension type: "},
- {"command.{0}.is.ambiguous.", "command {0} is ambiguous:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Warning: A public key for alias {0} does not exist. Make sure a KeyStore is properly configured."},
- {"Warning.Class.not.found.class", "Warning: Class not found: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Warning: Invalid argument(s) for constructor: {0}"},
- {"Illegal.Principal.Type.type", "Illegal Principal Type: {0}"},
- {"Illegal.option.option", "Illegal option: {0}"},
- {"Usage.policytool.options.", "Usage: policytool [options]"},
- {".file.file.policy.file.location",
- " [-file <file>] policy file location"},
- {"New", "New"},
- {"Open", "Open"},
- {"Save", "Save"},
- {"Save.As", "Save As"},
- {"View.Warning.Log", "View Warning Log"},
- {"Exit", "Exit"},
- {"Add.Policy.Entry", "Add Policy Entry"},
- {"Edit.Policy.Entry", "Edit Policy Entry"},
- {"Remove.Policy.Entry", "Remove Policy Entry"},
- {"Edit", "Edit"},
- {"Retain", "Retain"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Warning: File name may include escaped backslash characters. " +
- "It is not necessary to escape backslash characters " +
- "(the tool escapes characters as necessary when writing " +
- "the policy contents to the persistent store).\n\n" +
- "Click on Retain to retain the entered name, or click on " +
- "Edit to edit the name."},
-
- {"Add.Public.Key.Alias", "Add Public Key Alias"},
- {"Remove.Public.Key.Alias", "Remove Public Key Alias"},
- {"File", "File"},
- {"KeyStore", "KeyStore"},
- {"Policy.File.", "Policy File:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "Could not open policy file: {0}: {1}"},
- {"Policy.Tool", "Policy Tool"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Errors have occurred while opening the policy configuration. View the Warning Log for more information."},
- {"Error", "Error"},
- {"OK", "OK"},
- {"Status", "Status"},
- {"Warning", "Warning"},
- {"Permission.",
- "Permission: "},
- {"Principal.Type.", "Principal Type:"},
- {"Principal.Name.", "Principal Name:"},
- {"Target.Name.",
- "Target Name: "},
- {"Actions.",
- "Actions: "},
- {"OK.to.overwrite.existing.file.filename.",
- "OK to overwrite existing file {0}?"},
- {"Cancel", "Cancel"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Add Principal"},
- {"Edit.Principal", "Edit Principal"},
- {"Remove.Principal", "Remove Principal"},
- {"Principals.", "Principals:"},
- {".Add.Permission", " Add Permission"},
- {".Edit.Permission", " Edit Permission"},
- {"Remove.Permission", "Remove Permission"},
- {"Done", "Done"},
- {"KeyStore.URL.", "KeyStore URL:"},
- {"KeyStore.Type.", "KeyStore Type:"},
- {"KeyStore.Provider.", "KeyStore Provider:"},
- {"KeyStore.Password.URL.", "KeyStore Password URL:"},
- {"Principals", "Principals"},
- {".Edit.Principal.", " Edit Principal:"},
- {".Add.New.Principal.", " Add New Principal:"},
- {"Permissions", "Permissions"},
- {".Edit.Permission.", " Edit Permission:"},
- {".Add.New.Permission.", " Add New Permission:"},
- {"Signed.By.", "Signed By:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "Cannot Specify Principal with a Wildcard Class without a Wildcard Name"},
- {"Cannot.Specify.Principal.without.a.Name",
- "Cannot Specify Principal without a Name"},
- {"Permission.and.Target.Name.must.have.a.value",
- "Permission and Target Name must have a value"},
- {"Remove.this.Policy.Entry.", "Remove this Policy Entry?"},
- {"Overwrite.File", "Overwrite File"},
- {"Policy.successfully.written.to.filename",
- "Policy successfully written to {0}"},
- {"null.filename", "null filename"},
- {"Save.changes.", "Save changes?"},
- {"Yes", "Yes"},
- {"No", "No"},
- {"Policy.Entry", "Policy Entry"},
- {"Save.Changes", "Save Changes"},
- {"No.Policy.Entry.selected", "No Policy Entry selected"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "Unable to open KeyStore: {0}"},
- {"No.principal.selected", "No principal selected"},
- {"No.permission.selected", "No permission selected"},
- {"name", "name"},
- {"configuration.type", "configuration type"},
- {"environment.variable.name", "environment variable name"},
- {"library.name", "library name"},
- {"package.name", "package name"},
- {"policy.type", "policy type"},
- {"property.name", "property name"},
- {"Principal.List", "Principal List"},
- {"Permission.List", "Permission List"},
- {"Code.Base", "Code Base"},
- {"KeyStore.U.R.L.", "KeyStore U R L:"},
- {"KeyStore.Password.U.R.L.", "KeyStore Password U R L:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "invalid null input(s)"},
{"actions.can.only.be.read.", "actions can only be 'read'"},
@@ -565,6 +58,7 @@
{"provided.null.OID.map", "provided null OID map"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"invalid null AccessControlContext provided"},
{"invalid.null.action.provided", "invalid null action provided"},
@@ -668,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_de.java b/jdk/src/share/classes/sun/security/util/Resources_de.java
index 26bd331..34a7d6db 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_de.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_de.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Option]..."},
- {"Options.", "Optionen:"},
- {"Use.keytool.help.for.all.available.commands",
- "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
- {"Key.and.Certificate.Management.Tool",
- "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
- {"Commands.", "Befehle:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "\"keytool -command_name -help\" f\u00FCr Verwendung von command_name verwenden"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Generiert eine Zertifikatanforderung"}, //-certreq
- {"Changes.an.entry.s.alias",
- "\u00C4ndert den Alias eines Eintrags"}, //-changealias
- {"Deletes.an.entry",
- "L\u00F6scht einen Eintrag"}, //-delete
- {"Exports.certificate",
- "Exportiert ein Zertifikat"}, //-exportcert
- {"Generates.a.key.pair",
- "Generiert ein Schl\u00FCsselpaar"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "Generiert einen Secret Key"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Generiert ein Zertifikat aus einer Zertifikatanforderung"}, //-gencert
- {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importiert Eintr\u00E4ge aus einer Identity-Datenbank im JDK 1.1.x-Stil"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importiert ein Zertifikat oder eine Zertifikatkette"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importiert einen oder alle Eintr\u00E4ge aus einem anderen Keystore"}, //-importkeystore
- {"Clones.a.key.entry",
- "Clont einen Schl\u00FCsseleintrag"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\u00C4ndert das Schl\u00FCsselkennwort eines Eintrags"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Listet die Eintr\u00E4ge in einem Keystore auf"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Druckt den Content eines Zertifikats"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Druckt den Content einer Zertifikatanforderung"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Druckt den Content einer CRL-Datei"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "Aliasname des zu verarbeitenden Eintrags"}, //-alias
- {"destination.alias",
- "Zielalias"}, //-destalias
- {"destination.key.password",
- "Zielschl\u00FCssel-Kennwort"}, //-destkeypass
- {"destination.keystore.name",
- "Ziel-Keystore-Name"}, //-destkeystore
- {"destination.keystore.password.protected",
- "Ziel-Keystore kennwortgesch\u00FCtzt"}, //-destprotected
- {"destination.keystore.provider.name",
- "Ziel-Keystore-Providername"}, //-destprovidername
- {"destination.keystore.password",
- "Ziel-Keystore-Kennwort"}, //-deststorepass
- {"destination.keystore.type",
- "Ziel-Keystore-Typ"}, //-deststoretype
- {"distinguished.name",
- "Distinguished Name"}, //-dname
- {"X.509.extension",
- "X.509-Erweiterung"}, //-ext
- {"output.file.name",
- "Ausgabedateiname"}, //-file and -outfile
- {"input.file.name",
- "Eingabedateiname"}, //-file and -infile
- {"key.algorithm.name",
- "Schl\u00FCsselalgorithmusname"}, //-keyalg
- {"key.password",
- "Schl\u00FCsselkennwort"}, //-keypass
- {"key.bit.size",
- "Schl\u00FCsselbitgr\u00F6\u00DFe"}, //-keysize
- {"keystore.name",
- "Keystore-Name"}, //-keystore
- {"new.password",
- "Neues Kennwort"}, //-new
- {"do.not.prompt",
- "Kein Prompt"}, //-noprompt
- {"password.through.protected.mechanism",
- "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
- {"provider.argument",
- "Providerargument"}, //-providerarg
- {"provider.class.name",
- "Providerklassenname"}, //-providerclass
- {"provider.name",
- "Providername"}, //-providername
- {"provider.classpath",
- "Provider-Classpath"}, //-providerpath
- {"output.in.RFC.style",
- "Ausgabe in RFC-Stil"}, //-rfc
- {"signature.algorithm.name",
- "Signaturalgorithmusname"}, //-sigalg
- {"source.alias",
- "Quellalias"}, //-srcalias
- {"source.key.password",
- "Quellschl\u00FCssel-Kennwort"}, //-srckeypass
- {"source.keystore.name",
- "Quell-Keystore-Name"}, //-srckeystore
- {"source.keystore.password.protected",
- "Quell-Keystore kennwortgesch\u00FCtzt"}, //-srcprotected
- {"source.keystore.provider.name",
- "Quell-Keystore-Providername"}, //-srcprovidername
- {"source.keystore.password",
- "Quell-Keystore-Kennwort"}, //-srcstorepass
- {"source.keystore.type",
- "Quell-Keystore-Typ"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL-Serverhost und -port"}, //-sslserver
- {"signed.jar.file",
- "Signierte JAR-Datei"}, //=jarfile
- {"certificate.validity.start.date.time",
- "Anfangsdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
- {"keystore.password",
- "Keystore-Kennwort"}, //-storepass
- {"keystore.type",
- "Keystore-Typ"}, //-storetype
- {"trust.certificates.from.cacerts",
- "Zertifikaten aus cacerts vertrauen"}, //-trustcacerts
- {"verbose.output",
- "Verbose-Ausgabe"}, //-v
- {"validity.number.of.days",
- "G\u00FCltigkeitsdauer (Tage)"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "Serielle ID des zu entziehenden Certs"}, //-id
- // keytool: Running part
- {"keytool.error.", "Keytool-Fehler: "},
- {"Illegal.option.", "Ung\u00FCltige Option: "},
- {"Illegal.value.", "Ung\u00FCltiger Wert: "},
- {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
- {"Cannot.find.environment.variable.",
- "Umgebungsvariable kann nicht gefunden werden: "},
- {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
- {"Command.option.flag.needs.an.argument.", "Befehlsoption {0} ben\u00F6tigt ein Argument."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Warnung: Keine Unterst\u00FCtzung f\u00FCr unterschiedliche Speicher- und Schl\u00FCsselkennw\u00F6rter bei PKCS12 KeyStores. Der benutzerdefinierte Wert {0} wird ignoriert."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore muss NONE sein, wenn -storetype {0} ist"},
- {"Too.many.retries.program.terminated",
- "Zu viele erneute Versuche. Programm wird beendet"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "Befehle -storepasswd und -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype {0} ist"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "Befehle des Typs -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype PKCS12 ist"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-keypass und -new k\u00F6nnen nicht angegeben werden, wenn -storetype {0} ist"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "Wenn -protected angegeben ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Wenn -srcprotected angegeben ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
- {"Illegal.startdate.value", "Ung\u00FCltiger Wert f\u00FCr Anfangsdatum"},
- {"Validity.must.be.greater.than.zero",
- "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
- {"provName.not.a.provider", "{0} kein Provider"},
- {"Usage.error.no.command.provided", "Verwendungsfehler: Kein Befehl angegeben"},
- {"Source.keystore.file.exists.but.is.empty.", "Quell-Keystore-Datei ist zwar vorhanden, ist aber leer: "},
- {"Please.specify.srckeystore", "Geben Sie -srckeystore an"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "-v und -rfc d\u00FCrfen bei Befehl \"list\" nicht beide angegeben werden"},
- {"Key.password.must.be.at.least.6.characters",
- "Schl\u00FCsselkennwort muss mindestens sechs Zeichen lang sein"},
- {"New.password.must.be.at.least.6.characters",
- "Neues Kennwort muss mindestens sechs Zeichen lang sein"},
- {"Keystore.file.exists.but.is.empty.",
- "Keystore-Datei ist vorhanden, ist aber leer: "},
- {"Keystore.file.does.not.exist.",
- "Keystore-Datei ist nicht vorhanden: "},
- {"Must.specify.destination.alias", "Sie m\u00FCssen einen Zielalias angeben"},
- {"Must.specify.alias", "Sie m\u00FCssen einen Alias angeben"},
- {"Keystore.password.must.be.at.least.6.characters",
- "Keystore-Kennwort muss mindestens sechs Zeichen lang sein"},
- {"Enter.keystore.password.", "Keystore-Kennwort eingeben: "},
- {"Enter.source.keystore.password.", "Quell-Keystore-Kennwort eingeben: "},
- {"Enter.destination.keystore.password.", "Ziel-Keystore-Kennwort eingeben: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
- {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
- {"Too.many.failures.Alias.not.changed", "Zu viele Fehler. Alias nicht ge\u00E4ndert"},
- {"Entry.for.alias.alias.successfully.imported.",
- "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
- {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Problem beim Importieren des Eintrags f\u00FCr Alias {0}: {1}.\nEintrag f\u00FCr Alias {0} nicht importiert."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Importbefehl abgeschlossen: {0} Eintr\u00E4ge erfolgreich importiert, {1} Eintr\u00E4ge nicht erfolgreich oder abgebrochen"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Warnung: Vorhandener Alias {0} in Ziel-Keystore wird \u00FCberschrieben"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "Eintragsalias {0} ist bereits vorhanden. \u00DCberschreiben? [Nein]: "},
- {"Too.many.failures.try.later", "Zu viele Fehler. Versuchen Sie es sp\u00E4ter erneut"},
- {"Certification.request.stored.in.file.filename.",
- "Zertifizierungsanforderung in Datei <{0}> gespeichert"},
- {"Submit.this.to.your.CA", "Leiten Sie dies an die CA weiter"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "Wenn kein Alias angegeben ist, d\u00FCrfen destalias, srckeypass und destkeypass nicht angegeben werden"},
- {"Certificate.stored.in.file.filename.",
- "Zertifikat in Datei <{0}> gespeichert"},
- {"Certificate.reply.was.installed.in.keystore",
- "Zertifikatantwort wurde in Keystore installiert"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "Zertifikatantwort wurde nicht in Keystore installiert"},
- {"Certificate.was.added.to.keystore",
- "Zertifikat wurde Keystore hinzugef\u00FCgt"},
- {"Certificate.was.not.added.to.keystore",
- "Zertifikat wurde nicht zu Keystore hinzugef\u00FCgt"},
- {".Storing.ksfname.", "[{0} wird gesichert]"},
- {"alias.has.no.public.key.certificate.",
- "{0} hat keinen Public Key (Zertifikat)"},
- {"Cannot.derive.signature.algorithm",
- "Signaturalgorithmus kann nicht abgeleitet werden"},
- {"Alias.alias.does.not.exist",
- "Alias <{0}> ist nicht vorhanden"},
- {"Alias.alias.has.no.certificate",
- "Alias <{0}> hat kein Zertifikat"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
- {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(RETURN, wenn identisch mit Keystore-Kennwort): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "Schl\u00FCsselkennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Zu viele Fehler. Schl\u00FCssel wurde nicht zu Keystore hinzugef\u00FCgt"},
- {"Destination.alias.dest.already.exists",
- "Zielalias <{0}> bereits vorhanden"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geclont"},
- {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "Keystore-Eintrag f\u00FCr <{0}> bereits vorhanden"},
- {"Creating.keystore.entry.for.id.getName.",
- "Keystore-Eintrag f\u00FCr <{0}> wird erstellt..."},
- {"No.entries.from.identity.database.added",
- "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
- {"Alias.name.alias", "Aliasname: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Erstellungsdatum: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Eintragstyp: {0}"},
- {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "},
- {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "},
- {"Keystore.type.", "Keystore-Typ: "},
- {"Keystore.provider.", "Keystore-Provider: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Keystore enth\u00E4lt {0,number,integer} Eintrag"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Keystore enth\u00E4lt {0,number,integer} Eintr\u00E4ge"},
- {"Failed.to.parse.input", "Eingabe konnte nicht geparst werden"},
- {"Empty.input", "Leere Eingabe"},
- {"Not.X.509.certificate", "Kein X.509-Zertifikat"},
- {"alias.has.no.public.key", "{0} hat keinen Public Key"},
- {"alias.has.no.X.509.certificate", "{0} hat kein X.509-Zertifikat"},
- {"New.certificate.self.signed.", "Neues Zertifikat (selbst signiert):"},
- {"Reply.has.no.certificates", "Antwort hat keine Zertifikate"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Zertifikat nicht importiert. Alias <{0}> ist bereits vorhanden"},
- {"Input.not.an.X.509.certificate", "Eingabe kein X.509-Zertifikat"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "Zertifikat ist bereits unter Alias <{0}> im Keystore vorhanden"},
- {"Do.you.still.want.to.add.it.no.",
- "M\u00F6chten Sie es trotzdem hinzuf\u00FCgen? [Nein]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "Zertifikat ist bereits unter Alias <{0}> im systemweiten CA-Keystore vorhanden"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]: "},
- {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]: "},
- {"YES", "Ja"},
- {"New.prompt.", "Neues {0}: "},
- {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
- {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
- {"Re.enter.new.password.", "Neues Kennwort erneut eingeben: "},
- {"They.don.t.match.Try.again", "Keine \u00DCbereinstimmung. Wiederholen Sie den Vorgang"},
- {"Enter.prompt.alias.name.", "{0}-Aliasnamen eingeben: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Geben Sie einen neuen Aliasnamen ein\t(RETURN, um den Import dieses Eintrags abzubrechen): "},
- {"Enter.alias.name.", "Aliasnamen eingeben: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(RETURN, wenn identisch mit <{0}>)"},
- {".PATTERN.printX509Cert",
- "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikat-Fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signaturalgorithmusname: {8}\n\t Version: {9}"},
- {"What.is.your.first.and.last.name.",
- "Wie lautet Ihr Vor- und Nachname?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "Wie lautet der Name Ihrer organisatorischen Einheit?"},
- {"What.is.the.name.of.your.organization.",
- "Wie lautet der Name Ihrer Organisation?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "Wie lautet der Name Ihrer Stadt oder Gemeinde?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "Wie lautet der Name Ihres Bundeslands?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "Wie lautet der L\u00E4ndercode (zwei Buchstaben) f\u00FCr diese Einheit?"},
- {"Is.name.correct.", "Ist {0} richtig?"},
- {"no", "Nein"},
- {"yes", "Ja"},
- {"y", "J"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Clonen von Private Key-Eintr\u00E4gen"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Warnung Warnung Warnung *****************"},
- {"Signer.d.", "Signaturgeber #%d:"},
- {"Timestamp.", "Zeitstempel:"},
- {"Signature.", "Signatur:"},
- {"CRLs.", "CRLs:"},
- {"Certificate.owner.", "Zertifikateigent\u00FCmer: "},
- {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
- {"No.certificate.from.the.SSL.server",
- "Kein Zertifikat vom SSL-Server"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Unvollst\u00E4ndige Zertifikatkette in Antwort"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "Zertifikatkette in Antwort verifiziert nicht: "},
- {"Top.level.certificate.in.reply.",
- "Zertifikat der obersten Ebene in Antwort:\n"},
- {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
- {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]: "},
- {"NO", "Nein"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "Zertifikatantwort und Zertifikat in Keystore sind identisch"},
- {"Failed.to.establish.chain.from.reply",
- "Kette konnte der Antwort nicht entnommen werden"},
- {"n", "N"},
- {"Wrong.answer.try.again", "Falsche Antwort. Wiederholen Sie den Vorgang"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Geben Sie -keysize zum Erstellen eines Secret Keys an"},
-
- {"Extensions.", "Erweiterungen: "},
- {".Empty.value.", "(Leerer Wert)"},
- {"Extension.Request.", "Erweiterungsanforderung:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubjekt: %s\nPublic Key: %s Format %s Schl\u00FCssel\n"},
- {"Unknown.keyUsage.type.", "Unbekannter keyUsage-Typ: "},
- {"Unknown.extendedkeyUsage.type.", "Unbekannter extendedkeyUsage-Typ: "},
- {"Unknown.AccessDescription.type.", "Unbekannter AccessDescription-Typ: "},
- {"Unrecognized.GeneralName.type.", "Unbekannter GeneralName-Typ: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Erweiterung kann nicht als \"Kritisch\" markiert werden. "},
- {"Odd.number.of.hex.digits.found.", "Ungerade Anzahl hexadezimaler Ziffern gefunden: "},
- {"Unknown.extension.type.", "Unbekannter Erweiterungstyp: "},
- {"command.{0}.is.ambiguous.", "Befehl {0} ist mehrdeutig:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Warnung: Kein Public Key f\u00FCr Alias {0} vorhanden. Vergewissern Sie sich, dass der KeyStore ordnungsgem\u00E4\u00DF konfiguriert ist."},
- {"Warning.Class.not.found.class", "Warnung: Klasse nicht gefunden: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Warnung: Ung\u00FCltige(s) Argument(e) f\u00FCr Constructor: {0}"},
- {"Illegal.Principal.Type.type", "Ung\u00FCltiger Principal-Typ: {0}"},
- {"Illegal.option.option", "Ung\u00FCltige Option: {0}"},
- {"Usage.policytool.options.", "Verwendung: policytool [Optionen]"},
- {".file.file.policy.file.location",
- " [-file <Datei>] Policy-Dateiverzeichnis"},
- {"New", "Neu"},
- {"Open", "\u00D6ffnen"},
- {"Save", "Speichern"},
- {"Save.As", "Speichern unter"},
- {"View.Warning.Log", "Warnungslog anzeigen"},
- {"Exit", "Beenden"},
- {"Add.Policy.Entry", "Policy-Eintrag hinzuf\u00FCgen"},
- {"Edit.Policy.Entry", "Policy-Eintrag bearbeiten"},
- {"Remove.Policy.Entry", "Policy-Eintrag entfernen"},
- {"Edit", "Bearbeiten"},
- {"Retain", "Beibehalten"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escape-Zeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
-
- {"Add.Public.Key.Alias", "Public Key-Alias hinzuf\u00FCgen"},
- {"Remove.Public.Key.Alias", "Public Key-Alias entfernen"},
- {"File", "Datei"},
- {"KeyStore", "KeyStore"},
- {"Policy.File.", "Policy-Datei:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "Policy-Datei konnte nicht ge\u00F6ffnet werden: {0}: {1}"},
- {"Policy.Tool", "Policy-Tool"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Beim \u00D6ffnen der Policy-Konfiguration sind Fehler aufgetreten. Weitere Informationen finden Sie im Warnungslog."},
- {"Error", "Fehler"},
- {"OK", "OK"},
- {"Status", "Status"},
- {"Warning", "Warnung"},
- {"Permission.",
- "Berechtigung: "},
- {"Principal.Type.", "Principal-Typ:"},
- {"Principal.Name.", "Principal-Name:"},
- {"Target.Name.",
- "Zielname: "},
- {"Actions.",
- "Aktionen: "},
- {"OK.to.overwrite.existing.file.filename.",
- "Vorhandene Datei {0} \u00FCberschreiben?"},
- {"Cancel", "Abbrechen"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Principal hinzuf\u00FCgen"},
- {"Edit.Principal", "Principal bearbeiten"},
- {"Remove.Principal", "Principal entfernen"},
- {"Principals.", "Principals:"},
- {".Add.Permission", " Berechtigung hinzuf\u00FCgen"},
- {".Edit.Permission", " Berechtigung bearbeiten"},
- {"Remove.Permission", "Berechtigung entfernen"},
- {"Done", "Fertig"},
- {"KeyStore.URL.", "KeyStore-URL:"},
- {"KeyStore.Type.", "KeyStore-Typ:"},
- {"KeyStore.Provider.", "KeyStore-Provider:"},
- {"KeyStore.Password.URL.", "KeyStore-Kennwort-URL:"},
- {"Principals", "Principals"},
- {".Edit.Principal.", " Principal bearbeiten:"},
- {".Add.New.Principal.", " Neuen Principal hinzuf\u00FCgen:"},
- {"Permissions", "Berechtigungen"},
- {".Edit.Permission.", " Berechtigung bearbeiten:"},
- {".Add.New.Permission.", " Neue Berechtigung hinzuf\u00FCgen:"},
- {"Signed.By.", "Signiert von:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "Principal kann nicht mit einer Platzhalterklasse ohne Platzhalternamen angegeben werden"},
- {"Cannot.Specify.Principal.without.a.Name",
- "Principal kann nicht ohne einen Namen angegeben werden"},
- {"Permission.and.Target.Name.must.have.a.value",
- "Berechtigung und Zielname m\u00FCssen einen Wert haben"},
- {"Remove.this.Policy.Entry.", "Diesen Policy-Eintrag entfernen?"},
- {"Overwrite.File", "Datei \u00FCberschreiben"},
- {"Policy.successfully.written.to.filename",
- "Policy erfolgreich in {0} geschrieben"},
- {"null.filename", "Null-Dateiname"},
- {"Save.changes.", "\u00C4nderungen speichern?"},
- {"Yes", "Ja"},
- {"No", "Nein"},
- {"Policy.Entry", "Policy-Eintrag"},
- {"Save.Changes", "\u00C4nderungen speichern"},
- {"No.Policy.Entry.selected", "Kein Policy-Eintrag ausgew\u00E4hlt"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "KeyStore kann nicht ge\u00F6ffnet werden: {0}"},
- {"No.principal.selected", "Kein Principal ausgew\u00E4hlt"},
- {"No.permission.selected", "Keine Berechtigung ausgew\u00E4hlt"},
- {"name", "Name"},
- {"configuration.type", "Konfigurationstyp"},
- {"environment.variable.name", "Umgebungsvariablenname"},
- {"library.name", "Library-Name"},
- {"package.name", "Packagename"},
- {"policy.type", "Policy-Typ"},
- {"property.name", "Eigenschaftsname"},
- {"Principal.List", "Principal-Liste"},
- {"Permission.List", "Berechtigungsliste"},
- {"Code.Base", "Codebase"},
- {"KeyStore.U.R.L.", "KeyStore-URL:"},
- {"KeyStore.Password.U.R.L.", "KeyStore-Kennwort-URL:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "Ung\u00FCltige Nulleingabe(n)"},
{"actions.can.only.be.read.", "Aktionen k\u00F6nnen nur \"lesen\" sein"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "Null-OID-Zuordnung angegeben"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"Ung\u00FCltiger Nullwert f\u00FCr AccessControlContext angegeben"},
{"invalid.null.action.provided", "Ung\u00FCltige Nullaktion angegeben"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_es.java b/jdk/src/share/classes/sun/security/util/Resources_es.java
index 59dc88b..8f2b296 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_es.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_es.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Opci\u00F3n]..."},
- {"Options.", "Opciones:"},
- {"Use.keytool.help.for.all.available.commands",
- "Utilice\"keytool -help\" para todos los comandos disponibles"},
- {"Key.and.Certificate.Management.Tool",
- "Herramienta de Gesti\u00F3n de Certificados y Claves"},
- {"Commands.", "Comandos:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "Utilice \"keytool -command_name -help\" para la sintaxis de nombre_comando"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Genera una solicitud de certificado"}, //-certreq
- {"Changes.an.entry.s.alias",
- "Cambia un alias de entrada"}, //-changealias
- {"Deletes.an.entry",
- "Suprime una entrada"}, //-delete
- {"Exports.certificate",
- "Exporta el certificado"}, //-exportcert
- {"Generates.a.key.pair",
- "Genera un par de claves"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "Genera un clave secreta"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Genera un certificado a partir de una solicitud de certificado"}, //-gencert
- {"Generates.CRL", "Genera CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importa entradas desde una base de datos de identidades JDK 1.1.x-style"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importa un certificado o una cadena de certificados"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importa una o todas las entradas desde otro almac\u00E9n de claves"}, //-importkeystore
- {"Clones.a.key.entry",
- "Clona una entrada de clave"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "Cambia la contrase\u00F1a de clave de una entrada"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Enumera las entradas de un almac\u00E9n de claves"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Imprime el contenido de un certificado"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Imprime el contenido de una solicitud de certificado"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Imprime el contenido de un archivo CRL"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Genera un certificado autofirmado"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "Cambia la contrase\u00F1a de almac\u00E9n de un almac\u00E9n de claves"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "nombre de alias de la entrada que se va a procesar"}, //-alias
- {"destination.alias",
- "alias de destino"}, //-destalias
- {"destination.key.password",
- "contrase\u00F1a de clave de destino"}, //-destkeypass
- {"destination.keystore.name",
- "nombre de almac\u00E9n de claves de destino"}, //-destkeystore
- {"destination.keystore.password.protected",
- "almac\u00E9n de claves de destino protegido por contrase\u00F1a"}, //-destprotected
- {"destination.keystore.provider.name",
- "nombre de proveedor de almac\u00E9n de claves de destino"}, //-destprovidername
- {"destination.keystore.password",
- "contrase\u00F1a de almac\u00E9n de claves de destino"}, //-deststorepass
- {"destination.keystore.type",
- "tipo de almac\u00E9n de claves de destino"}, //-deststoretype
- {"distinguished.name",
- "nombre distintivo"}, //-dname
- {"X.509.extension",
- "extensi\u00F3n X.509"}, //-ext
- {"output.file.name",
- "nombre de archivo de salida"}, //-file and -outfile
- {"input.file.name",
- "nombre de archivo de entrada"}, //-file and -infile
- {"key.algorithm.name",
- "nombre de algoritmo de clave"}, //-keyalg
- {"key.password",
- "contrase\u00F1a de clave"}, //-keypass
- {"key.bit.size",
- "tama\u00F1o de bit de clave"}, //-keysize
- {"keystore.name",
- "nombre de almac\u00E9n de claves"}, //-keystore
- {"new.password",
- "nueva contrase\u00F1a"}, //-new
- {"do.not.prompt",
- "no solicitar"}, //-noprompt
- {"password.through.protected.mechanism",
- "contrase\u00F1a a trav\u00E9s de mecanismo protegido"}, //-protected
- {"provider.argument",
- "argumento del proveedor"}, //-providerarg
- {"provider.class.name",
- "nombre de clase del proveedor"}, //-providerclass
- {"provider.name",
- "nombre del proveedor"}, //-providername
- {"provider.classpath",
- "classpath de proveedor"}, //-providerpath
- {"output.in.RFC.style",
- "salida en estilo RFC"}, //-rfc
- {"signature.algorithm.name",
- "nombre de algoritmo de firma"}, //-sigalg
- {"source.alias",
- "alias de origen"}, //-srcalias
- {"source.key.password",
- "contrase\u00F1a de clave de origen"}, //-srckeypass
- {"source.keystore.name",
- "nombre de almac\u00E9n de claves de origen"}, //-srckeystore
- {"source.keystore.password.protected",
- "almac\u00E9n de claves de origen protegido por contrase\u00F1a"}, //-srcprotected
- {"source.keystore.provider.name",
- "nombre de proveedor de almac\u00E9n de claves de origen"}, //-srcprovidername
- {"source.keystore.password",
- "contrase\u00F1a de almac\u00E9n de claves de origen"}, //-srcstorepass
- {"source.keystore.type",
- "tipo de almac\u00E9n de claves de origen"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "puerto y host del servidor SSL"}, //-sslserver
- {"signed.jar.file",
- "archivo jar firmado"}, //=jarfile
- {"certificate.validity.start.date.time",
- "fecha/hora de inicio de validez del certificado"}, //-startdate
- {"keystore.password",
- "contrase\u00F1a de almac\u00E9n de claves"}, //-storepass
- {"keystore.type",
- "tipo de almac\u00E9n de claves"}, //-storetype
- {"trust.certificates.from.cacerts",
- "certificados de protecci\u00F3n de cacerts"}, //-trustcacerts
- {"verbose.output",
- "salida detallada"}, //-v
- {"validity.number.of.days",
- "n\u00FAmero de validez de d\u00EDas"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "identificador de serie del certificado que se va a revocar"}, //-id
- // keytool: Running part
- {"keytool.error.", "error de herramienta de claves: "},
- {"Illegal.option.", "Opci\u00F3n no permitida: "},
- {"Illegal.value.", "Valor no permitido: "},
- {"Unknown.password.type.", "Tipo de contrase\u00F1a desconocido: "},
- {"Cannot.find.environment.variable.",
- "No se ha encontrado la variable del entorno: "},
- {"Cannot.find.file.", "No se ha encontrado el archivo: "},
- {"Command.option.flag.needs.an.argument.", "La opci\u00F3n de comando {0} necesita un argumento."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Advertencia: los almacenes de claves en formato PKCS12 no admiten contrase\u00F1as de clave y almacenamiento distintas. Se ignorar\u00E1 el valor especificado por el usuario, {0}."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore debe ser NONE si -storetype es {0}"},
- {"Too.many.retries.program.terminated",
- "Ha habido demasiados intentos, se ha cerrado el programa"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "Los comandos -storepasswd y -keypasswd no est\u00E1n soportados si -storetype es {0}"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "Los comandos -keypasswd no est\u00E1n soportados si -storetype es PKCS12"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-keypass y -new no se pueden especificar si -storetype es {0}"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "si se especifica -protected, no deben especificarse -storepass, -keypass ni -new"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Si se especifica -srcprotected, no se puede especificar -srcstorepass ni -srckeypass"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "Si keystore no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -storepass, -keypass ni -new"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Si el almac\u00E9n de claves de origen no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -srcstorepass ni -srckeypass"},
- {"Illegal.startdate.value", "Valor de fecha de inicio no permitido"},
- {"Validity.must.be.greater.than.zero",
- "La validez debe ser mayor que cero"},
- {"provName.not.a.provider", "{0} no es un proveedor"},
- {"Usage.error.no.command.provided", "Error de sintaxis: no se ha proporcionado ning\u00FAn comando"},
- {"Source.keystore.file.exists.but.is.empty.", "El archivo de almac\u00E9n de claves de origen existe, pero est\u00E1 vac\u00EDo: "},
- {"Please.specify.srckeystore", "Especifique -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "No se deben especificar -v y -rfc simult\u00E1neamente con el comando 'list'"},
- {"Key.password.must.be.at.least.6.characters",
- "La contrase\u00F1a de clave debe tener al menos 6 caracteres"},
- {"New.password.must.be.at.least.6.characters",
- "La nueva contrase\u00F1a debe tener al menos 6 caracteres"},
- {"Keystore.file.exists.but.is.empty.",
- "El archivo de almac\u00E9n de claves existe, pero est\u00E1 vac\u00EDo: "},
- {"Keystore.file.does.not.exist.",
- "El archivo de almac\u00E9n de claves no existe: "},
- {"Must.specify.destination.alias", "Se debe especificar un alias de destino"},
- {"Must.specify.alias", "Se debe especificar un alias"},
- {"Keystore.password.must.be.at.least.6.characters",
- "La contrase\u00F1a del almac\u00E9n de claves debe tener al menos 6 caracteres"},
- {"Enter.keystore.password.", "Introduzca la contrase\u00F1a del almac\u00E9n de claves: "},
- {"Enter.source.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de origen: "},
- {"Enter.destination.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de destino: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "La contrase\u00F1a del almac\u00E9n de claves es demasiado corta, debe tener al menos 6 caracteres"},
- {"Unknown.Entry.Type", "Tipo de Entrada Desconocido"},
- {"Too.many.failures.Alias.not.changed", "Demasiados fallos. No se ha cambiado el alias"},
- {"Entry.for.alias.alias.successfully.imported.",
- "La entrada del alias {0} se ha importado correctamente."},
- {"Entry.for.alias.alias.not.imported.", "La entrada del alias {0} no se ha importado."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Problema al importar la entrada del alias {0}: {1}.\nNo se ha importado la entrada del alias {0}."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Comando de importaci\u00F3n completado: {0} entradas importadas correctamente, {1} entradas incorrectas o canceladas"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Advertencia: se sobrescribir\u00E1 el alias {0} en el almac\u00E9n de claves de destino"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "El alias de entrada existente {0} ya existe, \u00BFdesea sobrescribirlo? [no]: "},
- {"Too.many.failures.try.later", "Demasiados fallos; int\u00E9ntelo m\u00E1s adelante"},
- {"Certification.request.stored.in.file.filename.",
- "Solicitud de certificaci\u00F3n almacenada en el archivo <{0}>"},
- {"Submit.this.to.your.CA", "Enviar a la CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "si no se especifica el alias, no se puede especificar destalias, srckeypass ni destkeypass"},
- {"Certificate.stored.in.file.filename.",
- "Certificado almacenado en el archivo <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "Se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "No se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
- {"Certificate.was.added.to.keystore",
- "Se ha agregado el certificado al almac\u00E9n de claves"},
- {"Certificate.was.not.added.to.keystore",
- "No se ha agregado el certificado al almac\u00E9n de claves"},
- {".Storing.ksfname.", "[Almacenando {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} no tiene clave p\u00FAblica (certificado)"},
- {"Cannot.derive.signature.algorithm",
- "No se puede derivar el algoritmo de firma"},
- {"Alias.alias.does.not.exist",
- "El alias <{0}> no existe"},
- {"Alias.alias.has.no.certificate",
- "El alias <{0}> no tiene certificado"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "No se ha generado el par de claves, el alias <{0}> ya existe"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Generando par de claves {1} de {0} bits para certificado autofirmado ({2}) con una validez de {3} d\u00EDas\n\tpara: {4}"},
- {"Enter.key.password.for.alias.", "Introduzca la contrase\u00F1a de clave para <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(INTRO si es la misma contrase\u00F1a que la del almac\u00E9n de claves): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "La contrase\u00F1a de clave es demasiado corta; debe tener al menos 6 caracteres"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Demasiados fallos; no se ha agregado la clave al almac\u00E9n de claves"},
- {"Destination.alias.dest.already.exists",
- "El alias de destino <{0}> ya existe"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "La contrase\u00F1a es demasiado corta; debe tener al menos 6 caracteres"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Demasiados fallos. No se ha clonado la entrada de clave"},
- {"key.password.for.alias.", "contrase\u00F1a de clave para <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "La entrada de almac\u00E9n de claves para <{0}> ya existe"},
- {"Creating.keystore.entry.for.id.getName.",
- "Creando entrada de almac\u00E9n de claves para <{0}> ..."},
- {"No.entries.from.identity.database.added",
- "No se han agregado entradas de la base de datos de identidades"},
- {"Alias.name.alias", "Nombre de Alias: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Fecha de Creaci\u00F3n: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Tipo de Entrada: {0}"},
- {"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "},
- {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Huella Digital de Certificado (SHA1): "},
- {"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "},
- {"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Su almac\u00E9n de claves contiene {0,number,integer} entrada"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Su almac\u00E9n de claves contiene {0,number,integer} entradas"},
- {"Failed.to.parse.input", "Fallo al analizar la entrada"},
- {"Empty.input", "Entrada vac\u00EDa"},
- {"Not.X.509.certificate", "No es un certificado X.509"},
- {"alias.has.no.public.key", "{0} no tiene clave p\u00FAblica"},
- {"alias.has.no.X.509.certificate", "{0} no tiene certificado X.509"},
- {"New.certificate.self.signed.", "Nuevo Certificado (Autofirmado):"},
- {"Reply.has.no.certificates", "La respuesta no tiene certificados"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Certificado no importado, el alias <{0}> ya existe"},
- {"Input.not.an.X.509.certificate", "La entrada no es un certificado X.509"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "El certificado ya existe en el almac\u00E9n de claves con el alias <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "\u00BFA\u00FAn desea agregarlo? [no]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "El certificado ya existe en el almac\u00E9n de claves de la CA del sistema, con el alias <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]: "},
- {"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]: "},
- {"YES", "S\u00ED"},
- {"New.prompt.", "Nuevo {0}: "},
- {"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"},
- {"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "},
- {"Re.enter.new.password.", "Volver a escribir la contrase\u00F1a nueva: "},
- {"They.don.t.match.Try.again", "No coinciden. Int\u00E9ntelo de nuevo"},
- {"Enter.prompt.alias.name.", "Escriba el nombre de alias de {0}: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Indique el nuevo nombre de alias\t(INTRO para cancelar la importaci\u00F3n de esta entrada): "},
- {"Enter.alias.name.", "Introduzca el nombre de alias: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(INTRO si es el mismo que para <{0}>)"},
- {".PATTERN.printX509Cert",
- "Propietario: {0}\nEmisor: {1}\nN\u00FAmero de serie: {2}\nV\u00E1lido desde: {3} hasta: {4}\nHuellas digitales del Certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nombre del Algoritmo de Firma: {8}\n\t Versi\u00F3n: {9}"},
- {"What.is.your.first.and.last.name.",
- "\u00BFCu\u00E1les son su nombre y su apellido?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "\u00BFCu\u00E1l es el nombre de su unidad de organizaci\u00F3n?"},
- {"What.is.the.name.of.your.organization.",
- "\u00BFCu\u00E1l es el nombre de su organizaci\u00F3n?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "\u00BFCu\u00E1l es el nombre de su ciudad o localidad?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "\u00BFCu\u00E1l es el nombre de su estado o provincia?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "\u00BFCu\u00E1l es el c\u00F3digo de pa\u00EDs de dos letras de la unidad?"},
- {"Is.name.correct.", "\u00BFEs correcto {0}?"},
- {"no", "no"},
- {"yes", "s\u00ED"},
- {"y", "s"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "El alias <{0}> no tiene clave"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Advertencia Advertencia Advertencia *****************"},
- {"Signer.d.", "#%d de Firmante:"},
- {"Timestamp.", "Registro de Hora:"},
- {"Signature.", "Firma:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "Propietario del Certificado: "},
- {"Not.a.signed.jar.file", "No es un archivo jar firmado"},
- {"No.certificate.from.the.SSL.server",
- "Ning\u00FAn certificado del servidor SSL"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves *\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Cadena de certificado incompleta en la respuesta"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "La cadena de certificado de la respuesta no verifica: "},
- {"Top.level.certificate.in.reply.",
- "Certificado de nivel superior en la respuesta:\n"},
- {".is.not.trusted.", "... no es de confianza. "},
- {"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]: "},
- {"NO", "No"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "La respuesta del certificado y el certificado en el almac\u00E9n de claves son id\u00E9nticos"},
- {"Failed.to.establish.chain.from.reply",
- "No se ha podido definir una cadena a partir de la respuesta"},
- {"n", "n"},
- {"Wrong.answer.try.again", "Respuesta incorrecta, vuelva a intentarlo"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "No se ha generado la clave secreta, el alias <{0}> ya existe"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Proporcione el valor de -keysize para la generaci\u00F3n de claves secretas"},
-
- {"Extensions.", "Extensiones: "},
- {".Empty.value.", "(Valor vac\u00EDo)"},
- {"Extension.Request.", "Solicitud de Extensi\u00F3n:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "Solicitud de Certificado PKCS #10 (Versi\u00F3n 1.0)\nAsunto: %s\nClave P\u00FAblica: %s formato %s clave\n"},
- {"Unknown.keyUsage.type.", "Tipo de uso de clave desconocido: "},
- {"Unknown.extendedkeyUsage.type.", "Tipo de uso de clave extendida desconocido: "},
- {"Unknown.AccessDescription.type.", "Tipo de descripci\u00F3n de acceso desconocido: "},
- {"Unrecognized.GeneralName.type.", "Tipo de nombre general no reconocido: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Esta extensi\u00F3n no se puede marcar como cr\u00EDtica. "},
- {"Odd.number.of.hex.digits.found.", "Se ha encontrado un n\u00FAmero impar de d\u00EDgitos hexadecimales: "},
- {"Unknown.extension.type.", "Tipo de extensi\u00F3n desconocida: "},
- {"command.{0}.is.ambiguous.", "El comando {0} es ambiguo:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Advertencia: no hay clave p\u00FAblica para el alias {0}. Aseg\u00FArese de que se ha configurado correctamente un almac\u00E9n de claves."},
- {"Warning.Class.not.found.class", "Advertencia: no se ha encontrado la clase: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Advertencia: argumento(s) no v\u00E1lido(s) para el constructor: {0}"},
- {"Illegal.Principal.Type.type", "Tipo de principal no permitido: {0}"},
- {"Illegal.option.option", "Opci\u00F3n no permitida: {0}"},
- {"Usage.policytool.options.", "Sintaxis: policytool [opciones]"},
- {".file.file.policy.file.location",
- " [-file <archivo>] ubicaci\u00F3n del archivo de normas"},
- {"New", "Nuevo"},
- {"Open", "Abrir"},
- {"Save", "Guardar"},
- {"Save.As", "Guardar como"},
- {"View.Warning.Log", "Ver Log de Advertencias"},
- {"Exit", "Salir"},
- {"Add.Policy.Entry", "Agregar Entrada de Pol\u00EDtica"},
- {"Edit.Policy.Entry", "Editar Entrada de Pol\u00EDtica"},
- {"Remove.Policy.Entry", "Eliminar Entrada de Pol\u00EDtica"},
- {"Edit", "Editar"},
- {"Retain", "Mantener"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Advertencia: el nombre del archivo puede contener caracteres de barra invertida de escape. No es necesario utilizar barras invertidas de escape (la herramienta aplica caracteres de escape seg\u00FAn sea necesario al escribir el contenido de las pol\u00EDticas en el almac\u00E9n persistente).\n\nHaga clic en Mantener para conservar el nombre introducido o en Editar para modificarlo."},
-
- {"Add.Public.Key.Alias", "Agregar Alias de Clave P\u00FAblico"},
- {"Remove.Public.Key.Alias", "Eliminar Alias de Clave P\u00FAblico"},
- {"File", "Archivo"},
- {"KeyStore", "Almac\u00E9n de Claves"},
- {"Policy.File.", "Archivo de Pol\u00EDtica:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "No se ha podido abrir el archivo de pol\u00EDtica: {0}: {1}"},
- {"Policy.Tool", "Herramienta de Pol\u00EDticas"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Ha habido errores al abrir la configuraci\u00F3n de pol\u00EDticas. V\u00E9ase el log de advertencias para obtener m\u00E1s informaci\u00F3n."},
- {"Error", "Error"},
- {"OK", "Aceptar"},
- {"Status", "Estado"},
- {"Warning", "Advertencia"},
- {"Permission.",
- "Permiso: "},
- {"Principal.Type.", "Tipo de Principal:"},
- {"Principal.Name.", "Nombre de Principal:"},
- {"Target.Name.",
- "Nombre de Destino: "},
- {"Actions.",
- "Acciones: "},
- {"OK.to.overwrite.existing.file.filename.",
- "\u00BFSobrescribir el archivo existente {0}?"},
- {"Cancel", "Cancelar"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Agregar Principal"},
- {"Edit.Principal", "Editar Principal"},
- {"Remove.Principal", "Eliminar Principal"},
- {"Principals.", "Principales:"},
- {".Add.Permission", " Agregar Permiso"},
- {".Edit.Permission", " Editar Permiso"},
- {"Remove.Permission", "Eliminar Permiso"},
- {"Done", "Listo"},
- {"KeyStore.URL.", "URL de Almac\u00E9n de Claves:"},
- {"KeyStore.Type.", "Tipo de Almac\u00E9n de Claves:"},
- {"KeyStore.Provider.", "Proveedor de Almac\u00E9n de Claves:"},
- {"KeyStore.Password.URL.", "URL de Contrase\u00F1a de Almac\u00E9n de Claves:"},
- {"Principals", "Principales"},
- {".Edit.Principal.", " Editar Principal:"},
- {".Add.New.Principal.", " Agregar Nuevo Principal:"},
- {"Permissions", "Permisos"},
- {".Edit.Permission.", " Editar Permiso:"},
- {".Add.New.Permission.", " Agregar Permiso Nuevo:"},
- {"Signed.By.", "Firmado Por:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "No se puede especificar un principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"},
- {"Cannot.Specify.Principal.without.a.Name",
- "No se puede especificar el principal sin un nombre"},
- {"Permission.and.Target.Name.must.have.a.value",
- "Permiso y Nombre de Destino deben tener un valor"},
- {"Remove.this.Policy.Entry.", "\u00BFEliminar esta entrada de pol\u00EDtica?"},
- {"Overwrite.File", "Sobrescribir Archivo"},
- {"Policy.successfully.written.to.filename",
- "Pol\u00EDtica escrita correctamente en {0}"},
- {"null.filename", "nombre de archivo nulo"},
- {"Save.changes.", "\u00BFGuardar los cambios?"},
- {"Yes", "S\u00ED"},
- {"No", "No"},
- {"Policy.Entry", "Entrada de Pol\u00EDtica"},
- {"Save.Changes", "Guardar Cambios"},
- {"No.Policy.Entry.selected", "No se ha seleccionado la entrada de pol\u00EDtica"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "No se ha podido abrir el almac\u00E9n de claves: {0}"},
- {"No.principal.selected", "No se ha seleccionado un principal"},
- {"No.permission.selected", "No se ha seleccionado un permiso"},
- {"name", "nombre"},
- {"configuration.type", "tipo de configuraci\u00F3n"},
- {"environment.variable.name", "nombre de variable de entorno"},
- {"library.name", "nombre de la biblioteca"},
- {"package.name", "nombre del paquete"},
- {"policy.type", "tipo de pol\u00EDtica"},
- {"property.name", "nombre de la propiedad"},
- {"Principal.List", "Lista de Principales"},
- {"Permission.List", "Lista de Permisos"},
- {"Code.Base", "Base de C\u00F3digo"},
- {"KeyStore.U.R.L.", "URL de Almac\u00E9n de Claves:"},
- {"KeyStore.Password.U.R.L.", "URL de Contrase\u00F1a de Almac\u00E9n de Claves:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "entradas nulas no v\u00E1lidas"},
{"actions.can.only.be.read.", "las acciones s\u00F3lo pueden 'leerse'"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "mapa de OID proporcionado nulo"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"se ha proporcionado un AccessControlContext nulo no v\u00E1lido"},
{"invalid.null.action.provided", "se ha proporcionado una acci\u00F3n nula no v\u00E1lida"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_fr.java b/jdk/src/share/classes/sun/security/util/Resources_fr.java
index 385b618..a82a2e4 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_fr.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_fr.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Option]..."},
- {"Options.", "Options :"},
- {"Use.keytool.help.for.all.available.commands",
- "Utiliser \"keytool -help\" pour toutes les commandes disponibles"},
- {"Key.and.Certificate.Management.Tool",
- "Outil de gestion de certificats et de cl\u00E9s"},
- {"Commands.", "Commandes :"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "Utiliser \"keytool -command_name -help\" pour la syntaxe de command_name"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "G\u00E9n\u00E8re une demande de certificat"}, //-certreq
- {"Changes.an.entry.s.alias",
- "Modifie l'alias d'une entr\u00E9e"}, //-changealias
- {"Deletes.an.entry",
- "Supprime une entr\u00E9e"}, //-delete
- {"Exports.certificate",
- "Exporte le certificat"}, //-exportcert
- {"Generates.a.key.pair",
- "G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "G\u00E9n\u00E8re le certificat \u00E0 partir d'une demande de certificat"}, //-gencert
- {"Generates.CRL", "G\u00E9n\u00E8re la liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importe les entr\u00E9es \u00E0 partir d'une base de donn\u00E9es d'identit\u00E9s de type JDK 1.1.x"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importe un certificat ou une cha\u00EEne de certificat"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importe une entr\u00E9e ou la totalit\u00E9 des entr\u00E9es depuis un autre fichier de cl\u00E9s"}, //-importkeystore
- {"Clones.a.key.entry",
- "Clone une entr\u00E9e de cl\u00E9"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "Modifie le mot de passe de cl\u00E9 d'une entr\u00E9e"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "R\u00E9pertorie les entr\u00E9es d'un fichier de cl\u00E9s"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Imprime le contenu d'un certificat"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Imprime le contenu d'une demande de certificat"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Imprime le contenu d'un fichier de liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "G\u00E9n\u00E8re un certificat auto-sign\u00E9"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "Modifie le mot de passe de banque d'un fichier de cl\u00E9s"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "nom d'alias de l'entr\u00E9e \u00E0 traiter"}, //-alias
- {"destination.alias",
- "alias de destination"}, //-destalias
- {"destination.key.password",
- "mot de passe de la cl\u00E9 de destination"}, //-destkeypass
- {"destination.keystore.name",
- "nom du fichier de cl\u00E9s de destination"}, //-destkeystore
- {"destination.keystore.password.protected",
- "mot de passe du fichier de cl\u00E9s de destination prot\u00E9g\u00E9"}, //-destprotected
- {"destination.keystore.provider.name",
- "nom du fournisseur du fichier de cl\u00E9s de destination"}, //-destprovidername
- {"destination.keystore.password",
- "mot de passe du fichier de cl\u00E9s de destination"}, //-deststorepass
- {"destination.keystore.type",
- "type du fichier de cl\u00E9s de destination"}, //-deststoretype
- {"distinguished.name",
- "nom distinctif"}, //-dname
- {"X.509.extension",
- "extension X.509"}, //-ext
- {"output.file.name",
- "nom du fichier de sortie"}, //-file and -outfile
- {"input.file.name",
- "nom du fichier d'entr\u00E9e"}, //-file and -infile
- {"key.algorithm.name",
- "nom de l'algorithme de cl\u00E9"}, //-keyalg
- {"key.password",
- "mot de passe de la cl\u00E9"}, //-keypass
- {"key.bit.size",
- "taille en bits de la cl\u00E9"}, //-keysize
- {"keystore.name",
- "nom du fichier de cl\u00E9s"}, //-keystore
- {"new.password",
- "nouveau mot de passe"}, //-new
- {"do.not.prompt",
- "ne pas inviter"}, //-noprompt
- {"password.through.protected.mechanism",
- "mot de passe via m\u00E9canisme prot\u00E9g\u00E9"}, //-protected
- {"provider.argument",
- "argument du fournisseur"}, //-providerarg
- {"provider.class.name",
- "nom de la classe de fournisseur"}, //-providerclass
- {"provider.name",
- "nom du fournisseur"}, //-providername
- {"provider.classpath",
- "variable d'environnement CLASSPATH du fournisseur"}, //-providerpath
- {"output.in.RFC.style",
- "sortie au style RFC"}, //-rfc
- {"signature.algorithm.name",
- "nom de l'algorithme de signature"}, //-sigalg
- {"source.alias",
- "alias source"}, //-srcalias
- {"source.key.password",
- "mot de passe de la cl\u00E9 source"}, //-srckeypass
- {"source.keystore.name",
- "nom du fichier de cl\u00E9s source"}, //-srckeystore
- {"source.keystore.password.protected",
- "mot de passe du fichier de cl\u00E9s source prot\u00E9g\u00E9"}, //-srcprotected
- {"source.keystore.provider.name",
- "nom du fournisseur du fichier de cl\u00E9s source"}, //-srcprovidername
- {"source.keystore.password",
- "mot de passe du fichier de cl\u00E9s source"}, //-srcstorepass
- {"source.keystore.type",
- "type du fichier de cl\u00E9s source"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "Port et h\u00F4te du serveur SSL"}, //-sslserver
- {"signed.jar.file",
- "fichier JAR sign\u00E9"}, //=jarfile
- {"certificate.validity.start.date.time",
- "date/heure de d\u00E9but de validit\u00E9 du certificat"}, //-startdate
- {"keystore.password",
- "mot de passe du fichier de cl\u00E9s"}, //-storepass
- {"keystore.type",
- "type du fichier de cl\u00E9s"}, //-storetype
- {"trust.certificates.from.cacerts",
- "certificats s\u00E9curis\u00E9s issus de certificats CA"}, //-trustcacerts
- {"verbose.output",
- "sortie en mode verbose"}, //-v
- {"validity.number.of.days",
- "nombre de jours de validit\u00E9"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "ID de s\u00E9rie du certificat \u00E0 r\u00E9voquer"}, //-id
- // keytool: Running part
- {"keytool.error.", "erreur keytool : "},
- {"Illegal.option.", "Option non admise : "},
- {"Illegal.value.", "Valeur non admise : "},
- {"Unknown.password.type.", "Type de mot de passe inconnu : "},
- {"Cannot.find.environment.variable.",
- "Variable d'environnement introuvable : "},
- {"Cannot.find.file.", "Fichier introuvable : "},
- {"Command.option.flag.needs.an.argument.", "L''option de commande {0} requiert un argument."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Avertissement\u00A0: les mots de passe de cl\u00E9 et de banque distincts ne sont pas pris en charge pour les fichiers de cl\u00E9s d''acc\u00E8s PKCS12. La valeur {0} sp\u00E9cifi\u00E9e par l''utilisateur est ignor\u00E9e."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore doit \u00EAtre d\u00E9fini sur NONE si -storetype est {0}"},
- {"Too.many.retries.program.terminated",
- "Trop de tentatives, fin du programme"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "Les commandes -storepasswd et -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur {0}"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "Les commandes -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur PKCS12"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "Les commandes -keypass et -new ne peuvent pas \u00EAtre sp\u00E9cifi\u00E9es si -storetype est d\u00E9fini sur {0}"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "si -protected est sp\u00E9cifi\u00E9, -storepass, -keypass et -new ne doivent pas \u00EAtre indiqu\u00E9s"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Si -srcprotected est indiqu\u00E9, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "Si le fichier de cl\u00E9s n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -storepass, -keypass et -new ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Si le fichier de cl\u00E9s source n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
- {"Illegal.startdate.value", "Valeur de date de d\u00E9but non admise"},
- {"Validity.must.be.greater.than.zero",
- "La validit\u00E9 doit \u00EAtre sup\u00E9rieure \u00E0 z\u00E9ro"},
- {"provName.not.a.provider", "{0} n''est pas un fournisseur"},
- {"Usage.error.no.command.provided", "Erreur de syntaxe\u00A0: aucune commande fournie"},
- {"Source.keystore.file.exists.but.is.empty.", "Le fichier de cl\u00E9s source existe mais il est vide : "},
- {"Please.specify.srckeystore", "Indiquez -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "-v et -rfc ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s avec la commande 'list'"},
- {"Key.password.must.be.at.least.6.characters",
- "Un mot de passe de cl\u00E9 doit comporter au moins 6 caract\u00E8res"},
- {"New.password.must.be.at.least.6.characters",
- "Le nouveau mot de passe doit comporter au moins 6 caract\u00E8res"},
- {"Keystore.file.exists.but.is.empty.",
- "Fichier de cl\u00E9s existant mais vide : "},
- {"Keystore.file.does.not.exist.",
- "Le fichier de cl\u00E9s n'existe pas : "},
- {"Must.specify.destination.alias", "L'alias de destination doit \u00EAtre sp\u00E9cifi\u00E9"},
- {"Must.specify.alias", "L'alias doit \u00EAtre sp\u00E9cifi\u00E9"},
- {"Keystore.password.must.be.at.least.6.characters",
- "Un mot de passe de fichier de cl\u00E9s doit comporter au moins 6 caract\u00E8res"},
- {"Enter.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s : "},
- {"Enter.source.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s source\u00A0: "},
- {"Enter.destination.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s de destination\u00A0: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "Le mot de passe du fichier de cl\u00E9s est trop court : il doit comporter au moins 6 caract\u00E8res"},
- {"Unknown.Entry.Type", "Type d'entr\u00E9e inconnu"},
- {"Too.many.failures.Alias.not.changed", "Trop d'erreurs. Alias non modifi\u00E9"},
- {"Entry.for.alias.alias.successfully.imported.",
- "L''entr\u00E9e de l''alias {0} a \u00E9t\u00E9 import\u00E9e."},
- {"Entry.for.alias.alias.not.imported.", "L''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Probl\u00E8me lors de l''import de l''entr\u00E9e de l''alias {0}\u00A0: {1}.\nL''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Commande d''import ex\u00E9cut\u00E9e\u00A0: {0} entr\u00E9es import\u00E9es, \u00E9chec ou annulation de {1} entr\u00E9es"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Avertissement\u00A0: l''alias {0} existant sera remplac\u00E9 dans le fichier de cl\u00E9s d''acc\u00E8s de destination"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "L''alias d''entr\u00E9e {0} existe d\u00E9j\u00E0. Voulez-vous le remplacer ? [non]\u00A0: "},
- {"Too.many.failures.try.later", "Trop d'erreurs. R\u00E9essayez plus tard"},
- {"Certification.request.stored.in.file.filename.",
- "Demande de certification stock\u00E9e dans le fichier <{0}>"},
- {"Submit.this.to.your.CA", "Soumettre \u00E0 votre CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "si l'alias n'est pas sp\u00E9cifi\u00E9, destalias, srckeypass et destkeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s"},
- {"Certificate.stored.in.file.filename.",
- "Certificat stock\u00E9 dans le fichier <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "R\u00E9ponse de certificat install\u00E9e dans le fichier de cl\u00E9s"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "R\u00E9ponse de certificat non install\u00E9e dans le fichier de cl\u00E9s"},
- {"Certificate.was.added.to.keystore",
- "Certificat ajout\u00E9 au fichier de cl\u00E9s"},
- {"Certificate.was.not.added.to.keystore",
- "Certificat non ajout\u00E9 au fichier de cl\u00E9s"},
- {".Storing.ksfname.", "[Stockage de {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} ne poss\u00E8de pas de cl\u00E9 publique (certificat)"},
- {"Cannot.derive.signature.algorithm",
- "Impossible de d\u00E9duire l'algorithme de signature"},
- {"Alias.alias.does.not.exist",
- "L''alias <{0}> n''existe pas"},
- {"Alias.alias.has.no.certificate",
- "L''alias <{0}> ne poss\u00E8de pas de certificat"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Paire de cl\u00E9s non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "G\u00E9n\u00E9ration d''une paire de cl\u00E9s {1} de {0} bits et d''un certificat auto-sign\u00E9 ({2}) d''une validit\u00E9 de {3} jours\n\tpour : {4}"},
- {"Enter.key.password.for.alias.", "Entrez le mot de passe de la cl\u00E9 pour <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(appuyez sur Entr\u00E9e s'il s'agit du mot de passe du fichier de cl\u00E9s) : "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "Le mot de passe de la cl\u00E9 est trop court : il doit comporter au moins 6 caract\u00E8res"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Trop d'erreurs. Cl\u00E9 non ajout\u00E9e au fichier de cl\u00E9s"},
- {"Destination.alias.dest.already.exists",
- "L''alias de la destination <{0}> existe d\u00E9j\u00E0"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "Le mot de passe est trop court : il doit comporter au moins 6 caract\u00E8res"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Trop d'erreurs. Entr\u00E9e de cl\u00E9 non clon\u00E9e"},
- {"key.password.for.alias.", "mot de passe de cl\u00E9 pour <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "L''entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}> existe d\u00E9j\u00E0"},
- {"Creating.keystore.entry.for.id.getName.",
- "Cr\u00E9ation d''une entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}>..."},
- {"No.entries.from.identity.database.added",
- "Aucune entr\u00E9e ajout\u00E9e \u00E0 partir de la base de donn\u00E9es d'identit\u00E9s"},
- {"Alias.name.alias", "Nom d''alias : {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Date de cr\u00E9ation : {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Type d''entr\u00E9e\u00A0: {0}"},
- {"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "},
- {"Certificate.i.1.", "Certificat[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Empreinte du certificat (SHA1) : "},
- {"Keystore.type.", "Type de fichier de cl\u00E9s : "},
- {"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9e"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9es"},
- {"Failed.to.parse.input", "L'analyse de l'entr\u00E9e a \u00E9chou\u00E9"},
- {"Empty.input", "Entr\u00E9e vide"},
- {"Not.X.509.certificate", "Pas un certificat X.509"},
- {"alias.has.no.public.key", "{0} ne poss\u00E8de pas de cl\u00E9 publique"},
- {"alias.has.no.X.509.certificate", "{0} ne poss\u00E8de pas de certificat X.509"},
- {"New.certificate.self.signed.", "Nouveau certificat (auto-sign\u00E9) :"},
- {"Reply.has.no.certificates", "La r\u00E9ponse n'a pas de certificat"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Certificat non import\u00E9, l''alias <{0}> existe d\u00E9j\u00E0"},
- {"Input.not.an.X.509.certificate", "L'entr\u00E9e n'est pas un certificat X.509"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s sous l''alias <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "Voulez-vous toujours l'ajouter ? [non] : "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s CA syst\u00E8me sous l''alias <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] : "},
- {"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] : "},
- {"YES", "Oui"},
- {"New.prompt.", "Nouveau {0} : "},
- {"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"},
- {"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "},
- {"Re.enter.new.password.", "Ressaisissez le nouveau mot de passe : "},
- {"They.don.t.match.Try.again", "Ils sont diff\u00E9rents. R\u00E9essayez."},
- {"Enter.prompt.alias.name.", "Indiquez le nom d''alias {0} : "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Saisissez le nom du nouvel alias\t(ou appuyez sur Entr\u00E9e pour annuler l'import de cette entr\u00E9e)\u00A0: "},
- {"Enter.alias.name.", "Indiquez le nom d'alias : "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(appuyez sur Entr\u00E9e si le r\u00E9sultat est identique \u00E0 <{0}>)"},
- {".PATTERN.printX509Cert",
- "Propri\u00E9taire : {0}\nEmetteur : {1}\nNum\u00E9ro de s\u00E9rie : {2}\nValide du : {3} au : {4}\nEmpreintes du certificat :\n\t MD5: {5}\n\t SHA1 : {6}\n\t SHA256 : {7}\n\t Nom de l''algorithme de signature : {8}\n\t Version : {9}"},
- {"What.is.your.first.and.last.name.",
- "Quels sont vos nom et pr\u00E9nom ?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "Quel est le nom de votre unit\u00E9 organisationnelle ?"},
- {"What.is.the.name.of.your.organization.",
- "Quel est le nom de votre entreprise ?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "Quel est le nom de votre ville de r\u00E9sidence ?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "Quel est le nom de votre \u00E9tat ou province ?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "Quel est le code pays \u00E0 deux lettres pour cette unit\u00E9 ?"},
- {"Is.name.correct.", "Est-ce {0} ?"},
- {"no", "non"},
- {"yes", "oui"},
- {"y", "o"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "L''alias <{0}> n''est associ\u00E9 \u00E0 aucune cl\u00E9"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Avertissement Avertissement Avertissement *****************"},
- {"Signer.d.", "Signataire n\u00B0%d :"},
- {"Timestamp.", "Horodatage :"},
- {"Signature.", "Signature :"},
- {"CRLs.", "Listes des certificats r\u00E9voqu\u00E9s (CRL) :"},
- {"Certificate.owner.", "Propri\u00E9taire du certificat : "},
- {"Not.a.signed.jar.file", "Fichier JAR non sign\u00E9"},
- {"No.certificate.from.the.SSL.server",
- "Aucun certificat du serveur SSL"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Cha\u00EEne de certificat incompl\u00E8te dans la r\u00E9ponse"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "La cha\u00EEne de certificat de la r\u00E9ponse ne concorde pas : "},
- {"Top.level.certificate.in.reply.",
- "Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"},
- {".is.not.trusted.", "... non s\u00E9curis\u00E9. "},
- {"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] : "},
- {"NO", "Non"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "La r\u00E9ponse au certificat et le certificat du fichier de cl\u00E9s sont identiques"},
- {"Failed.to.establish.chain.from.reply",
- "Impossible de cr\u00E9er une cha\u00EEne \u00E0 partir de la r\u00E9ponse"},
- {"n", "n"},
- {"Wrong.answer.try.again", "R\u00E9ponse incorrecte, recommencez"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "Cl\u00E9 secr\u00E8te non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Indiquez -keysize pour la g\u00E9n\u00E9ration de la cl\u00E9 secr\u00E8te"},
-
- {"Extensions.", "Extensions\u00A0: "},
- {".Empty.value.", "(Valeur vide)"},
- {"Extension.Request.", "Demande d'extension :"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "Demande de certificat PKCS #10 (version 1.0)\nSujet : %s\nCl\u00E9 publique : format %s pour la cl\u00E9 %s\n"},
- {"Unknown.keyUsage.type.", "Type keyUsage inconnu : "},
- {"Unknown.extendedkeyUsage.type.", "Type extendedkeyUsage inconnu : "},
- {"Unknown.AccessDescription.type.", "Type AccessDescription inconnu : "},
- {"Unrecognized.GeneralName.type.", "Type GeneralName non reconnu : "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Cette extension ne peut pas \u00EAtre marqu\u00E9e comme critique. "},
- {"Odd.number.of.hex.digits.found.", "Nombre impair de chiffres hexad\u00E9cimaux trouv\u00E9 : "},
- {"Unknown.extension.type.", "Type d'extension inconnu : "},
- {"command.{0}.is.ambiguous.", "commande {0} ambigu\u00EB :"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Avertissement\u00A0: il n''existe pas de cl\u00E9 publique pour l''alias {0}. V\u00E9rifiez que le fichier de cl\u00E9s d''acc\u00E8s est correctement configur\u00E9."},
- {"Warning.Class.not.found.class", "Avertissement : classe introuvable - {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Avertissement\u00A0: arguments non valides pour le constructeur\u00A0- {0}"},
- {"Illegal.Principal.Type.type", "Type de principal non admis : {0}"},
- {"Illegal.option.option", "Option non admise : {0}"},
- {"Usage.policytool.options.", "Syntaxe : policytool [options]"},
- {".file.file.policy.file.location",
- " [-file <file>] emplacement du fichier de r\u00E8gles"},
- {"New", "Nouveau"},
- {"Open", "Ouvrir"},
- {"Save", "Enregistrer"},
- {"Save.As", "Enregistrer sous"},
- {"View.Warning.Log", "Afficher le journal des avertissements"},
- {"Exit", "Quitter"},
- {"Add.Policy.Entry", "Ajouter une r\u00E8gle"},
- {"Edit.Policy.Entry", "Modifier une r\u00E8gle"},
- {"Remove.Policy.Entry", "Enlever une r\u00E8gle"},
- {"Edit", "Modifier"},
- {"Retain", "Conserver"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
-
- {"Add.Public.Key.Alias", "Ajouter un alias de cl\u00E9 publique"},
- {"Remove.Public.Key.Alias", "Enlever un alias de cl\u00E9 publique"},
- {"File", "Fichier"},
- {"KeyStore", "Fichier de cl\u00E9s"},
- {"Policy.File.", "Fichier de r\u00E8gles :"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "Impossible d''ouvrir le fichier de r\u00E8gles\u00A0: {0}: {1}"},
- {"Policy.Tool", "Policy Tool"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Des erreurs se sont produites \u00E0 l'ouverture de la configuration de r\u00E8gles. Pour plus d'informations, consultez le journal des avertissements."},
- {"Error", "Erreur"},
- {"OK", "OK"},
- {"Status", "Statut"},
- {"Warning", "Avertissement"},
- {"Permission.",
- "Droit : "},
- {"Principal.Type.", "Type de principal :"},
- {"Principal.Name.", "Nom de principal :"},
- {"Target.Name.",
- "Nom de cible : "},
- {"Actions.",
- "Actions : "},
- {"OK.to.overwrite.existing.file.filename.",
- "Remplacer le fichier existant {0} ?"},
- {"Cancel", "Annuler"},
- {"CodeBase.", "Base de code :"},
- {"SignedBy.", "Sign\u00E9 par :"},
- {"Add.Principal", "Ajouter un principal"},
- {"Edit.Principal", "Modifier un principal"},
- {"Remove.Principal", "Enlever un principal"},
- {"Principals.", "Principaux :"},
- {".Add.Permission", " Ajouter un droit"},
- {".Edit.Permission", " Modifier un droit"},
- {"Remove.Permission", "Enlever un droit"},
- {"Done", "Termin\u00E9"},
- {"KeyStore.URL.", "URL du fichier de cl\u00E9s :"},
- {"KeyStore.Type.", "Type du fichier de cl\u00E9s :"},
- {"KeyStore.Provider.", "Fournisseur du fichier de cl\u00E9s :"},
- {"KeyStore.Password.URL.", "URL du mot de passe du fichier de cl\u00E9s :"},
- {"Principals", "Principaux"},
- {".Edit.Principal.", " Modifier un principal :"},
- {".Add.New.Principal.", " Ajouter un principal :"},
- {"Permissions", "Droits"},
- {".Edit.Permission.", " Modifier un droit :"},
- {".Add.New.Permission.", " Ajouter un droit :"},
- {"Signed.By.", "Sign\u00E9 par :"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "Impossible de sp\u00E9cifier un principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"},
- {"Cannot.Specify.Principal.without.a.Name",
- "Impossible de sp\u00E9cifier un principal sans nom"},
- {"Permission.and.Target.Name.must.have.a.value",
- "Le droit et le nom de cible doivent avoir une valeur"},
- {"Remove.this.Policy.Entry.", "Enlever cette r\u00E8gle ?"},
- {"Overwrite.File", "Remplacer le fichier"},
- {"Policy.successfully.written.to.filename",
- "R\u00E8gle \u00E9crite dans {0}"},
- {"null.filename", "nom de fichier NULL"},
- {"Save.changes.", "Enregistrer les modifications ?"},
- {"Yes", "Oui"},
- {"No", "Non"},
- {"Policy.Entry", "R\u00E8gle"},
- {"Save.Changes", "Enregistrer les modifications"},
- {"No.Policy.Entry.selected", "Aucune r\u00E8gle s\u00E9lectionn\u00E9e"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "Impossible d''ouvrir le fichier de cl\u00E9s d''acc\u00E8s : {0}"},
- {"No.principal.selected", "Aucun principal s\u00E9lectionn\u00E9"},
- {"No.permission.selected", "Aucun droit s\u00E9lectionn\u00E9"},
- {"name", "nom"},
- {"configuration.type", "type de configuration"},
- {"environment.variable.name", "Nom de variable d'environnement"},
- {"library.name", "nom de biblioth\u00E8que"},
- {"package.name", "nom de package"},
- {"policy.type", "type de r\u00E8gle"},
- {"property.name", "nom de propri\u00E9t\u00E9"},
- {"Principal.List", "Liste de principaux"},
- {"Permission.List", "Liste de droits"},
- {"Code.Base", "Base de code"},
- {"KeyStore.U.R.L.", "URL du fichier de cl\u00E9s :"},
- {"KeyStore.Password.U.R.L.", "URL du mot de passe du fichier de cl\u00E9s :"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "entr\u00E9es NULL non valides"},
{"actions.can.only.be.read.", "les actions sont accessibles en lecture uniquement"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "mappage OID NULL fourni"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"AccessControlContext NULL fourni non valide"},
{"invalid.null.action.provided", "action NULL fournie non valide"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_it.java b/jdk/src/share/classes/sun/security/util/Resources_it.java
index 3d3abf0..e942f64 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_it.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_it.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Opzione]..."},
- {"Options.", "Opzioni:"},
- {"Use.keytool.help.for.all.available.commands",
- "Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"},
- {"Key.and.Certificate.Management.Tool",
- "Strumento di gestione di chiavi e certificati"},
- {"Commands.", "Comandi:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "Utilizzare \"keytool -command_name -help\" per informazioni sull'uso di command_name"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Genera una richiesta di certificato"}, //-certreq
- {"Changes.an.entry.s.alias",
- "Modifica l'alias di una voce"}, //-changealias
- {"Deletes.an.entry",
- "Elimina una voce"}, //-delete
- {"Exports.certificate",
- "Esporta il certificato"}, //-exportcert
- {"Generates.a.key.pair",
- "Genera una coppia di chiavi"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "Genera una chiave segreta"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Genera un certificato da una richiesta di certificato"}, //-gencert
- {"Generates.CRL", "Genera CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importa le voci da un database delle identit\u00E0 di tipo JDK 1.1.x"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importa un certificato o una catena di certificati"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importa una o tutte le voci da un altro keystore"}, //-importkeystore
- {"Clones.a.key.entry",
- "Duplica una voce di chiave"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "Modifica la password della chiave per una voce"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Elenca le voci in un keystore"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Visualizza i contenuti di un certificato"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Visualizza i contenuti di una richiesta di certificato"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Visualizza i contenuti di un file CRL"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Genera certificato con firma automatica"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "Modifica la password di area di memorizzazione di un keystore"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "nome alias della voce da elaborare"}, //-alias
- {"destination.alias",
- "alias di destinazione"}, //-destalias
- {"destination.key.password",
- "password chiave di destinazione"}, //-destkeypass
- {"destination.keystore.name",
- "nome keystore di destinazione"}, //-destkeystore
- {"destination.keystore.password.protected",
- "password keystore di destinazione protetta"}, //-destprotected
- {"destination.keystore.provider.name",
- "nome provider keystore di destinazione"}, //-destprovidername
- {"destination.keystore.password",
- "password keystore di destinazione"}, //-deststorepass
- {"destination.keystore.type",
- "tipo keystore di destinazione"}, //-deststoretype
- {"distinguished.name",
- "nome distinto"}, //-dname
- {"X.509.extension",
- "estensione X.509"}, //-ext
- {"output.file.name",
- "nome file di output"}, //-file and -outfile
- {"input.file.name",
- "nome file di input"}, //-file and -infile
- {"key.algorithm.name",
- "nome algoritmo chiave"}, //-keyalg
- {"key.password",
- "password chiave"}, //-keypass
- {"key.bit.size",
- "dimensione bit chiave"}, //-keysize
- {"keystore.name",
- "nome keystore"}, //-keystore
- {"new.password",
- "nuova password"}, //-new
- {"do.not.prompt",
- "non richiedere"}, //-noprompt
- {"password.through.protected.mechanism",
- "password mediante meccanismo protetto"}, //-protected
- {"provider.argument",
- "argomento provider"}, //-providerarg
- {"provider.class.name",
- "nome classe provider"}, //-providerclass
- {"provider.name",
- "nome provider"}, //-providername
- {"provider.classpath",
- "classpath provider"}, //-providerpath
- {"output.in.RFC.style",
- "output in stile RFC"}, //-rfc
- {"signature.algorithm.name",
- "nome algoritmo firma"}, //-sigalg
- {"source.alias",
- "alias origine"}, //-srcalias
- {"source.key.password",
- "password chiave di origine"}, //-srckeypass
- {"source.keystore.name",
- "nome keystore di origine"}, //-srckeystore
- {"source.keystore.password.protected",
- "password keystore di origine protetta"}, //-srcprotected
- {"source.keystore.provider.name",
- "nome provider keystore di origine"}, //-srcprovidername
- {"source.keystore.password",
- "password keystore di origine"}, //-srcstorepass
- {"source.keystore.type",
- "tipo keystore di origine"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "host e porta server SSL"}, //-sslserver
- {"signed.jar.file",
- "file jar firmato"}, //=jarfile
- {"certificate.validity.start.date.time",
- "data/ora di inizio validit\u00E0 certificato"}, //-startdate
- {"keystore.password",
- "password keystore"}, //-storepass
- {"keystore.type",
- "tipo keystore"}, //-storetype
- {"trust.certificates.from.cacerts",
- "considera sicuri i certificati da cacerts"}, //-trustcacerts
- {"verbose.output",
- "output descrittivo"}, //-v
- {"validity.number.of.days",
- "numero di giorni di validit\u00E0"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "ID seriale del certificato da revocare"}, //-id
- // keytool: Running part
- {"keytool.error.", "Errore keytool: "},
- {"Illegal.option.", "Opzione non valida: "},
- {"Illegal.value.", "Valore non valido: "},
- {"Unknown.password.type.", "Tipo di password sconosciuto: "},
- {"Cannot.find.environment.variable.",
- "Impossibile trovare la variabile di ambiente: "},
- {"Cannot.find.file.", "Impossibile trovare il file: "},
- {"Command.option.flag.needs.an.argument.", "\u00C8 necessario specificare un argomento per l''opzione di comando {0}."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Avvertenza: non sono supportate password diverse di chiave e di archivio per i keystore PKCS12. Il valore {0} specificato dall''utente verr\u00E0 ignorato."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "Se -storetype \u00E8 impostato su {0}, -keystore deve essere impostato su NONE"},
- {"Too.many.retries.program.terminated",
- "Il numero dei tentativi consentiti \u00E8 stato superato. Il programma verr\u00E0 terminato."},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "Se -storetype \u00E8 impostato su {0}, i comandi -storepasswd e -keypasswd non sono supportati"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "Se -storetype \u00E8 impostato su PKCS12 i comandi -keypasswd non vengono supportati"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "Se -storetype \u00E8 impostato su {0}, non \u00E8 possibile specificare un valore per -keypass e -new"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "Se \u00E8 specificata l'opzione -protected, le opzioni -storepass, -keypass e -new non possono essere specificate"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Se viene specificato -srcprotected, -srcstorepass e -srckeypass non dovranno essere specificati"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -storepass, -keypass e -new"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -srcstorepass e -srckeypass"},
- {"Illegal.startdate.value", "Valore di data di inizio non valido"},
- {"Validity.must.be.greater.than.zero",
- "La validit\u00E0 deve essere maggiore di zero"},
- {"provName.not.a.provider", "{0} non \u00E8 un provider"},
- {"Usage.error.no.command.provided", "Errore di utilizzo: nessun comando specificato"},
- {"Source.keystore.file.exists.but.is.empty.", "Il file keystore di origine esiste, ma \u00E8 vuoto: "},
- {"Please.specify.srckeystore", "Specificare -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "Impossibile specificare sia -v sia -rfc con il comando 'list'"},
- {"Key.password.must.be.at.least.6.characters",
- "La password della chiave deve contenere almeno 6 caratteri"},
- {"New.password.must.be.at.least.6.characters",
- "La nuova password deve contenere almeno 6 caratteri"},
- {"Keystore.file.exists.but.is.empty.",
- "Il file keystore esiste ma \u00E8 vuoto: "},
- {"Keystore.file.does.not.exist.",
- "Il file keystore non esiste: "},
- {"Must.specify.destination.alias", "\u00C8 necessario specificare l'alias di destinazione"},
- {"Must.specify.alias", "\u00C8 necessario specificare l'alias"},
- {"Keystore.password.must.be.at.least.6.characters",
- "La password del keystore deve contenere almeno 6 caratteri"},
- {"Enter.keystore.password.", "Immettere la password del keystore: "},
- {"Enter.source.keystore.password.", "Immettere la password del keystore di origine: "},
- {"Enter.destination.keystore.password.", "Immettere la password del keystore di destinazione: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "La password del keystore \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
- {"Unknown.Entry.Type", "Tipo di voce sconosciuto"},
- {"Too.many.failures.Alias.not.changed", "Numero eccessivo di errori. L'alias non \u00E8 stato modificato."},
- {"Entry.for.alias.alias.successfully.imported.",
- "La voce dell''alias {0} \u00E8 stata importata."},
- {"Entry.for.alias.alias.not.imported.", "La voce dell''alias {0} non \u00E8 stata importata."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Si \u00E8 verificato un problema durante l''importazione della voce dell''alias {0}: {1}.\nLa voce dell''alias {0} non \u00E8 stata importata."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Comando di importazione completato: {0} voce/i importata/e, {1} voce/i non importata/e o annullata/e"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Avvertenza: sovrascrittura in corso dell''alias {0} nel file keystore di destinazione"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "La voce dell''alias {0} esiste gi\u00E0. Sovrascrivere? [no]: "},
- {"Too.many.failures.try.later", "Troppi errori - riprovare"},
- {"Certification.request.stored.in.file.filename.",
- "La richiesta di certificazione \u00E8 memorizzata nel file <{0}>"},
- {"Submit.this.to.your.CA", "Sottomettere alla propria CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "Se l'alias non \u00E8 specificato, destalias, srckeypass e destkeypass non dovranno essere specificati"},
- {"Certificate.stored.in.file.filename.",
- "Il certificato \u00E8 memorizzato nel file <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "La risposta del certificato \u00E8 stata installata nel keystore"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "La risposta del certificato non \u00E8 stata installata nel keystore"},
- {"Certificate.was.added.to.keystore",
- "Il certificato \u00E8 stato aggiunto al keystore"},
- {"Certificate.was.not.added.to.keystore",
- "Il certificato non \u00E8 stato aggiunto al keystore"},
- {".Storing.ksfname.", "[Memorizzazione di {0}] in corso"},
- {"alias.has.no.public.key.certificate.",
- "{0} non dispone di chiave pubblica (certificato)"},
- {"Cannot.derive.signature.algorithm",
- "Impossibile derivare l'algoritmo di firma"},
- {"Alias.alias.does.not.exist",
- "L''alias <{0}> non esiste"},
- {"Alias.alias.has.no.certificate",
- "L''alias <{0}> non dispone di certificato"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Non \u00E8 stata generata la coppia di chiavi, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Generazione in corso di una coppia di chiavi {1} da {0} bit e di un certificato autofirmato ({2}) con una validit\u00E0 di {3} giorni\n\tper: {4}"},
- {"Enter.key.password.for.alias.", "Immettere la password della chiave per <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(INVIO se corrisponde alla password del keystore): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "La password della chiave \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Troppi errori - la chiave non \u00E8 stata aggiunta al keystore"},
- {"Destination.alias.dest.already.exists",
- "L''alias di destinazione <{0}> \u00E8 gi\u00E0 esistente"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "La password \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Numero eccessivo di errori. Il valore della chiave non \u00E8 stato copiato."},
- {"key.password.for.alias.", "password della chiave per <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "La voce del keystore per <{0}> esiste gi\u00E0"},
- {"Creating.keystore.entry.for.id.getName.",
- "Creazione della voce del keystore per <{0}> in corso..."},
- {"No.entries.from.identity.database.added",
- "Nessuna voce aggiunta dal database delle identit\u00E0"},
- {"Alias.name.alias", "Nome alias: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Data di creazione: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Tipo di voce: {0}"},
- {"Certificate.chain.length.", "Lunghezza catena certificati: "},
- {"Certificate.i.1.", "Certificato[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Impronta digitale certificato (SHA1): "},
- {"Keystore.type.", "Tipo keystore: "},
- {"Keystore.provider.", "Provider keystore: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Il keystore contiene {0,number,integer} voce"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Il keystore contiene {0,number,integer} voci"},
- {"Failed.to.parse.input", "Impossibile analizzare l'input"},
- {"Empty.input", "Input vuoto"},
- {"Not.X.509.certificate", "Il certificato non \u00E8 X.509"},
- {"alias.has.no.public.key", "{0} non dispone di chiave pubblica"},
- {"alias.has.no.X.509.certificate", "{0} non dispone di certificato X.509"},
- {"New.certificate.self.signed.", "Nuovo certificato (autofirmato):"},
- {"Reply.has.no.certificates", "La risposta non dispone di certificati"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Impossibile importare il certificato, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
- {"Input.not.an.X.509.certificate", "L'input non \u00E8 un certificato X.509"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "Il certificato esiste gi\u00E0 nel keystore con alias <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "Aggiungerlo ugualmente? [no]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "Il certificato esiste gi\u00E0 nel keystore CA con alias <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "Aggiungerlo al proprio keystore? [no]: "},
- {"Trust.this.certificate.no.", "Considerare sicuro questo certificato? [no]: "},
- {"YES", "S\u00EC"},
- {"New.prompt.", "Nuova {0}: "},
- {"Passwords.must.differ", "Le password non devono coincidere"},
- {"Re.enter.new.prompt.", "Reimmettere un nuovo valore per {0}: "},
- {"Re.enter.new.password.", "Immettere nuovamente la nuova password: "},
- {"They.don.t.match.Try.again", "Non corrispondono. Riprovare."},
- {"Enter.prompt.alias.name.", "Immettere nome alias {0}: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce): "},
- {"Enter.alias.name.", "Immettere nome alias: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(INVIO se corrisponde al nome di <{0}>"},
- {".PATTERN.printX509Cert",
- "Proprietario: {0}\nAutorit\u00E0 emittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome algoritmo firma: {8}\n\t Versione: {9}"},
- {"What.is.your.first.and.last.name.",
- "Specificare nome e cognome"},
- {"What.is.the.name.of.your.organizational.unit.",
- "Specificare il nome dell'unit\u00E0 organizzativa"},
- {"What.is.the.name.of.your.organization.",
- "Specificare il nome dell'organizzazione"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "Specificare la localit\u00E0"},
- {"What.is.the.name.of.your.State.or.Province.",
- "Specificare la provincia"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "Specificare il codice a due lettere del paese in cui si trova l'unit\u00E0"},
- {"Is.name.correct.", "Il dato {0} \u00E8 corretto?"},
- {"no", "no"},
- {"yes", "s\u00EC"},
- {"y", "s"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "All''alias <{0}> non \u00E8 associata alcuna chiave"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Avvertenza Avvertenza Avvertenza *****************"},
- {"Signer.d.", "Firmatario #%d:"},
- {"Timestamp.", "Indicatore orario:"},
- {"Signature.", "Firma:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "Proprietario certificato: "},
- {"Not.a.signed.jar.file", "Non \u00E8 un file jar firmato"},
- {"No.certificate.from.the.SSL.server",
- "Nessun certificato dal server SSL"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "La risposta del certificato non contiene la chiave pubblica per <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Catena dei certificati incompleta nella risposta"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "La catena dei certificati nella risposta non verifica: "},
- {"Top.level.certificate.in.reply.",
- "Certificato di primo livello nella risposta:\n"},
- {".is.not.trusted.", "...non \u00E8 considerato sicuro. "},
- {"Install.reply.anyway.no.", "Installare la risposta? [no]: "},
- {"NO", "No"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "Le chiavi pubbliche nella risposta e nel keystore non corrispondono"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "La risposta del certificato e il certificato nel keystore sono identici"},
- {"Failed.to.establish.chain.from.reply",
- "Impossibile stabilire la catena dalla risposta"},
- {"n", "n"},
- {"Wrong.answer.try.again", "Risposta errata, riprovare"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "La chiave segreta non \u00E8 stata generata; l''alias <{0}> esiste gi\u00E0"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Specificare il valore -keysize per la generazione della chiave segreta"},
-
- {"Extensions.", "Estensioni: "},
- {".Empty.value.", "(valore vuoto)"},
- {"Extension.Request.", "Richiesta di estensione:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %s\nChiave pubblica: %s formato %s chiave\n"},
- {"Unknown.keyUsage.type.", "Tipo keyUsage sconosciuto: "},
- {"Unknown.extendedkeyUsage.type.", "Tipo extendedkeyUsage sconosciuto: "},
- {"Unknown.AccessDescription.type.", "Tipo AccessDescription sconosciuto: "},
- {"Unrecognized.GeneralName.type.", "Tipo GeneralName non riconosciuto: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Impossibile contrassegnare questa estensione come critica. "},
- {"Odd.number.of.hex.digits.found.", "\u00C8 stato trovato un numero dispari di cifre esadecimali: "},
- {"Unknown.extension.type.", "Tipo di estensione sconosciuto: "},
- {"command.{0}.is.ambiguous.", "il comando {0} \u00E8 ambiguo:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Avvertenza: non esiste una chiave pubblica per l''alias {0}. Verificare che il keystore sia configurato correttamente."},
- {"Warning.Class.not.found.class", "Avvertenza: classe non trovata: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Avvertenza: argomento o argomenti non validi per il costruttore {0}"},
- {"Illegal.Principal.Type.type", "Tipo principal non valido: {0}"},
- {"Illegal.option.option", "Opzione non valida: {0}"},
- {"Usage.policytool.options.", "Utilizzo: policytool [opzioni]"},
- {".file.file.policy.file.location",
- " [-file <file>] posizione del file dei criteri"},
- {"New", "Nuovo"},
- {"Open", "Apri"},
- {"Save", "Salva"},
- {"Save.As", "Salva con nome"},
- {"View.Warning.Log", "Visualizza registro avvertenze"},
- {"Exit", "Esci"},
- {"Add.Policy.Entry", "Aggiungi voce dei criteri"},
- {"Edit.Policy.Entry", "Modifica voce dei criteri"},
- {"Remove.Policy.Entry", "Rimuovi voce dei criteri"},
- {"Edit", "Modifica"},
- {"Retain", "Mantieni"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Avvertenza: il nome file pu\u00F2 includere barre rovesciate con escape. Non \u00E8 necessario eseguire l'escape delle barre rovesciate (se necessario lo strumento esegue l'escape dei caratteri al momento della scrittura del contenuto dei criteri nell'area di memorizzazione persistente).\n\nFare click su Mantieni per conservare il nome immesso, oppure su Modifica per modificare il nome."},
-
- {"Add.Public.Key.Alias", "Aggiungi alias chiave pubblica"},
- {"Remove.Public.Key.Alias", "Rimuovi alias chiave pubblica"},
- {"File", "File"},
- {"KeyStore", "Keystore"},
- {"Policy.File.", "File dei criteri:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "Impossibile aprire il file di criteri {0}: {1}"},
- {"Policy.Tool", "Strumento criteri"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Si sono verificati errori durante l'apertura della configurazione dei criteri. Consultare il registro delle avvertenze per ulteriori informazioni."},
- {"Error", "Errore"},
- {"OK", "OK"},
- {"Status", "Stato"},
- {"Warning", "Avvertenza"},
- {"Permission.",
- "Autorizzazione: "},
- {"Principal.Type.", "Tipo principal:"},
- {"Principal.Name.", "Nome principal:"},
- {"Target.Name.",
- "Nome destinazione: "},
- {"Actions.",
- "Azioni: "},
- {"OK.to.overwrite.existing.file.filename.",
- "OK per sovrascrivere il file {0}?"},
- {"Cancel", "Annulla"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Aggiungi principal"},
- {"Edit.Principal", "Modifica principal"},
- {"Remove.Principal", "Rimuovi principal"},
- {"Principals.", "Principal:"},
- {".Add.Permission", " Aggiungi autorizzazione"},
- {".Edit.Permission", " Modifica autorizzazione"},
- {"Remove.Permission", "Rimuovi autorizzazione"},
- {"Done", "Fine"},
- {"KeyStore.URL.", "URL keystore:"},
- {"KeyStore.Type.", "Tipo keystore:"},
- {"KeyStore.Provider.", "Provider keystore:"},
- {"KeyStore.Password.URL.", "URL password keystore:"},
- {"Principals", "Principal:"},
- {".Edit.Principal.", " Modifica principal:"},
- {".Add.New.Principal.", " Aggiungi nuovo principal:"},
- {"Permissions", "Autorizzazioni"},
- {".Edit.Permission.", " Modifica autorizzazione:"},
- {".Add.New.Permission.", " Aggiungi nuova autorizzazione:"},
- {"Signed.By.", "Firmato da:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "Impossibile specificare principal con una classe carattere jolly senza un nome carattere jolly"},
- {"Cannot.Specify.Principal.without.a.Name",
- "Impossibile specificare principal senza un nome"},
- {"Permission.and.Target.Name.must.have.a.value",
- "L'autorizzazione e il nome destinazione non possono essere nulli"},
- {"Remove.this.Policy.Entry.", "Rimuovere questa voce dei criteri?"},
- {"Overwrite.File", "Sovrascrivi file"},
- {"Policy.successfully.written.to.filename",
- "I criteri sono stati scritti in {0}"},
- {"null.filename", "nome file nullo"},
- {"Save.changes.", "Salvare le modifiche?"},
- {"Yes", "S\u00EC"},
- {"No", "No"},
- {"Policy.Entry", "Voce dei criteri"},
- {"Save.Changes", "Salva le modifiche"},
- {"No.Policy.Entry.selected", "Nessuna voce dei criteri selezionata"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "Impossibile aprire il keystore: {0}"},
- {"No.principal.selected", "Nessun principal selezionato"},
- {"No.permission.selected", "Nessuna autorizzazione selezionata"},
- {"name", "nome"},
- {"configuration.type", "tipo di configurazione"},
- {"environment.variable.name", "nome variabile ambiente"},
- {"library.name", "nome libreria"},
- {"package.name", "nome package"},
- {"policy.type", "tipo di criteri"},
- {"property.name", "nome propriet\u00E0"},
- {"Principal.List", "Lista principal"},
- {"Permission.List", "Lista autorizzazioni"},
- {"Code.Base", "Codebase"},
- {"KeyStore.U.R.L.", "URL keystore:"},
- {"KeyStore.Password.U.R.L.", "URL password keystore:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "input nullo/i non valido/i"},
{"actions.can.only.be.read.", "le azioni possono essere solamente 'lette'"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "specificata mappa OID null"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"fornito un valore nullo non valido per AccessControlContext"},
{"invalid.null.action.provided", "fornita un'azione nulla non valida"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_ja.java b/jdk/src/share/classes/sun/security/util/Resources_ja.java
index 27643dd..65d9289 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_ja.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_ja.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [\u30AA\u30D7\u30B7\u30E7\u30F3]..."},
- {"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"},
- {"Use.keytool.help.for.all.available.commands",
- "\u4F7F\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306B\u3064\u3044\u3066\u306F\"keytool -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Key.and.Certificate.Management.Tool",
- "\u30AD\u30FC\u304A\u3088\u3073\u8A3C\u660E\u66F8\u7BA1\u7406\u30C4\u30FC\u30EB"},
- {"Commands.", "\u30B3\u30DE\u30F3\u30C9:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "command_name\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306F\"keytool -command_name -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-certreq
- {"Changes.an.entry.s.alias",
- "\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-changealias
- {"Deletes.an.entry",
- "\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059"}, //-delete
- {"Exports.certificate",
- "\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert
- {"Generates.a.key.pair",
- "\u9375\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "\u79D8\u5BC6\u9375\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u304B\u3089\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencert
- {"Generates.CRL", "CRL\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "JDK 1.1.x-style\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "\u8A3C\u660E\u66F8\u307E\u305F\u306F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "\u5225\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u304B\u30891\u3064\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importkeystore
- {"Clones.a.key.entry",
- "\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u3092\u4F5C\u6210\u3057\u307E\u3059"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\u30A8\u30F3\u30C8\u30EA\u306E\u9375\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059"}, //-list
- {"Prints.the.content.of.a.certificate",
- "\u8A3C\u660E\u66F8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "CRL\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "\u51E6\u7406\u3059\u308B\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D"}, //-alias
- {"destination.alias",
- "\u51FA\u529B\u5148\u306E\u5225\u540D"}, //-destalias
- {"destination.key.password",
- "\u51FA\u529B\u5148\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destkeypass
- {"destination.keystore.name",
- "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-destkeystore
- {"destination.keystore.password.protected",
- "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destprotected
- {"destination.keystore.provider.name",
- "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-destprovidername
- {"destination.keystore.password",
- "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-deststorepass
- {"destination.keystore.type",
- "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-deststoretype
- {"distinguished.name",
- "\u8B58\u5225\u540D"}, //-dname
- {"X.509.extension",
- "X.509\u62E1\u5F35"}, //-ext
- {"output.file.name",
- "\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -outfile
- {"input.file.name",
- "\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -infile
- {"key.algorithm.name",
- "\u9375\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-keyalg
- {"key.password",
- "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-keypass
- {"key.bit.size",
- "\u9375\u306E\u30D3\u30C3\u30C8\u30FB\u30B5\u30A4\u30BA"}, //-keysize
- {"keystore.name",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-keystore
- {"new.password",
- "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-new
- {"do.not.prompt",
- "\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u306A\u3044"}, //-noprompt
- {"password.through.protected.mechanism",
- "\u4FDD\u8B77\u30E1\u30AB\u30CB\u30BA\u30E0\u306B\u3088\u308B\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-protected
- {"provider.argument",
- "\u30D7\u30ED\u30D0\u30A4\u30C0\u5F15\u6570"}, //-providerarg
- {"provider.class.name",
- "\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u540D"}, //-providerclass
- {"provider.name",
- "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-providername
- {"provider.classpath",
- "\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9"}, //-providerpath
- {"output.in.RFC.style",
- "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
- {"signature.algorithm.name",
- "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
- {"source.alias",
- "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
- {"source.key.password",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srckeypass
- {"source.keystore.name",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-srckeystore
- {"source.keystore.password.protected",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcprotected
- {"source.keystore.provider.name",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-srcprovidername
- {"source.keystore.password",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcstorepass
- {"source.keystore.type",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL\u30B5\u30FC\u30D0\u30FC\u306E\u30DB\u30B9\u30C8\u3068\u30DD\u30FC\u30C8"}, //-sslserver
- {"signed.jar.file",
- "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB"}, //=jarfile
- {"certificate.validity.start.date.time",
- "\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u958B\u59CB\u65E5\u6642"}, //-startdate
- {"keystore.password",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-storepass
- {"keystore.type",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-storetype
- {"trust.certificates.from.cacerts",
- "cacerts\u304B\u3089\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3059\u308B"}, //-trustcacerts
- {"verbose.output",
- "\u8A73\u7D30\u51FA\u529B"}, //-v
- {"validity.number.of.days",
- "\u59A5\u5F53\u6027\u65E5\u6570"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "\u5931\u52B9\u3059\u308B\u8A3C\u660E\u66F8\u306E\u30B7\u30EA\u30A2\u30EBID"}, //-id
- // keytool: Running part
- {"keytool.error.", "keytool\u30A8\u30E9\u30FC: "},
- {"Illegal.option.", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: "},
- {"Illegal.value.", "\u4E0D\u6B63\u306A\u5024: "},
- {"Unknown.password.type.", "\u4E0D\u660E\u306A\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30BF\u30A4\u30D7: "},
- {"Cannot.find.environment.variable.",
- "\u74B0\u5883\u5909\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
- {"Cannot.find.file.", "\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
- {"Command.option.flag.needs.an.argument.", "\u30B3\u30DE\u30F3\u30C9\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002"},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "\u8B66\u544A: PKCS12\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u306F\u3001\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u7570\u306A\u308B\u72B6\u6CC1\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F{0}\u306E\u5024\u306F\u7121\u8996\u3057\u307E\u3059\u3002"},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keystore\u306FNONE\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Too.many.retries.program.terminated",
- "\u518D\u8A66\u884C\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "-storetype\u304C{0}\u306E\u5834\u5408\u3001-storepasswd\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "-storetype\u304CPKCS12\u306E\u5834\u5408\u3001-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keypass\u3068-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "-protected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "-srcprotected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"Illegal.startdate.value", "startdate\u5024\u304C\u7121\u52B9\u3067\u3059"},
- {"Validity.must.be.greater.than.zero",
- "\u59A5\u5F53\u6027\u306F\u30BC\u30ED\u3088\u308A\u5927\u304D\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"provName.not.a.provider", "{0}\u306F\u30D7\u30ED\u30D0\u30A4\u30C0\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
- {"Usage.error.no.command.provided", "\u4F7F\u7528\u30A8\u30E9\u30FC: \u30B3\u30DE\u30F3\u30C9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
- {"Source.keystore.file.exists.but.is.empty.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u5B58\u5728\u3057\u307E\u3059\u304C\u7A7A\u3067\u3059: "},
- {"Please.specify.srckeystore", "-srckeystore\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "'list'\u30B3\u30DE\u30F3\u30C9\u306B-v\u3068-rfc\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
- {"Key.password.must.be.at.least.6.characters",
- "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"New.password.must.be.at.least.6.characters",
- "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Keystore.file.exists.but.is.empty.",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u7A7A\u3067\u3059: "},
- {"Keystore.file.does.not.exist.",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u305B\u3093: "},
- {"Must.specify.destination.alias", "\u51FA\u529B\u5148\u306E\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Must.specify.alias", "\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Keystore.password.must.be.at.least.6.characters",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Enter.keystore.password.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"Enter.source.keystore.password.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"Enter.destination.keystore.password.", "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Unknown.Entry.Type", "\u4E0D\u660E\u306A\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7"},
- {"Too.many.failures.Alias.not.changed", "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u5225\u540D\u306F\u5909\u66F4\u3055\u308C\u307E\u305B\u3093"},
- {"Entry.for.alias.alias.successfully.imported.",
- "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002"},
- {"Entry.for.alias.alias.not.imported.", "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}\u3002\n\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B3\u30DE\u30F3\u30C9\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F: {0}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002{1}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u305F\u304B\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "\u8B66\u544A: \u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u65E2\u5B58\u306E\u5225\u540D{0}\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3044\u307E\u3059"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "\u65E2\u5B58\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D{0}\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
- {"Too.many.failures.try.later", "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u5F8C\u3067\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Certification.request.stored.in.file.filename.",
- "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
- {"Submit.this.to.your.CA", "\u3053\u308C\u3092CA\u306B\u63D0\u51FA\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "\u5225\u540D\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u5225\u540D\u3001\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304A\u3088\u3073\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
- {"Certificate.stored.in.file.filename.",
- "\u8A3C\u660E\u66F8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
- {"Certificate.reply.was.installed.in.keystore",
- "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3057\u305F"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
- {"Certificate.was.added.to.keystore",
- "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F"},
- {"Certificate.was.not.added.to.keystore",
- "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
- {".Storing.ksfname.", "[{0}\u3092\u683C\u7D0D\u4E2D]"},
- {"alias.has.no.public.key.certificate.",
- "{0}\u306B\u306F\u516C\u958B\u9375(\u8A3C\u660E\u66F8)\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"Cannot.derive.signature.algorithm",
- "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093"},
- {"Alias.alias.does.not.exist",
- "\u5225\u540D<{0}>\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
- {"Alias.alias.has.no.certificate",
- "\u5225\u540D<{0}>\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "\u9375\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u9375\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
- {"Enter.key.password.for.alias.", "<{0}>\u306E\u9375\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Too.many.failures.key.not.added.to.keystore",
- "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u9375\u306F\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
- {"Destination.alias.dest.already.exists",
- "\u51FA\u529B\u5148\u306E\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Too.many.failures.Key.entry.not.cloned",
- "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u306F\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
- {"key.password.for.alias.", "<{0}>\u306E\u9375\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"},
- {"Keystore.entry.for.id.getName.already.exists",
- "<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Creating.keystore.entry.for.id.getName.",
- "<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u4F5C\u6210\u4E2D..."},
- {"No.entries.from.identity.database.added",
- "\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u8FFD\u52A0\u3055\u308C\u305F\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093"},
- {"Alias.name.alias", "\u5225\u540D: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "\u4F5C\u6210\u65E5: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0},{1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7: {0}"},
- {"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "},
- {"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA1): "},
- {"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "},
- {"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
- {"Your.keystore.contains.keyStore.size.entries",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
- {"Failed.to.parse.input", "\u5165\u529B\u306E\u69CB\u6587\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F"},
- {"Empty.input", "\u5165\u529B\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"Not.X.509.certificate", "X.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
- {"alias.has.no.public.key", "{0}\u306B\u306F\u516C\u958B\u9375\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"alias.has.no.X.509.certificate", "{0}\u306B\u306FX.509\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"New.certificate.self.signed.", "\u65B0\u3057\u3044\u8A3C\u660E\u66F8(\u81EA\u5DF1\u7F72\u540D\u578B):"},
- {"Reply.has.no.certificates", "\u5FDC\u7B54\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "\u8A3C\u660E\u66F8\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Input.not.an.X.509.certificate", "\u5165\u529B\u306FX.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Do.you.still.want.to.add.it.no.",
- "\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30B7\u30B9\u30C6\u30E0\u898F\u6A21\u306ECA\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]: "},
- {"Trust.this.certificate.no.", "\u3053\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]: "},
- {"YES", "\u306F\u3044"},
- {"New.prompt.", "\u65B0\u898F{0}: "},
- {"Passwords.must.differ", "\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u7570\u306A\u3063\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Re.enter.new.prompt.", "\u65B0\u898F{0}\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"Re.enter.new.password.", "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"They.don.t.match.Try.again", "\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Enter.prompt.alias.name.", "{0}\u306E\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "\u65B0\u3057\u3044\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\t(\u3053\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u53D6\u308A\u6D88\u3059\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044): "},
- {"Enter.alias.name.", "\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(<{0}>\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044)"},
- {".PATTERN.printX509Cert",
- "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3}\u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {8}\n\t \u30D0\u30FC\u30B8\u30E7\u30F3: {9}"},
- {"What.is.your.first.and.last.name.",
- "\u59D3\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"What.is.the.name.of.your.organizational.unit.",
- "\u7D44\u7E54\u5358\u4F4D\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"What.is.the.name.of.your.organization.",
- "\u7D44\u7E54\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "\u90FD\u5E02\u540D\u307E\u305F\u306F\u5730\u57DF\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"What.is.the.name.of.your.State.or.Province.",
- "\u90FD\u9053\u5E9C\u770C\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "\u3053\u306E\u5358\u4F4D\u306B\u8A72\u5F53\u3059\u308B2\u6587\u5B57\u306E\u56FD\u30B3\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"Is.name.correct.", "{0}\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002"},
- {"no", "\u3044\u3044\u3048"},
- {"yes", "\u306F\u3044"},
- {"y", "y"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "\u5225\u540D<{0}>\u306B\u306F\u9375\u304C\u3042\u308A\u307E\u305B\u3093"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"},
-
- {".WARNING.WARNING.WARNING.",
- "*****************\u8B66\u544A \u8B66\u544A \u8B66\u544A*****************"},
- {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
- {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
- {"Signature.", "\u7F72\u540D:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
- {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
- {"No.certificate.from.the.SSL.server",
- "SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u9375\u306F\u542B\u307E\u308C\u307E\u305B\u3093"},
- {"Incomplete.certificate.chain.in.reply",
- "\u5FDC\u7B54\u3057\u305F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u4E0D\u5B8C\u5168\u3067\u3059"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "\u5FDC\u7B54\u3057\u305F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093: "},
- {"Top.level.certificate.in.reply.",
- "\u5FDC\u7B54\u3057\u305F\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u306E\u8A3C\u660E\u66F8:\n"},
- {".is.not.trusted.", "... \u306F\u4FE1\u983C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 "},
- {"Install.reply.anyway.no.", "\u5FDC\u7B54\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]: "},
- {"NO", "\u3044\u3044\u3048"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "\u5FDC\u7B54\u3057\u305F\u516C\u958B\u9375\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "\u8A3C\u660E\u66F8\u5FDC\u7B54\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u8A3C\u660E\u66F8\u304C\u540C\u3058\u3067\u3059"},
- {"Failed.to.establish.chain.from.reply",
- "\u5FDC\u7B54\u304B\u3089\u9023\u9396\u3092\u78BA\u7ACB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F"},
- {"n", "n"},
- {"Wrong.answer.try.again", "\u5FDC\u7B54\u304C\u9593\u9055\u3063\u3066\u3044\u307E\u3059\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "\u79D8\u5BC6\u9375\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
- {"Please.provide.keysize.for.secret.key.generation",
- "\u79D8\u5BC6\u9375\u306E\u751F\u6210\u6642\u306B\u306F -keysize\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-
- {"Extensions.", "\u62E1\u5F35: "},
- {".Empty.value.", "(\u7A7A\u306E\u5024)"},
- {"Extension.Request.", "\u62E1\u5F35\u30EA\u30AF\u30A8\u30B9\u30C8:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8(\u30D0\u30FC\u30B8\u30E7\u30F31.0)\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8: %s\n\u516C\u958B\u9375: %s \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 %s \u30AD\u30FC\n"},
- {"Unknown.keyUsage.type.", "\u4E0D\u660E\u306AkeyUsage\u30BF\u30A4\u30D7: "},
- {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u306AextendedkeyUsage\u30BF\u30A4\u30D7: "},
- {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u306AAccessDescription\u30BF\u30A4\u30D7: "},
- {"Unrecognized.GeneralName.type.", "\u8A8D\u8B58\u3055\u308C\u306A\u3044GeneralName\u30BF\u30A4\u30D7: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "\u3053\u306E\u62E1\u5F35\u306F\u30AF\u30EA\u30C6\u30A3\u30AB\u30EB\u3068\u3057\u3066\u30DE\u30FC\u30AF\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3002 "},
- {"Odd.number.of.hex.digits.found.", "\u5947\u6570\u306E16\u9032\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: "},
- {"Unknown.extension.type.", "\u4E0D\u660E\u306A\u62E1\u5F35\u30BF\u30A4\u30D7: "},
- {"command.{0}.is.ambiguous.", "\u30B3\u30DE\u30F3\u30C9{0}\u306F\u3042\u3044\u307E\u3044\u3067\u3059:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "\u8B66\u544A: \u5225\u540D{0}\u306E\u516C\u958B\u9375\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u6B63\u3057\u304F\u69CB\u6210\u3055\u308C\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"Warning.Class.not.found.class", "\u8B66\u544A: \u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "\u8B66\u544A: \u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}"},
- {"Illegal.Principal.Type.type", "\u4E0D\u6B63\u306A\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30BF\u30A4\u30D7: {0}"},
- {"Illegal.option.option", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}"},
- {"Usage.policytool.options.", "\u4F7F\u7528\u65B9\u6CD5: policytool [options]"},
- {".file.file.policy.file.location",
- " [-file <file>] \u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240"},
- {"New", "\u65B0\u898F"},
- {"Open", "\u958B\u304F"},
- {"Save", "\u4FDD\u5B58"},
- {"Save.As", "\u5225\u540D\u4FDD\u5B58"},
- {"View.Warning.Log", "\u8B66\u544A\u30ED\u30B0\u306E\u8868\u793A"},
- {"Exit", "\u7D42\u4E86"},
- {"Add.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u8FFD\u52A0"},
- {"Edit.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u7DE8\u96C6"},
- {"Remove.Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u524A\u9664"},
- {"Edit", "\u7DE8\u96C6"},
- {"Retain", "\u4FDD\u6301"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "\u8B66\u544A: \u30D5\u30A1\u30A4\u30EB\u540D\u306B\u30A8\u30B9\u30B1\u30FC\u30D7\u3055\u308C\u305F\u30D0\u30C3\u30AF\u30B9\u30E9\u30C3\u30B7\u30E5\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30D0\u30C3\u30AF\u30B9\u30E9\u30C3\u30B7\u30E5\u6587\u5B57\u3092\u30A8\u30B9\u30B1\u30FC\u30D7\u3059\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093(\u30C4\u30FC\u30EB\u306F\u30DD\u30EA\u30B7\u30FC\u5185\u5BB9\u3092\u6C38\u7D9A\u30B9\u30C8\u30A2\u306B\u66F8\u304D\u8FBC\u3080\u3068\u304D\u306B\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u6587\u5B57\u3092\u30A8\u30B9\u30B1\u30FC\u30D7\u3057\u307E\u3059)\u3002\n\n\u5165\u529B\u6E08\u306E\u540D\u524D\u3092\u4FDD\u6301\u3059\u308B\u306B\u306F\u300C\u4FDD\u6301\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3001\u540D\u524D\u3092\u7DE8\u96C6\u3059\u308B\u306B\u306F\u300C\u7DE8\u96C6\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-
- {"Add.Public.Key.Alias", "\u516C\u958B\u9375\u306E\u5225\u540D\u306E\u8FFD\u52A0"},
- {"Remove.Public.Key.Alias", "\u516C\u958B\u9375\u306E\u5225\u540D\u3092\u524A\u9664"},
- {"File", "\u30D5\u30A1\u30A4\u30EB"},
- {"KeyStore", "\u30AD\u30FC\u30B9\u30C8\u30A2"},
- {"Policy.File.", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "\u30DD\u30EA\u30B7\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F: {0}: {1}"},
- {"Policy.Tool", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30C4\u30FC\u30EB"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "\u30DD\u30EA\u30B7\u30FC\u69CB\u6210\u3092\u958B\u304F\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u8A73\u7D30\u306F\u8B66\u544A\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
- {"Error", "\u30A8\u30E9\u30FC"},
- {"OK", "OK"},
- {"Status", "\u72B6\u614B"},
- {"Warning", "\u8B66\u544A"},
- {"Permission.",
- "\u30A2\u30AF\u30BB\u30B9\u6A29: "},
- {"Principal.Type.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30BF\u30A4\u30D7:"},
- {"Principal.Name.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u540D\u524D:"},
- {"Target.Name.",
- "\u30BF\u30FC\u30B2\u30C3\u30C8\u540D: "},
- {"Actions.",
- "\u30A2\u30AF\u30B7\u30E7\u30F3: "},
- {"OK.to.overwrite.existing.file.filename.",
- "\u65E2\u5B58\u306E\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002"},
- {"Cancel", "\u53D6\u6D88"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u8FFD\u52A0"},
- {"Edit.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u7DE8\u96C6"},
- {"Remove.Principal", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u524A\u9664"},
- {"Principals.", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB:"},
- {".Add.Permission", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u8FFD\u52A0"},
- {".Edit.Permission", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u7DE8\u96C6"},
- {"Remove.Permission", "\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u524A\u9664"},
- {"Done", "\u5B8C\u4E86"},
- {"KeyStore.URL.", "\u30AD\u30FC\u30B9\u30C8\u30A2URL:"},
- {"KeyStore.Type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7:"},
- {"KeyStore.Provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0:"},
- {"KeyStore.Password.URL.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9URL:"},
- {"Principals", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB"},
- {".Edit.Principal.", " \u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u7DE8\u96C6:"},
- {".Add.New.Principal.", " \u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u65B0\u898F\u8FFD\u52A0:"},
- {"Permissions", "\u30A2\u30AF\u30BB\u30B9\u6A29"},
- {".Edit.Permission.", " \u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u7DE8\u96C6:"},
- {".Add.New.Permission.", " \u65B0\u898F\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u8FFD\u52A0:"},
- {"Signed.By.", "\u7F72\u540D\u8005:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
- {"Cannot.Specify.Principal.without.a.Name",
- "\u540D\u524D\u3092\u4F7F\u7528\u305B\u305A\u306B\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
- {"Permission.and.Target.Name.must.have.a.value",
- "\u30A2\u30AF\u30BB\u30B9\u6A29\u3068\u30BF\u30FC\u30B2\u30C3\u30C8\u540D\u306F\u3001\u5024\u3092\u4FDD\u6301\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
- {"Remove.this.Policy.Entry.", "\u3053\u306E\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059\u304B\u3002"},
- {"Overwrite.File", "\u30D5\u30A1\u30A4\u30EB\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059"},
- {"Policy.successfully.written.to.filename",
- "\u30DD\u30EA\u30B7\u30FC\u306E{0}\u3078\u306E\u66F8\u8FBC\u307F\u306B\u6210\u529F\u3057\u307E\u3057\u305F"},
- {"null.filename", "\u30D5\u30A1\u30A4\u30EB\u540D\u304Cnull\u3067\u3059"},
- {"Save.changes.", "\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059\u304B\u3002"},
- {"Yes", "\u306F\u3044"},
- {"No", "\u3044\u3044\u3048"},
- {"Policy.Entry", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA"},
- {"Save.Changes", "\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059"},
- {"No.Policy.Entry.selected", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "\u30AD\u30FC\u30B9\u30C8\u30A2{0}\u3092\u958B\u3051\u307E\u305B\u3093"},
- {"No.principal.selected", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
- {"No.permission.selected", "\u30A2\u30AF\u30BB\u30B9\u6A29\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
- {"name", "\u540D\u524D"},
- {"configuration.type", "\u69CB\u6210\u30BF\u30A4\u30D7"},
- {"environment.variable.name", "\u74B0\u5883\u5909\u6570\u540D"},
- {"library.name", "\u30E9\u30A4\u30D6\u30E9\u30EA\u540D"},
- {"package.name", "\u30D1\u30C3\u30B1\u30FC\u30B8\u540D"},
- {"policy.type", "\u30DD\u30EA\u30B7\u30FC\u30FB\u30BF\u30A4\u30D7"},
- {"property.name", "\u30D7\u30ED\u30D1\u30C6\u30A3\u540D"},
- {"Principal.List", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306E\u30EA\u30B9\u30C8"},
- {"Permission.List", "\u30A2\u30AF\u30BB\u30B9\u6A29\u306E\u30EA\u30B9\u30C8"},
- {"Code.Base", "\u30B3\u30FC\u30C9\u30FB\u30D9\u30FC\u30B9"},
- {"KeyStore.U.R.L.", "\u30AD\u30FC\u30B9\u30C8\u30A2U R L:"},
- {"KeyStore.Password.U.R.L.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9U R L:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "null\u306E\u5165\u529B\u306F\u7121\u52B9\u3067\u3059"},
{"actions.can.only.be.read.", "\u30A2\u30AF\u30B7\u30E7\u30F3\u306F'\u8AAD\u8FBC\u307F'\u306E\u307F\u53EF\u80FD\u3067\u3059"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "null\u306EOID\u30DE\u30C3\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"\u7121\u52B9\u306Anull AccessControlContext\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
{"invalid.null.action.provided", "\u7121\u52B9\u306Anull\u30A2\u30AF\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_ko.java b/jdk/src/share/classes/sun/security/util/Resources_ko.java
index d1ec744..3968919 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_ko.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_ko.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [\uC635\uC158]..."},
- {"Options.", "\uC635\uC158:"},
- {"Use.keytool.help.for.all.available.commands",
- "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"},
- {"Key.and.Certificate.Management.Tool",
- "\uD0A4 \uBC0F \uC778\uC99D\uC11C \uAD00\uB9AC \uD234"},
- {"Commands.", "\uBA85\uB839:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "command_name \uC0AC\uC6A9\uBC95\uC5D0 \"keytool -command_name -help\" \uC0AC\uC6A9"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "\uC778\uC99D\uC11C \uC694\uCCAD\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-certreq
- {"Changes.an.entry.s.alias",
- "\uD56D\uBAA9\uC758 \uBCC4\uCE6D\uC744 \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-changealias
- {"Deletes.an.entry",
- "\uD56D\uBAA9\uC744 \uC0AD\uC81C\uD569\uB2C8\uB2E4."}, //-delete
- {"Exports.certificate",
- "\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert
- {"Generates.a.key.pair",
- "\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "\uC778\uC99D\uC11C \uC694\uCCAD\uC5D0\uC11C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencert
- {"Generates.CRL", "CRL\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "JDK 1.1.x \uC2A4\uD0C0\uC77C ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "\uC778\uC99D\uC11C \uB610\uB294 \uC778\uC99D\uC11C \uCCB4\uC778\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "\uB2E4\uB978 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uD558\uB098 \uB610\uB294 \uBAA8\uB4E0 \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importkeystore
- {"Clones.a.key.entry",
- "\uD0A4 \uD56D\uBAA9\uC744 \uBCF5\uC81C\uD569\uB2C8\uB2E4."}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\uD56D\uBAA9\uC758 \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uD56D\uBAA9\uC744 \uB098\uC5F4\uD569\uB2C8\uB2E4."}, //-list
- {"Prints.the.content.of.a.certificate",
- "\uC778\uC99D\uC11C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "\uC778\uC99D\uC11C \uC694\uCCAD\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "CRL \uD30C\uC77C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "\uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "\uCC98\uB9AC\uD560 \uD56D\uBAA9\uC758 \uBCC4\uCE6D \uC774\uB984"}, //-alias
- {"destination.alias",
- "\uB300\uC0C1 \uBCC4\uCE6D"}, //-destalias
- {"destination.key.password",
- "\uB300\uC0C1 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-destkeypass
- {"destination.keystore.name",
- "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-destkeystore
- {"destination.keystore.password.protected",
- "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-destprotected
- {"destination.keystore.provider.name",
- "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-destprovidername
- {"destination.keystore.password",
- "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-deststorepass
- {"destination.keystore.type",
- "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-deststoretype
- {"distinguished.name",
- "\uC2DD\uBCC4 \uC774\uB984"}, //-dname
- {"X.509.extension",
- "X.509 \uD655\uC7A5"}, //-ext
- {"output.file.name",
- "\uCD9C\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -outfile
- {"input.file.name",
- "\uC785\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -infile
- {"key.algorithm.name",
- "\uD0A4 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-keyalg
- {"key.password",
- "\uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-keypass
- {"key.bit.size",
- "\uD0A4 \uBE44\uD2B8 \uD06C\uAE30"}, //-keysize
- {"keystore.name",
- "\uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-keystore
- {"new.password",
- "\uC0C8 \uBE44\uBC00\uBC88\uD638"}, //-new
- {"do.not.prompt",
- "\uD655\uC778\uD558\uC9C0 \uC54A\uC74C"}, //-noprompt
- {"password.through.protected.mechanism",
- "\uBCF4\uD638\uB418\uB294 \uBA54\uCEE4\uB2C8\uC998\uC744 \uD1B5\uD55C \uBE44\uBC00\uBC88\uD638"}, //-protected
- {"provider.argument",
- "\uC81C\uACF5\uC790 \uC778\uC218"}, //-providerarg
- {"provider.class.name",
- "\uC81C\uACF5\uC790 \uD074\uB798\uC2A4 \uC774\uB984"}, //-providerclass
- {"provider.name",
- "\uC81C\uACF5\uC790 \uC774\uB984"}, //-providername
- {"provider.classpath",
- "\uC81C\uACF5\uC790 \uD074\uB798\uC2A4 \uACBD\uB85C"}, //-providerpath
- {"output.in.RFC.style",
- "RFC \uC2A4\uD0C0\uC77C\uC758 \uCD9C\uB825"}, //-rfc
- {"signature.algorithm.name",
- "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-sigalg
- {"source.alias",
- "\uC18C\uC2A4 \uBCC4\uCE6D"}, //-srcalias
- {"source.key.password",
- "\uC18C\uC2A4 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-srckeypass
- {"source.keystore.name",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-srckeystore
- {"source.keystore.password.protected",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-srcprotected
- {"source.keystore.provider.name",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-srcprovidername
- {"source.keystore.password",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-srcstorepass
- {"source.keystore.type",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL \uC11C\uBC84 \uD638\uC2A4\uD2B8 \uBC0F \uD3EC\uD2B8"}, //-sslserver
- {"signed.jar.file",
- "\uC11C\uBA85\uB41C jar \uD30C\uC77C"}, //=jarfile
- {"certificate.validity.start.date.time",
- "\uC778\uC99D\uC11C \uC720\uD6A8 \uAE30\uAC04 \uC2DC\uC791 \uB0A0\uC9DC/\uC2DC\uAC04"}, //-startdate
- {"keystore.password",
- "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-storepass
- {"keystore.type",
- "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-storetype
- {"trust.certificates.from.cacerts",
- "cacerts\uC758 \uBCF4\uC548 \uC778\uC99D\uC11C"}, //-trustcacerts
- {"verbose.output",
- "\uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825"}, //-v
- {"validity.number.of.days",
- "\uC720\uD6A8 \uAE30\uAC04 \uC77C \uC218"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "\uCCA0\uD68C\uD560 \uC778\uC99D\uC11C\uC758 \uC77C\uB828 ID"}, //-id
- // keytool: Running part
- {"keytool.error.", "keytool \uC624\uB958: "},
- {"Illegal.option.", "\uC798\uBABB\uB41C \uC635\uC158: "},
- {"Illegal.value.", "\uC798\uBABB\uB41C \uAC12: "},
- {"Unknown.password.type.", "\uC54C \uC218 \uC5C6\uB294 \uBE44\uBC00\uBC88\uD638 \uC720\uD615: "},
- {"Cannot.find.environment.variable.",
- "\uD658\uACBD \uBCC0\uC218\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
- {"Cannot.find.file.", "\uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
- {"Command.option.flag.needs.an.argument.", "\uBA85\uB839 \uC635\uC158 {0}\uC5D0 \uC778\uC218\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "\uACBD\uACE0: \uB2E4\uB978 \uC800\uC7A5\uC18C \uBC0F \uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 PKCS12 KeyStores\uC5D0 \uB300\uD574 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C {0} \uAC12\uC744 \uBB34\uC2DC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keystore\uB294 NONE\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Too.many.retries.program.terminated",
- "\uC7AC\uC2DC\uB3C4 \uD69F\uC218\uAC00 \uB108\uBB34 \uB9CE\uC544 \uD504\uB85C\uADF8\uB7A8\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -storepasswd \uBC0F -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "-storetype\uC774 PKCS12\uC778 \uACBD\uC6B0 -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "-protected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "-srcprotected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "\uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"Illegal.startdate.value", "startdate \uAC12\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Validity.must.be.greater.than.zero",
- "\uC720\uD6A8 \uAE30\uAC04\uC740 0\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4."},
- {"provName.not.a.provider", "{0}\uC740(\uB294) \uC81C\uACF5\uC790\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
- {"Usage.error.no.command.provided", "\uC0AC\uC6A9\uBC95 \uC624\uB958: \uBA85\uB839\uC744 \uC785\uB825\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Source.keystore.file.exists.but.is.empty.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
- {"Please.specify.srckeystore", "-srckeystore\uB97C \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624."},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "'list' \uBA85\uB839\uC5D0 -v\uC640 -rfc\uB97C \uD568\uAED8 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"Key.password.must.be.at.least.6.characters",
- "\uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"New.password.must.be.at.least.6.characters",
- "\uC0C8 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Keystore.file.exists.but.is.empty.",
- "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
- {"Keystore.file.does.not.exist.",
- "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC74C: "},
- {"Must.specify.destination.alias", "\uB300\uC0C1 \uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
- {"Must.specify.alias", "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
- {"Keystore.password.must.be.at.least.6.characters",
- "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Enter.keystore.password.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
- {"Enter.source.keystore.password.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
- {"Enter.destination.keystore.password.", "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Unknown.Entry.Type", "\uC54C \uC218 \uC5C6\uB294 \uD56D\uBAA9 \uC720\uD615"},
- {"Too.many.failures.Alias.not.changed", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uBCC4\uCE6D\uC774 \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Entry.for.alias.alias.successfully.imported.",
- "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Entry.for.alias.alias.not.imported.", "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD558\uB294 \uC911 \uBB38\uC81C \uBC1C\uC0DD: {1}.\n{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "\uC784\uD3EC\uD2B8 \uBA85\uB839 \uC644\uB8CC: \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB41C \uD56D\uBAA9\uC740 {0}\uAC1C, \uC2E4\uD328\uD558\uAC70\uB098 \uCDE8\uC18C\uB41C \uD56D\uBAA9\uC740 {1}\uAC1C\uC785\uB2C8\uB2E4."},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "\uACBD\uACE0: \uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uAE30\uC874 \uBCC4\uCE6D {0}\uC744(\uB97C) \uACB9\uCCD0 \uC4F0\uB294 \uC911"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "\uAE30\uC874 \uD56D\uBAA9 \uBCC4\uCE6D {0}\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4. \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
- {"Too.many.failures.try.later", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uB098\uC911\uC5D0 \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
- {"Certification.request.stored.in.file.filename.",
- "\uC778\uC99D \uC694\uCCAD\uC774 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Submit.this.to.your.CA", "CA\uC5D0\uAC8C \uC81C\uCD9C\uD558\uC2ED\uC2DC\uC624."},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC740 \uACBD\uC6B0 destalias, srckeypass \uBC0F destkeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
- {"Certificate.stored.in.file.filename.",
- "\uC778\uC99D\uC11C\uAC00 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Certificate.reply.was.installed.in.keystore",
- "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Certificate.reply.was.not.installed.in.keystore",
- "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Certificate.was.added.to.keystore",
- "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
- {"Certificate.was.not.added.to.keystore",
- "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {".Storing.ksfname.", "[{0}\uC744(\uB97C) \uC800\uC7A5\uD558\uB294 \uC911]"},
- {"alias.has.no.public.key.certificate.",
- "{0}\uC5D0 \uACF5\uC6A9 \uD0A4(\uC778\uC99D\uC11C)\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Cannot.derive.signature.algorithm",
- "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998\uC744 \uD30C\uC0DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Alias.alias.does.not.exist",
- "<{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
- {"Alias.alias.has.no.certificate",
- "<{0}> \uBCC4\uCE6D\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "\uD0A4 \uC30D\uC774 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "\uB2E4\uC74C\uC5D0 \uB300\uD574 \uC720\uD6A8 \uAE30\uAC04\uC774 {3}\uC77C\uC778 {0}\uBE44\uD2B8 {1} \uD0A4 \uC30D \uBC0F \uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C({2})\uB97C \uC0DD\uC131\uD558\uB294 \uC911\n\t: {4}"},
- {"Enter.key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {".RETURN.if.same.as.keystore.password.",
- "\t(\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uC640 \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "\uD0A4 \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Too.many.failures.key.not.added.to.keystore",
- "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uD0A4\uAC00 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"Destination.alias.dest.already.exists",
- "\uB300\uC0C1 \uBCC4\uCE6D <{0}>\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "\uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Too.many.failures.Key.entry.not.cloned",
- "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uD0A4 \uD56D\uBAA9\uC774 \uBCF5\uC81C\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
- {"key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638"},
- {"Keystore.entry.for.id.getName.already.exists",
- "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Creating.keystore.entry.for.id.getName.",
- "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC744 \uC0DD\uC131\uD558\uB294 \uC911..."},
- {"No.entries.from.identity.database.added",
- "ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uCD94\uAC00\uB41C \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Alias.name.alias", "\uBCC4\uCE6D \uC774\uB984: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "\uC0DD\uC131 \uB0A0\uC9DC: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "\uD56D\uBAA9 \uC720\uD615: {0}"},
- {"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "},
- {"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA1): "},
- {"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "},
- {"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
- {"Your.keystore.contains.keyStore.size.entries",
- "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
- {"Failed.to.parse.input", "\uC785\uB825\uAC12\uC758 \uAD6C\uBB38 \uBD84\uC11D\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
- {"Empty.input", "\uC785\uB825\uAC12\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
- {"Not.X.509.certificate", "X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
- {"alias.has.no.public.key", "{0}\uC5D0 \uACF5\uC6A9 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"alias.has.no.X.509.certificate", "{0}\uC5D0 X.509 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"New.certificate.self.signed.", "\uC0C8 \uC778\uC99D\uC11C(\uC790\uCCB4 \uC11C\uBA85):"},
- {"Reply.has.no.certificates", "\uD68C\uC2E0\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Certificate.not.imported.alias.alias.already.exists",
- "\uC778\uC99D\uC11C\uAC00 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Input.not.an.X.509.certificate", "\uC785\uB825\uC774 X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC758 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Do.you.still.want.to.add.it.no.",
- "\uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC5D0 \uC788\uB294 \uC2DC\uC2A4\uD15C \uCC28\uC6D0\uC758 CA \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\uACE0\uC720\uD55C \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
- {"Trust.this.certificate.no.", "\uC774 \uC778\uC99D\uC11C\uB97C \uC2E0\uB8B0\uD569\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
- {"YES", "\uC608"},
- {"New.prompt.", "\uC0C8 {0}: "},
- {"Passwords.must.differ", "\uBE44\uBC00\uBC88\uD638\uB294 \uB2EC\uB77C\uC57C \uD569\uB2C8\uB2E4."},
- {"Re.enter.new.prompt.", "\uC0C8 {0} \uB2E4\uC2DC \uC785\uB825: "},
- {"Re.enter.new.password.", "\uC0C8 \uBE44\uBC00\uBC88\uD638 \uB2E4\uC2DC \uC785\uB825: "},
- {"They.don.t.match.Try.again", "\uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
- {"Enter.prompt.alias.name.", "{0} \uBCC4\uCE6D \uC774\uB984 \uC785\uB825: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "\uC0C8 \uBCC4\uCE6D \uC774\uB984 \uC785\uB825\t(\uC774 \uD56D\uBAA9\uC5D0 \uB300\uD55C \uC784\uD3EC\uD2B8\uB97C \uCDE8\uC18C\uD558\uB824\uBA74 Enter \uD0A4\uB97C \uB204\uB984): "},
- {"Enter.alias.name.", "\uBCC4\uCE6D \uC774\uB984 \uC785\uB825: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(<{0}>\uACFC(\uC640) \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984)"},
- {".PATTERN.printX509Cert",
- "\uC18C\uC720\uC790: {0}\n\uBC1C\uD589\uC790: {1}\n\uC77C\uB828 \uBC88\uD638: {2}\n\uC801\uD569\uD55C \uC2DC\uC791 \uB0A0\uC9DC: {3}, \uC885\uB8CC \uB0A0\uC9DC: {4}\n\uC778\uC99D\uC11C \uC9C0\uBB38:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984: {8}\n\t \uBC84\uC804: {9}"},
- {"What.is.your.first.and.last.name.",
- "\uC774\uB984\uACFC \uC131\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {"What.is.the.name.of.your.organizational.unit.",
- "\uC870\uC9C1 \uB2E8\uC704 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {"What.is.the.name.of.your.organization.",
- "\uC870\uC9C1 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {"What.is.the.name.of.your.City.or.Locality.",
- "\uAD6C/\uAD70/\uC2DC \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "\uC2DC/\uB3C4 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "\uC774 \uC870\uC9C1\uC758 \uB450 \uC790\uB9AC \uAD6D\uAC00 \uCF54\uB4DC\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
- {"Is.name.correct.", "{0}\uC774(\uAC00) \uB9DE\uC2B5\uB2C8\uAE4C?"},
- {"no", "\uC544\uB2C8\uC624"},
- {"yes", "\uC608"},
- {"y", "y"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "<{0}> \uBCC4\uCE6D\uC5D0 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."},
-
- {".WARNING.WARNING.WARNING.",
- "***************** \uACBD\uACE0 \uACBD\uACE0 \uACBD\uACE0 *****************"},
- {"Signer.d.", "\uC11C\uBA85\uC790 #%d:"},
- {"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"},
- {"Signature.", "\uC11C\uBA85:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "\uC778\uC99D\uC11C \uC18C\uC720\uC790: "},
- {"Not.a.signed.jar.file", "\uC11C\uBA85\uB41C jar \uD30C\uC77C\uC774 \uC544\uB2D9\uB2C8\uB2E4."},
- {"No.certificate.from.the.SSL.server",
- "SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
- {"Incomplete.certificate.chain.in.reply",
- "\uD68C\uC2E0\uC5D0 \uBD88\uC644\uC804\uD55C \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uC788\uC2B5\uB2C8\uB2E4."},
- {"Certificate.chain.in.reply.does.not.verify.",
- "\uD68C\uC2E0\uC758 \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uD655\uC778\uB418\uC9C0 \uC54A\uC74C: "},
- {"Top.level.certificate.in.reply.",
- "\uD68C\uC2E0\uC5D0 \uCD5C\uC0C1\uC704 \uB808\uBCA8 \uC778\uC99D\uC11C\uAC00 \uC788\uC74C:\n"},
- {".is.not.trusted.", "...\uC744(\uB97C) \uC2E0\uB8B0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
- {"Install.reply.anyway.no.", "\uD68C\uC2E0\uC744 \uC124\uCE58\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]: "},
- {"NO", "\uC544\uB2C8\uC624"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uACF5\uC6A9 \uD0A4\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uC778\uC99D\uC11C\uAC00 \uB3D9\uC77C\uD569\uB2C8\uB2E4."},
- {"Failed.to.establish.chain.from.reply",
- "\uD68C\uC2E0\uC758 \uCCB4\uC778 \uC124\uC815\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
- {"n", "n"},
- {"Wrong.answer.try.again", "\uC798\uBABB\uB41C \uC751\uB2F5\uC785\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "\uBCF4\uC548 \uD0A4\uAC00 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
- {"Please.provide.keysize.for.secret.key.generation",
- "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD558\uB824\uBA74 -keysize\uB97C \uC81C\uACF5\uD558\uC2ED\uC2DC\uC624."},
-
- {"Extensions.", "\uD655\uC7A5: "},
- {".Empty.value.", "(\uBE44\uC5B4 \uC788\uB294 \uAC12)"},
- {"Extension.Request.", "\uD655\uC7A5 \uC694\uCCAD:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10 \uC778\uC99D\uC11C \uC694\uCCAD(1.0 \uBC84\uC804)\n\uC81C\uBAA9: %s\n\uACF5\uC6A9 \uD0A4: %s \uD615\uC2DD %s \uD0A4\n"},
- {"Unknown.keyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 keyUsage \uC720\uD615: "},
- {"Unknown.extendedkeyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 extendedkeyUsage \uC720\uD615: "},
- {"Unknown.AccessDescription.type.", "\uC54C \uC218 \uC5C6\uB294 AccessDescription \uC720\uD615: "},
- {"Unrecognized.GeneralName.type.", "\uC54C \uC218 \uC5C6\uB294 GeneralName \uC720\uD615: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "\uC774 \uD655\uC7A5\uC740 \uC911\uC694\uD55C \uAC83\uC73C\uB85C \uD45C\uC2DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
- {"Odd.number.of.hex.digits.found.", "\uD640\uC218 \uAC1C\uC758 16\uC9C4\uC218\uAC00 \uBC1C\uACAC\uB428: "},
- {"Unknown.extension.type.", "\uC54C \uC218 \uC5C6\uB294 \uD655\uC7A5 \uC720\uD615: "},
- {"command.{0}.is.ambiguous.", "{0} \uBA85\uB839\uC774 \uBAA8\uD638\uD568:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "\uACBD\uACE0: {0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uD0A4 \uC800\uC7A5\uC18C\uAC00 \uC81C\uB300\uB85C \uAD6C\uC131\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
- {"Warning.Class.not.found.class", "\uACBD\uACE0: \uD074\uB798\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "\uACBD\uACE0: \uC0DD\uC131\uC790\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uC778\uC218: {0}"},
- {"Illegal.Principal.Type.type", "\uC798\uBABB\uB41C \uC8FC\uCCB4 \uC720\uD615: {0}"},
- {"Illegal.option.option", "\uC798\uBABB\uB41C \uC635\uC158: {0}"},
- {"Usage.policytool.options.", "\uC0AC\uC6A9\uBC95: policytool [options]"},
- {".file.file.policy.file.location",
- " [-file <file>] \uC815\uCC45 \uD30C\uC77C \uC704\uCE58"},
- {"New", "\uC0C8\uB85C \uB9CC\uB4E4\uAE30"},
- {"Open", "\uC5F4\uAE30"},
- {"Save", "\uC800\uC7A5"},
- {"Save.As", "\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5"},
- {"View.Warning.Log", "\uACBD\uACE0 \uB85C\uADF8 \uBCF4\uAE30"},
- {"Exit", "\uC885\uB8CC"},
- {"Add.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uCD94\uAC00"},
- {"Edit.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uD3B8\uC9D1"},
- {"Remove.Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9 \uC81C\uAC70"},
- {"Edit", "\uD3B8\uC9D1"},
- {"Retain", "\uC720\uC9C0"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "\uACBD\uACE0: \uD30C\uC77C \uC774\uB984\uC5D0 \uC774\uC2A4\uCF00\uC774\uD504\uB41C \uBC31\uC2AC\uB798\uC2DC \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uBC31\uC2AC\uB798\uC2DC \uBB38\uC790\uB294 \uC774\uC2A4\uCF00\uC774\uD504\uD560 \uD544\uC694\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \uC601\uAD6C \uC800\uC7A5\uC18C\uC5D0 \uC815\uCC45 \uCF58\uD150\uCE20\uB97C \uC4F8 \uB54C \uD544\uC694\uC5D0 \uB530\uB77C \uC790\uB3D9\uC73C\uB85C \uBB38\uC790\uAC00 \uC774\uC2A4\uCF00\uC774\uD504\uB429\uB2C8\uB2E4.\n\n\uC785\uB825\uB41C \uC774\uB984\uC744 \uADF8\uB300\uB85C \uC720\uC9C0\uD558\uB824\uBA74 [\uC720\uC9C0]\uB97C \uB204\uB974\uACE0, \uC774\uB984\uC744 \uD3B8\uC9D1\uD558\uB824\uBA74 [\uD3B8\uC9D1]\uC744 \uB204\uB974\uC2ED\uC2DC\uC624."},
-
- {"Add.Public.Key.Alias", "\uACF5\uC6A9 \uD0A4 \uBCC4\uCE6D \uCD94\uAC00"},
- {"Remove.Public.Key.Alias", "\uACF5\uC6A9 \uD0A4 \uBCC4\uCE6D \uC81C\uAC70"},
- {"File", "\uD30C\uC77C"},
- {"KeyStore", "\uD0A4 \uC800\uC7A5\uC18C"},
- {"Policy.File.", "\uC815\uCC45 \uD30C\uC77C:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "\uC815\uCC45 \uD30C\uC77C\uC744 \uC5F4 \uC218 \uC5C6\uC74C: {0}: {1}"},
- {"Policy.Tool", "\uC815\uCC45 \uD234"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "\uC815\uCC45 \uAD6C\uC131\uC744 \uC5EC\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC790\uC138\uD55C \uB0B4\uC6A9\uC740 \uACBD\uACE0 \uB85C\uADF8\uB97C \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
- {"Error", "\uC624\uB958"},
- {"OK", "\uD655\uC778"},
- {"Status", "\uC0C1\uD0DC"},
- {"Warning", "\uACBD\uACE0"},
- {"Permission.",
- "\uAD8C\uD55C: "},
- {"Principal.Type.", "\uC8FC\uCCB4 \uC720\uD615:"},
- {"Principal.Name.", "\uC8FC\uCCB4 \uC774\uB984:"},
- {"Target.Name.",
- "\uB300\uC0C1 \uC774\uB984: "},
- {"Actions.",
- "\uC791\uC5C5: "},
- {"OK.to.overwrite.existing.file.filename.",
- "\uAE30\uC874 \uD30C\uC77C {0}\uC744(\uB97C) \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C?"},
- {"Cancel", "\uCDE8\uC18C"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "\uC8FC\uCCB4 \uCD94\uAC00"},
- {"Edit.Principal", "\uC8FC\uCCB4 \uD3B8\uC9D1"},
- {"Remove.Principal", "\uC8FC\uCCB4 \uC81C\uAC70"},
- {"Principals.", "\uC8FC\uCCB4:"},
- {".Add.Permission", " \uAD8C\uD55C \uCD94\uAC00"},
- {".Edit.Permission", " \uAD8C\uD55C \uD3B8\uC9D1"},
- {"Remove.Permission", "\uAD8C\uD55C \uC81C\uAC70"},
- {"Done", "\uC644\uB8CC"},
- {"KeyStore.URL.", "\uD0A4 \uC800\uC7A5\uC18C URL:"},
- {"KeyStore.Type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615:"},
- {"KeyStore.Provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790:"},
- {"KeyStore.Password.URL.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 URL:"},
- {"Principals", "\uC8FC\uCCB4"},
- {".Edit.Principal.", " \uC8FC\uCCB4 \uD3B8\uC9D1:"},
- {".Add.New.Principal.", " \uC0C8 \uC8FC\uCCB4 \uCD94\uAC00:"},
- {"Permissions", "\uAD8C\uD55C"},
- {".Edit.Permission.", " \uAD8C\uD55C \uD3B8\uC9D1:"},
- {".Add.New.Permission.", " \uC0C8 \uAD8C\uD55C \uCD94\uAC00:"},
- {"Signed.By.", "\uC11C\uBA85\uC790:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Cannot.Specify.Principal.without.a.Name",
- "\uC774\uB984 \uC5C6\uC774 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Permission.and.Target.Name.must.have.a.value",
- "\uAD8C\uD55C\uACFC \uB300\uC0C1 \uC774\uB984\uC758 \uAC12\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
- {"Remove.this.Policy.Entry.", "\uC774 \uC815\uCC45 \uD56D\uBAA9\uC744 \uC81C\uAC70\uD558\uACA0\uC2B5\uB2C8\uAE4C?"},
- {"Overwrite.File", "\uD30C\uC77C \uACB9\uCCD0\uC4F0\uAE30"},
- {"Policy.successfully.written.to.filename",
- "{0}\uC5D0 \uC131\uACF5\uC801\uC73C\uB85C \uC815\uCC45\uC744 \uC37C\uC2B5\uB2C8\uB2E4."},
- {"null.filename", "\uB110 \uD30C\uC77C \uC774\uB984"},
- {"Save.changes.", "\uBCC0\uACBD \uC0AC\uD56D\uC744 \uC800\uC7A5\uD558\uACA0\uC2B5\uB2C8\uAE4C?"},
- {"Yes", "\uC608"},
- {"No", "\uC544\uB2C8\uC624"},
- {"Policy.Entry", "\uC815\uCC45 \uD56D\uBAA9"},
- {"Save.Changes", "\uBCC0\uACBD \uC0AC\uD56D \uC800\uC7A5"},
- {"No.Policy.Entry.selected", "\uC120\uD0DD\uB41C \uC815\uCC45 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"Unable.to.open.KeyStore.ex.toString.",
- "\uD0A4 \uC800\uC7A5\uC18C\uB97C \uC5F4 \uC218 \uC5C6\uC74C: {0}"},
- {"No.principal.selected", "\uC120\uD0DD\uB41C \uC8FC\uCCB4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"No.permission.selected", "\uC120\uD0DD\uB41C \uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
- {"name", "\uC774\uB984"},
- {"configuration.type", "\uAD6C\uC131 \uC720\uD615"},
- {"environment.variable.name", "\uD658\uACBD \uBCC0\uC218 \uC774\uB984"},
- {"library.name", "\uB77C\uC774\uBE0C\uB7EC\uB9AC \uC774\uB984"},
- {"package.name", "\uD328\uD0A4\uC9C0 \uC774\uB984"},
- {"policy.type", "\uC815\uCC45 \uC720\uD615"},
- {"property.name", "\uC18D\uC131 \uC774\uB984"},
- {"Principal.List", "\uC8FC\uCCB4 \uBAA9\uB85D"},
- {"Permission.List", "\uAD8C\uD55C \uBAA9\uB85D"},
- {"Code.Base", "\uCF54\uB4DC \uBCA0\uC774\uC2A4"},
- {"KeyStore.U.R.L.", "\uD0A4 \uC800\uC7A5\uC18C URL:"},
- {"KeyStore.Password.U.R.L.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 URL:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "\uB110 \uC785\uB825\uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4."},
{"actions.can.only.be.read.", "\uC791\uC5C5\uC740 '\uC77D\uAE30' \uC804\uC6A9\uC785\uB2C8\uB2E4."},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "\uB110 OID \uB9F5\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"\uBD80\uC801\uD569\uD55C \uB110 AccessControlContext\uAC00 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
{"invalid.null.action.provided", "\uBD80\uC801\uD569\uD55C \uB110 \uC791\uC5C5\uC774 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
index 698827f..317a1cb 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Op\u00E7\u00E3o]..."},
- {"Options.", "Op\u00E7\u00F5es:"},
- {"Use.keytool.help.for.all.available.commands",
- "Use \"keytool -help\" para todos os comandos dispon\u00EDveis"},
- {"Key.and.Certificate.Management.Tool",
- "Ferramenta de Gerenciamento de Chave e Certificado"},
- {"Commands.", "Comandos:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "Use \"keytool -command_name -help\" para uso de command_name"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Gera uma solicita\u00E7\u00E3o de certificado"}, //-certreq
- {"Changes.an.entry.s.alias",
- "Altera um alias de entrada"}, //-changealias
- {"Deletes.an.entry",
- "Deleta uma entrada"}, //-delete
- {"Exports.certificate",
- "Exporta o certificado"}, //-exportcert
- {"Generates.a.key.pair",
- "Gera um par de chaves"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "Gera uma chave Secreta"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert
- {"Generates.CRL", "Gera CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importa entradas de um banco de dados de identidade JDK 1.1.x-style"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importa um certificado ou uma cadeia de certificados"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importa uma ou todas as entradas de outra \u00E1rea de armazenamento de chaves"}, //-importkeystore
- {"Clones.a.key.entry",
- "Clona uma entrada de chave"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "Altera a senha da chave de uma entrada"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Lista entradas em uma \u00E1rea de armazenamento de chaves"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Imprime o conte\u00FAdo de um certificado"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Imprime o conte\u00FAdo de uma solicita\u00E7\u00E3o de certificado"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Imprime o conte\u00FAdo de um arquivo CRL"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Gera um certificado autoassinado"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "Altera a senha de armazenamento de uma \u00E1rea de armazenamento de chaves"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "nome do alias da entrada a ser processada"}, //-alias
- {"destination.alias",
- "alias de destino"}, //-destalias
- {"destination.key.password",
- "senha da chave de destino"}, //-destkeypass
- {"destination.keystore.name",
- "nome da \u00E1rea de armazenamento de chaves de destino"}, //-destkeystore
- {"destination.keystore.password.protected",
- "senha protegida da \u00E1rea de armazenamento de chaves de destino"}, //-destprotected
- {"destination.keystore.provider.name",
- "nome do fornecedor da \u00E1rea de armazenamento de chaves de destino"}, //-destprovidername
- {"destination.keystore.password",
- "senha da \u00E1rea de armazenamento de chaves de destino"}, //-deststorepass
- {"destination.keystore.type",
- "tipo de \u00E1rea de armazenamento de chaves de destino"}, //-deststoretype
- {"distinguished.name",
- "nome distinto"}, //-dname
- {"X.509.extension",
- "extens\u00E3o X.509"}, //-ext
- {"output.file.name",
- "nome do arquivo de sa\u00EDda"}, //-file and -outfile
- {"input.file.name",
- "nome do arquivo de entrada"}, //-file and -infile
- {"key.algorithm.name",
- "nome do algoritmo da chave"}, //-keyalg
- {"key.password",
- "senha da chave"}, //-keypass
- {"key.bit.size",
- "tamanho do bit da chave"}, //-keysize
- {"keystore.name",
- "nome da \u00E1rea de armazenamento de chaves"}, //-keystore
- {"new.password",
- "nova senha"}, //-new
- {"do.not.prompt",
- "n\u00E3o perguntar"}, //-noprompt
- {"password.through.protected.mechanism",
- "senha por meio de mecanismo protegido"}, //-protected
- {"provider.argument",
- "argumento do fornecedor"}, //-providerarg
- {"provider.class.name",
- "nome da classe do fornecedor"}, //-providerclass
- {"provider.name",
- "nome do fornecedor"}, //-providername
- {"provider.classpath",
- "classpath do fornecedor"}, //-providerpath
- {"output.in.RFC.style",
- "sa\u00EDda no estilo RFC"}, //-rfc
- {"signature.algorithm.name",
- "nome do algoritmo de assinatura"}, //-sigalg
- {"source.alias",
- "alias de origem"}, //-srcalias
- {"source.key.password",
- "senha da chave de origem"}, //-srckeypass
- {"source.keystore.name",
- "nome da \u00E1rea de armazenamento de chaves de origem"}, //-srckeystore
- {"source.keystore.password.protected",
- "senha protegida da \u00E1rea de armazenamento de chaves de origem"}, //-srcprotected
- {"source.keystore.provider.name",
- "nome do fornecedor da \u00E1rea de armazenamento de chaves de origem"}, //-srcprovidername
- {"source.keystore.password",
- "senha da \u00E1rea de armazenamento de chaves de origem"}, //-srcstorepass
- {"source.keystore.type",
- "tipo de \u00E1rea de armazenamento de chaves de origem"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "porta e host do servidor SSL"}, //-sslserver
- {"signed.jar.file",
- "arquivo jar assinado"}, //=jarfile
- {"certificate.validity.start.date.time",
- "data/hora inicial de validade do certificado"}, //-startdate
- {"keystore.password",
- "senha da \u00E1rea de armazenamento de chaves"}, //-storepass
- {"keystore.type",
- "tipo de \u00E1rea de armazenamento de chaves"}, //-storetype
- {"trust.certificates.from.cacerts",
- "certificados confi\u00E1veis do cacerts"}, //-trustcacerts
- {"verbose.output",
- "sa\u00EDda detalhada"}, //-v
- {"validity.number.of.days",
- "n\u00FAmero de dias da validade"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "ID de s\u00E9rie do certificado a ser revogado"}, //-id
- // keytool: Running part
- {"keytool.error.", "erro de keytool: "},
- {"Illegal.option.", "Op\u00E7\u00E3o inv\u00E1lida: "},
- {"Illegal.value.", "Valor inv\u00E1lido: "},
- {"Unknown.password.type.", "Tipo de senha desconhecido: "},
- {"Cannot.find.environment.variable.",
- "N\u00E3o \u00E9 poss\u00EDvel localizar a vari\u00E1vel do ambiente: "},
- {"Cannot.find.file.", "N\u00E3o \u00E9 poss\u00EDvel localizar o arquivo: "},
- {"Command.option.flag.needs.an.argument.", "A op\u00E7\u00E3o de comando {0} precisa de um argumento."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Advert\u00EAncia: Senhas de chave e de armazenamento diferentes n\u00E3o suportadas para KeyStores PKCS12. Ignorando valor {0} especificado pelo usu\u00E1rio."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore deve ser NONE se -storetype for {0}"},
- {"Too.many.retries.program.terminated",
- "Excesso de tentativas de repeti\u00E7\u00E3o; programa finalizado"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "comandos -storepasswd e -keypasswd n\u00E3o suportados se -storetype for {0}"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "comandos -keypasswd n\u00E3o suportados se -storetype for PKCS12"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-keypass e -new n\u00E3o podem ser especificados se -storetype for {0}"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "se -protected for especificado, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "se -srcprotected for especificado, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "se a \u00E1rea de armazenamento de chaves n\u00E3o estiver protegida por senha, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "se a \u00E1rea de armazenamento de chaves de origem n\u00E3o estiver protegida por senha, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
- {"Illegal.startdate.value", "valor da data inicial inv\u00E1lido"},
- {"Validity.must.be.greater.than.zero",
- "A validade deve ser maior do que zero"},
- {"provName.not.a.provider", "{0} n\u00E3o \u00E9 um fornecedor"},
- {"Usage.error.no.command.provided", "Erro de uso: nenhum comando fornecido"},
- {"Source.keystore.file.exists.but.is.empty.", "O arquivo da \u00E1rea de armazenamento de chaves de origem existe, mas est\u00E1 vazio: "},
- {"Please.specify.srckeystore", "Especifique -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "N\u00E3o devem ser especificados -v e -rfc com o comando 'list'"},
- {"Key.password.must.be.at.least.6.characters",
- "A senha da chave deve ter, no m\u00EDnimo, 6 caracteres"},
- {"New.password.must.be.at.least.6.characters",
- "A nova senha deve ter, no m\u00EDnimo, 6 caracteres"},
- {"Keystore.file.exists.but.is.empty.",
- "O arquivo da \u00E1rea de armazenamento de chaves existe, mas est\u00E1 vazio: "},
- {"Keystore.file.does.not.exist.",
- "O arquivo da \u00E1rea de armazenamento de chaves n\u00E3o existe. "},
- {"Must.specify.destination.alias", "Deve ser especificado um alias de destino"},
- {"Must.specify.alias", "Deve ser especificado um alias"},
- {"Keystore.password.must.be.at.least.6.characters",
- "A senha da \u00E1rea de armazenamento de chaves deve ter, no m\u00EDnimo, 6 caracteres"},
- {"Enter.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves: "},
- {"Enter.source.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de origem: "},
- {"Enter.destination.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de destino: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "A senha da \u00E1rea de armazenamento de chaves \u00E9 muito curta - ela deve ter, no m\u00EDnimo, 6 caracteres"},
- {"Unknown.Entry.Type", "Tipo de Entrada Desconhecido"},
- {"Too.many.failures.Alias.not.changed", "Excesso de falhas. Alias n\u00E3o alterado"},
- {"Entry.for.alias.alias.successfully.imported.",
- "Entrada do alias {0} importada com \u00EAxito."},
- {"Entry.for.alias.alias.not.imported.", "Entrada do alias {0} n\u00E3o importada."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Problema ao importar a entrada do alias {0}: {1}.\nEntrada do alias {0} n\u00E3o importada."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Comando de importa\u00E7\u00E3o conclu\u00EDdo: {0} entradas importadas com \u00EAxito, {1} entradas falharam ou foram canceladas"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Advert\u00EAncia: Substitui\u00E7\u00E3o do alias {0} existente na \u00E1rea de armazenamento de chaves de destino"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "Entrada j\u00E1 existente no alias {0}, substituir? [n\u00E3o]: "},
- {"Too.many.failures.try.later", "Excesso de falhas - tente mais tarde"},
- {"Certification.request.stored.in.file.filename.",
- "Solicita\u00E7\u00E3o de certificado armazenada no arquivo <{0}>"},
- {"Submit.this.to.your.CA", "Submeter \u00E0 CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "se o alias n\u00E3o estiver especificado, destalias, srckeypass e destkeypass n\u00E3o dever\u00E3o ser especificados"},
- {"Certificate.stored.in.file.filename.",
- "Certificado armazenado no arquivo <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "A resposta do certificado foi instalada na \u00E1rea de armazenamento de chaves"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "A resposta do certificado n\u00E3o foi instalada na \u00E1rea de armazenamento de chaves"},
- {"Certificate.was.added.to.keystore",
- "O certificado foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
- {"Certificate.was.not.added.to.keystore",
- "O certificado n\u00E3o foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
- {".Storing.ksfname.", "[Armazenando {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} n\u00E3o tem chave p\u00FAblica (certificado)"},
- {"Cannot.derive.signature.algorithm",
- "N\u00E3o \u00E9 poss\u00EDvel obter um algoritmo de assinatura"},
- {"Alias.alias.does.not.exist",
- "O alias <{0}> n\u00E3o existe"},
- {"Alias.alias.has.no.certificate",
- "O alias <{0}> n\u00E3o tem certificado"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Par de chaves n\u00E3o gerado; o alias <{0}> j\u00E1 existe"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Gerando o par de chaves {1} de {0} bit e o certificado autoassinado ({2}) com uma validade de {3} dias\n\tpara: {4}"},
- {"Enter.key.password.for.alias.", "Informar a senha da chave de <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(RETURN se for igual \u00E0 senha da \u00E1rea do armazenamento de chaves): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "A senha da chave \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
- {"Too.many.failures.key.not.added.to.keystore",
- "Excesso de falhas - chave n\u00E3o adicionada a \u00E1rea de armazenamento de chaves"},
- {"Destination.alias.dest.already.exists",
- "O alias de destino <{0}> j\u00E1 existe"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "A senha \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
- {"Too.many.failures.Key.entry.not.cloned",
- "Excesso de falhas. Entrada da chave n\u00E3o clonada"},
- {"key.password.for.alias.", "senha da chave de <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "A entrada da \u00E1rea do armazenamento de chaves de <{0}> j\u00E1 existe"},
- {"Creating.keystore.entry.for.id.getName.",
- "Criando entrada da \u00E1rea do armazenamento de chaves para <{0}> ..."},
- {"No.entries.from.identity.database.added",
- "Nenhuma entrada adicionada do banco de dados de identidades"},
- {"Alias.name.alias", "Nome do alias: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Data de cria\u00E7\u00E3o: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Tipo de entrada: {0}"},
- {"Certificate.chain.length.", "Comprimento da cadeia de certificados: "},
- {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Fingerprint (MD5) do certificado: "},
- {"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "},
- {"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entrada"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entradas"},
- {"Failed.to.parse.input", "Falha durante o parse da entrada"},
- {"Empty.input", "Entrada vazia"},
- {"Not.X.509.certificate", "N\u00E3o \u00E9 um certificado X.509"},
- {"alias.has.no.public.key", "{0} n\u00E3o tem chave p\u00FAblica"},
- {"alias.has.no.X.509.certificate", "{0} n\u00E3o tem certificado X.509"},
- {"New.certificate.self.signed.", "Novo certificado (autoassinado):"},
- {"Reply.has.no.certificates", "A resposta n\u00E3o tem certificado"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Certificado n\u00E3o importado, o alias <{0}> j\u00E1 existe"},
- {"Input.not.an.X.509.certificate", "A entrada n\u00E3o \u00E9 um certificado X.509"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "O certificado j\u00E1 existe no armazenamento de chaves no alias <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "Ainda deseja adicion\u00E1-lo? [n\u00E3o]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "O certificado j\u00E1 existe na \u00E1rea de armazenamento de chaves da CA em todo o sistema no alias <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]: "},
- {"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]: "},
- {"YES", "Sim"},
- {"New.prompt.", "Nova {0}: "},
- {"Passwords.must.differ", "As senhas devem ser diferentes"},
- {"Re.enter.new.prompt.", "Informe novamente a nova {0}: "},
- {"Re.enter.new.password.", "Informe novamente a nova senha: "},
- {"They.don.t.match.Try.again", "Elas n\u00E3o correspondem. Tente novamente"},
- {"Enter.prompt.alias.name.", "Informe o nome do alias {0}: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Informe o novo nome do alias\t(RETURN para cancelar a importa\u00E7\u00E3o desta entrada): "},
- {"Enter.alias.name.", "Informe o nome do alias: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(RETURN se for igual ao de <{0}>)"},
- {".PATTERN.printX509Cert",
- "Propriet\u00E1rio: {0}\nEmissor: {1}\nN\u00FAmero de s\u00E9rie: {2}\nV\u00E1lido de: {3} a: {4}\nFingerprints do certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome do algoritmo de assinatura: {8}\n\t Vers\u00E3o: {9}"},
- {"What.is.your.first.and.last.name.",
- "Qual \u00E9 o seu nome e o seu sobrenome?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "Qual \u00E9 o nome da sua unidade organizacional?"},
- {"What.is.the.name.of.your.organization.",
- "Qual \u00E9 o nome da sua empresa?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "Qual \u00E9 o nome da sua Cidade ou Localidade?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "Qual \u00E9 o nome do seu Estado ou Munic\u00EDpio?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "Quais s\u00E3o as duas letras do c\u00F3digo do pa\u00EDs desta unidade?"},
- {"Is.name.correct.", "{0} Est\u00E1 correto?"},
- {"no", "n\u00E3o"},
- {"yes", "sim"},
- {"y", "s"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "O alias <{0}> n\u00E3o tem chave"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Advert\u00EAncia Advert\u00EAncia Advert\u00EAncia *****************"},
- {"Signer.d.", "Signat\u00E1rio #%d:"},
- {"Timestamp.", "Timestamp:"},
- {"Signature.", "Assinatura:"},
- {"CRLs.", "CRLs:"},
- {"Certificate.owner.", "Propriet\u00E1rio do certificado: "},
- {"Not.a.signed.jar.file", "N\u00E3o \u00E9 um arquivo jar assinado"},
- {"No.certificate.from.the.SSL.server",
- "N\u00E3o \u00E9 um certificado do servidor SSL"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Cadeia de certificados incompleta na resposta"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "A cadeia de certificados da resposta n\u00E3o verifica: "},
- {"Top.level.certificate.in.reply.",
- "Certificado de n\u00EDvel superior na resposta:\n"},
- {".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "},
- {"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]: "},
- {"NO", "N\u00E3o"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "O certificado da resposta e o certificado da \u00E1rea de armazenamento de chaves s\u00E3o id\u00EAnticos"},
- {"Failed.to.establish.chain.from.reply",
- "Falha ao estabelecer a cadeia a partir da resposta"},
- {"n", "n"},
- {"Wrong.answer.try.again", "Resposta errada; tente novamente"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "Chave secreta n\u00E3o gerada; o alias <{0}> j\u00E1 existe"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Forne\u00E7a o -keysize para a gera\u00E7\u00E3o da chave secreta"},
-
- {"Extensions.", "Extens\u00F5es: "},
- {".Empty.value.", "(Valor vazio)"},
- {"Extension.Request.", "Solicita\u00E7\u00E3o de Extens\u00E3o:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "Solicita\u00E7\u00E3o do Certificado PKCS #10 (Vers\u00E3o 1.0)\nAssunto: %s\nChave P\u00FAblica: %s formato %s chave\n"},
- {"Unknown.keyUsage.type.", "Tipo de keyUsage desconhecido: "},
- {"Unknown.extendedkeyUsage.type.", "Tipo de extendedkeyUsage desconhecido: "},
- {"Unknown.AccessDescription.type.", "Tipo de AccessDescription desconhecido: "},
- {"Unrecognized.GeneralName.type.", "Tipo de GeneralName n\u00E3o reconhecido: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Esta extens\u00E3o n\u00E3o pode ser marcada como cr\u00EDtica. "},
- {"Odd.number.of.hex.digits.found.", "Encontrado n\u00FAmero \u00EDmpar de seis d\u00EDgitos: "},
- {"Unknown.extension.type.", "Tipo de extens\u00E3o desconhecido: "},
- {"command.{0}.is.ambiguous.", "o comando {0} \u00E9 amb\u00EDguo:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Advert\u00EAncia: N\u00E3o existe uma chave p\u00FAblica para o alias {0}. Certifique-se de que um KeyStore esteja configurado adequadamente."},
- {"Warning.Class.not.found.class", "Advert\u00EAncia: Classe n\u00E3o encontrada: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Advert\u00EAncia: Argumento(s) inv\u00E1lido(s) para o construtor: {0}"},
- {"Illegal.Principal.Type.type", "Tipo Principal Inv\u00E1lido: {0}"},
- {"Illegal.option.option", "Op\u00E7\u00E3o inv\u00E1lida: {0}"},
- {"Usage.policytool.options.", "Uso: policytool [op\u00E7\u00F5es]"},
- {".file.file.policy.file.location",
- " [-file <arquivo>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"},
- {"New", "Novo"},
- {"Open", "Abrir"},
- {"Save", "Salvar"},
- {"Save.As", "Salvar Como"},
- {"View.Warning.Log", "Exibir Log de Advert\u00EAncias"},
- {"Exit", "Sair"},
- {"Add.Policy.Entry", "Adicionar Entrada de Pol\u00EDtica"},
- {"Edit.Policy.Entry", "Editar Entrada de Pol\u00EDtica"},
- {"Remove.Policy.Entry", "Remover Entrada de Pol\u00EDtica"},
- {"Edit", "Editar"},
- {"Retain", "Reter"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Advert\u00EAncia: O nome do arquivo pode conter caracteres de escape barra invertida. N\u00E3o \u00E9 necess\u00E1rio fazer o escape dos caracteres de barra invertida (a ferramenta faz o escape dos caracteres conforme necess\u00E1rio ao gravar o conte\u00FAdo da pol\u00EDtica no armazenamento persistente).\n\nClique em Reter para reter o nome da entrada ou clique em Editar para edit\u00E1-lo."},
-
- {"Add.Public.Key.Alias", "Adicionar Alias de Chave P\u00FAblica"},
- {"Remove.Public.Key.Alias", "Remover Alias de Chave P\u00FAblica"},
- {"File", "Arquivo"},
- {"KeyStore", "KeyStore"},
- {"Policy.File.", "Arquivo de Pol\u00EDtica:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "N\u00E3o foi poss\u00EDvel abrir o arquivo de pol\u00EDtica: {0}: {1}"},
- {"Policy.Tool", "Ferramenta de Pol\u00EDtica"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Erros durante a abertura da configura\u00E7\u00E3o da pol\u00EDtica. Consulte o Log de Advert\u00EAncias para obter mais informa\u00E7\u00F5es."},
- {"Error", "Erro"},
- {"OK", "OK"},
- {"Status", "Status"},
- {"Warning", "Advert\u00EAncia"},
- {"Permission.",
- "Permiss\u00E3o: "},
- {"Principal.Type.", "Tipo do Principal:"},
- {"Principal.Name.", "Nome do Principal:"},
- {"Target.Name.",
- "Nome do Alvo: "},
- {"Actions.",
- "A\u00E7\u00F5es: "},
- {"OK.to.overwrite.existing.file.filename.",
- "Est\u00E1 correto substituir o arquivo existente {0}?"},
- {"Cancel", "Cancelar"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Adicionar Principal"},
- {"Edit.Principal", "Editar Principal"},
- {"Remove.Principal", "Remover Principal"},
- {"Principals.", "Principais:"},
- {".Add.Permission", " Adicionar Permiss\u00E3o"},
- {".Edit.Permission", " Editar Permiss\u00E3o"},
- {"Remove.Permission", "Remover Permiss\u00E3o"},
- {"Done", "Conclu\u00EDdo"},
- {"KeyStore.URL.", "URL do KeyStore:"},
- {"KeyStore.Type.", "Tipo de KeyStore:"},
- {"KeyStore.Provider.", "Fornecedor de KeyStore:"},
- {"KeyStore.Password.URL.", "URL da Senha do KeyStore:"},
- {"Principals", "Principais"},
- {".Edit.Principal.", " Editar Principal:"},
- {".Add.New.Principal.", " Adicionar Novo Principal:"},
- {"Permissions", "Permiss\u00F5es"},
- {".Edit.Permission.", " Editar Permiss\u00E3o:"},
- {".Add.New.Permission.", " Adicionar Nova Permiss\u00E3o:"},
- {"Signed.By.", "Assinado por:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "N\u00E3o \u00E9 Poss\u00EDvel Especificar um Principal com uma Classe de Curinga sem um Nome de Curinga"},
- {"Cannot.Specify.Principal.without.a.Name",
- "N\u00E3o \u00E9 Poss\u00EDvel Especificar um Principal sem um Nome"},
- {"Permission.and.Target.Name.must.have.a.value",
- "O Nome de Destino e a Permiss\u00E3o devem ter um Valor"},
- {"Remove.this.Policy.Entry.", "Remover esta Entrada de Pol\u00EDtica?"},
- {"Overwrite.File", "Substituir Arquivo"},
- {"Policy.successfully.written.to.filename",
- "Pol\u00EDtica gravada com \u00EAxito em {0}"},
- {"null.filename", "nome de arquivo nulo"},
- {"Save.changes.", "Salvar altera\u00E7\u00F5es?"},
- {"Yes", "Sim"},
- {"No", "N\u00E3o"},
- {"Policy.Entry", "Entrada de Pol\u00EDtica"},
- {"Save.Changes", "Salvar Altera\u00E7\u00F5es"},
- {"No.Policy.Entry.selected", "Nenhuma Entrada de Pol\u00EDtica Selecionada"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "N\u00E3o \u00E9 poss\u00EDvel abrir a KeyStore: {0}"},
- {"No.principal.selected", "Nenhum principal selecionado"},
- {"No.permission.selected", "Nenhuma permiss\u00E3o selecionada"},
- {"name", "nome"},
- {"configuration.type", "tipo de configura\u00E7\u00E3o"},
- {"environment.variable.name", "nome da vari\u00E1vel de ambiente"},
- {"library.name", "nome da biblioteca"},
- {"package.name", "nome do pacote"},
- {"policy.type", "tipo de pol\u00EDtica"},
- {"property.name", "nome da propriedade"},
- {"Principal.List", "Lista de Principais"},
- {"Permission.List", "Lista de Permiss\u00F5es"},
- {"Code.Base", "Base de C\u00F3digo"},
- {"KeyStore.U.R.L.", "U R L da KeyStore:"},
- {"KeyStore.Password.U.R.L.", "U R L da Senha do KeyStore:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "entrada(s) nula(s) inv\u00E1lida(s)"},
{"actions.can.only.be.read.", "as a\u00E7\u00F5es s\u00F3 podem ser 'lidas'"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "mapa OID nulo fornecido"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"AccessControlContext nulo inv\u00E1lido fornecido"},
{"invalid.null.action.provided", "a\u00E7\u00E3o nula inv\u00E1lida fornecida"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_sv.java b/jdk/src/share/classes/sun/security/util/Resources_sv.java
index 8ff0e3e..e16c1f7 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_sv.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_sv.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [Alternativ]..."},
- {"Options.", "Alternativ:"},
- {"Use.keytool.help.for.all.available.commands",
- "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"},
- {"Key.and.Certificate.Management.Tool",
- "Hanteringsverktyg f\u00F6r nycklar och certifikat"},
- {"Commands.", "Kommandon:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg - command_name\" om anv\u00E4ndning av command_name"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "Genererar certifikatbeg\u00E4ran"}, //-certreq
- {"Changes.an.entry.s.alias",
- "\u00C4ndrar postalias"}, //-changealias
- {"Deletes.an.entry",
- "Tar bort post"}, //-delete
- {"Exports.certificate",
- "Exporterar certifikat"}, //-exportcert
- {"Generates.a.key.pair",
- "Genererar nyckelpar"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "Genererar hemlig nyckel"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "Genererar certifikat fr\u00E5n certifikatbeg\u00E4ran"}, //-gencert
- {"Generates.CRL", "Genererar CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importerar poster fr\u00E5n identitetsdatabas i JDK 1.1.x-format"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "Importerar ett certifikat eller en certifikatkedja"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importerar en eller alla poster fr\u00E5n annat nyckellager"}, //-importkeystore
- {"Clones.a.key.entry",
- "Klonar en nyckelpost"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\u00C4ndrar nyckell\u00F6senordet f\u00F6r en post"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "Visar lista \u00F6ver poster i nyckellager"}, //-list
- {"Prints.the.content.of.a.certificate",
- "Skriver ut inneh\u00E5llet i ett certifikat"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "Skriver ut inneh\u00E5llet i en certifikatbeg\u00E4ran"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "Skriver ut inneh\u00E5llet i en CRL-fil"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "Genererar ett sj\u00E4lvsignerat certifikat"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\u00C4ndrar lagerl\u00F6senordet f\u00F6r ett nyckellager"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "aliasnamn f\u00F6r post som ska bearbetas"}, //-alias
- {"destination.alias",
- "destinationsalias"}, //-destalias
- {"destination.key.password",
- "l\u00F6senord f\u00F6r destinationsnyckel"}, //-destkeypass
- {"destination.keystore.name",
- "namn p\u00E5 destinationsnyckellager"}, //-destkeystore
- {"destination.keystore.password.protected",
- "skyddat l\u00F6senord f\u00F6r destinationsnyckellager"}, //-destprotected
- {"destination.keystore.provider.name",
- "leverant\u00F6rsnamn f\u00F6r destinationsnyckellager"}, //-destprovidername
- {"destination.keystore.password",
- "l\u00F6senord f\u00F6r destinationsnyckellager"}, //-deststorepass
- {"destination.keystore.type",
- "typ av destinationsnyckellager"}, //-deststoretype
- {"distinguished.name",
- "unikt namn"}, //-dname
- {"X.509.extension",
- "X.509-till\u00E4gg"}, //-ext
- {"output.file.name",
- "namn p\u00E5 utdatafil"}, //-file and -outfile
- {"input.file.name",
- "namn p\u00E5 indatafil"}, //-file and -infile
- {"key.algorithm.name",
- "namn p\u00E5 nyckelalgoritm"}, //-keyalg
- {"key.password",
- "nyckell\u00F6senord"}, //-keypass
- {"key.bit.size",
- "nyckelbitstorlek"}, //-keysize
- {"keystore.name",
- "namn p\u00E5 nyckellager"}, //-keystore
- {"new.password",
- "nytt l\u00F6senord"}, //-new
- {"do.not.prompt",
- "fr\u00E5ga inte"}, //-noprompt
- {"password.through.protected.mechanism",
- "l\u00F6senord med skyddad mekanism"}, //-protected
- {"provider.argument",
- "leverant\u00F6rsargument"}, //-providerarg
- {"provider.class.name",
- "namn p\u00E5 leverant\u00F6rsklass"}, //-providerclass
- {"provider.name",
- "leverant\u00F6rsnamn"}, //-providername
- {"provider.classpath",
- "leverant\u00F6rsklass\u00F6kv\u00E4g"}, //-providerpath
- {"output.in.RFC.style",
- "utdata i RFC-format"}, //-rfc
- {"signature.algorithm.name",
- "namn p\u00E5 signaturalgoritm"}, //-sigalg
- {"source.alias",
- "k\u00E4llalias"}, //-srcalias
- {"source.key.password",
- "l\u00F6senord f\u00F6r k\u00E4llnyckel"}, //-srckeypass
- {"source.keystore.name",
- "namn p\u00E5 k\u00E4llnyckellager"}, //-srckeystore
- {"source.keystore.password.protected",
- "skyddat l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcprotected
- {"source.keystore.provider.name",
- "leverant\u00F6rsnamn f\u00F6r k\u00E4llnyckellager"}, //-srcprovidername
- {"source.keystore.password",
- "l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcstorepass
- {"source.keystore.type",
- "typ av k\u00E4llnyckellager"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL-serverv\u00E4rd och -port"}, //-sslserver
- {"signed.jar.file",
- "signerad jar-fil"}, //=jarfile
- {"certificate.validity.start.date.time",
- "startdatum/-tid f\u00F6r certifikatets giltighet"}, //-startdate
- {"keystore.password",
- "l\u00F6senord f\u00F6r nyckellager"}, //-storepass
- {"keystore.type",
- "nyckellagertyp"}, //-storetype
- {"trust.certificates.from.cacerts",
- "tillf\u00F6rlitliga certifikat fr\u00E5n cacerts"}, //-trustcacerts
- {"verbose.output",
- "utf\u00F6rliga utdata"}, //-v
- {"validity.number.of.days",
- "antal dagar f\u00F6r giltighet"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "Seriellt ID f\u00F6r certifikat som ska \u00E5terkallas"}, //-id
- // keytool: Running part
- {"keytool.error.", "nyckelverktygsfel: "},
- {"Illegal.option.", "Otill\u00E5tet alternativ: "},
- {"Illegal.value.", "Otill\u00E5tet v\u00E4rde: "},
- {"Unknown.password.type.", "Ok\u00E4nd l\u00F6senordstyp: "},
- {"Cannot.find.environment.variable.",
- "Kan inte hitta milj\u00F6variabel: "},
- {"Cannot.find.file.", "Hittar inte fil: "},
- {"Command.option.flag.needs.an.argument.", "Kommandoalternativet {0} beh\u00F6ver ett argument."},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "Varning! PKCS12-nyckellager har inte st\u00F6d f\u00F6r olika l\u00F6senord f\u00F6r lagret och nyckeln. Det anv\u00E4ndarspecificerade {0}-v\u00E4rdet ignoreras."},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "-keystore m\u00E5ste vara NONE om -storetype \u00E4r {0}"},
- {"Too.many.retries.program.terminated",
- "F\u00F6r m\u00E5nga f\u00F6rs\u00F6k. Programmet avslutas"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "-storepasswd- och -keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r {0}"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "-keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r PKCS12"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "-keypass och -new kan inte anges om -storetype \u00E4r {0}"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "om -protected har angetts f\u00E5r inte -storepass, -keypass och -new anges"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "om -srcprotected anges f\u00E5r -srcstorepass och -srckeypass inte anges"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "om nyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -storepass, -keypass och -new inte anges"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "om k\u00E4llnyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -srcstorepass och -srckeypass inte anges"},
- {"Illegal.startdate.value", "Otill\u00E5tet v\u00E4rde f\u00F6r startdatum"},
- {"Validity.must.be.greater.than.zero",
- "Giltigheten m\u00E5ste vara st\u00F6rre \u00E4n noll"},
- {"provName.not.a.provider", "{0} \u00E4r inte en leverant\u00F6r"},
- {"Usage.error.no.command.provided", "Syntaxfel: inget kommando angivet"},
- {"Source.keystore.file.exists.but.is.empty.", "Nyckellagrets k\u00E4llfil finns, men \u00E4r tom: "},
- {"Please.specify.srckeystore", "Ange -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "Kan inte specificera b\u00E5de -v och -rfc med 'list'-kommandot"},
- {"Key.password.must.be.at.least.6.characters",
- "Nyckell\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"New.password.must.be.at.least.6.characters",
- "Det nya l\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"Keystore.file.exists.but.is.empty.",
- "Nyckellagerfilen finns, men \u00E4r tom: "},
- {"Keystore.file.does.not.exist.",
- "Nyckellagerfilen finns inte: "},
- {"Must.specify.destination.alias", "Du m\u00E5ste ange destinationsalias"},
- {"Must.specify.alias", "Du m\u00E5ste ange alias"},
- {"Keystore.password.must.be.at.least.6.characters",
- "Nyckellagerl\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"Enter.keystore.password.", "Ange nyckellagerl\u00F6senord: "},
- {"Enter.source.keystore.password.", "Ange l\u00F6senord f\u00F6r k\u00E4llnyckellagret: "},
- {"Enter.destination.keystore.password.", "Ange nyckellagerl\u00F6senord f\u00F6r destination: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "Nyckellagerl\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"Unknown.Entry.Type", "Ok\u00E4nd posttyp"},
- {"Too.many.failures.Alias.not.changed", "F\u00F6r m\u00E5nga fel. Alias har inte \u00E4ndrats"},
- {"Entry.for.alias.alias.successfully.imported.",
- "Posten f\u00F6r alias {0} har importerats."},
- {"Entry.for.alias.alias.not.imported.", "Posten f\u00F6r alias {0} har inte importerats."},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "Ett problem uppstod vid importen av posten f\u00F6r alias {0}: {1}.\nPosten {0} har inte importerats."},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "Kommandoimporten slutf\u00F6rd: {0} poster har importerats, {1} poster var felaktiga eller annullerades"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "Varning! Det befintliga aliaset {0} i destinationsnyckellagret skrivs \u00F6ver"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "Aliaset {0} finns redan. Vill du skriva \u00F6ver det? [nej]: "},
- {"Too.many.failures.try.later", "F\u00F6r m\u00E5nga fel - f\u00F6rs\u00F6k igen senare"},
- {"Certification.request.stored.in.file.filename.",
- "Certifikatbeg\u00E4ran har lagrats i filen <{0}>"},
- {"Submit.this.to.your.CA", "Skicka detta till certifikatutf\u00E4rdaren"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "om n\u00E5got alias inte anges f\u00E5r destalias, srckeypass och destkeypass inte anges"},
- {"Certificate.stored.in.file.filename.",
- "Certifikatet har lagrats i filen <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "Certifikatsvaret har installerats i nyckellagret"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "Certifikatsvaret har inte installerats i nyckellagret"},
- {"Certificate.was.added.to.keystore",
- "Certifikatet har lagts till i nyckellagret"},
- {"Certificate.was.not.added.to.keystore",
- "Certifikatet har inte lagts till i nyckellagret"},
- {".Storing.ksfname.", "[Lagrar {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} saknar offentlig nyckel (certifikat)"},
- {"Cannot.derive.signature.algorithm",
- "Kan inte h\u00E4rleda signaturalgoritm"},
- {"Alias.alias.does.not.exist",
- "Aliaset <{0}> finns inte"},
- {"Alias.alias.has.no.certificate",
- "Aliaset <{0}> saknar certifikat"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "Nyckelparet genererades inte. Aliaset <{0}> finns redan"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "Genererar {0} bitars {1}-nyckelpar och sj\u00E4lvsignerat certifikat ({2}) med en giltighet p\u00E5 {3} dagar\n\tf\u00F6r: {4}"},
- {"Enter.key.password.for.alias.", "Ange nyckell\u00F6senord f\u00F6r <{0}>"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(RETURN om det \u00E4r identiskt med nyckellagerl\u00F6senordet): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "Nyckell\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"Too.many.failures.key.not.added.to.keystore",
- "F\u00F6r m\u00E5nga fel - nyckeln lades inte till i nyckellagret"},
- {"Destination.alias.dest.already.exists",
- "Destinationsaliaset <{0}> finns redan"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "L\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
- {"Too.many.failures.Key.entry.not.cloned",
- "F\u00F6r m\u00E5nga fel. Nyckelposten har inte klonats"},
- {"key.password.for.alias.", "nyckell\u00F6senord f\u00F6r <{0}>"},
- {"Keystore.entry.for.id.getName.already.exists",
- "Nyckellagerpost f\u00F6r <{0}> finns redan"},
- {"Creating.keystore.entry.for.id.getName.",
- "Skapar nyckellagerpost f\u00F6r <{0}> ..."},
- {"No.entries.from.identity.database.added",
- "Inga poster fr\u00E5n identitetsdatabasen har lagts till"},
- {"Alias.name.alias", "Aliasnamn: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "Skapat den: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Posttyp: {0}"},
- {"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "},
- {"Certificate.i.1.", "Certifikat[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Certifikatets fingeravtryck (SHA1): "},
- {"Keystore.type.", "Nyckellagertyp: "},
- {"Keystore.provider.", "Nyckellagerleverant\u00F6r: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "Nyckellagret inneh\u00E5ller {0,number,integer} post"},
- {"Your.keystore.contains.keyStore.size.entries",
- "Nyckellagret inneh\u00E5ller {0,number,integer} poster"},
- {"Failed.to.parse.input", "Kunde inte tolka indata"},
- {"Empty.input", "Inga indata"},
- {"Not.X.509.certificate", "Inte ett X.509-certifikat"},
- {"alias.has.no.public.key", "{0} saknar offentlig nyckel"},
- {"alias.has.no.X.509.certificate", "{0} saknar X.509-certifikat"},
- {"New.certificate.self.signed.", "Nytt certifikat (sj\u00E4lvsignerat):"},
- {"Reply.has.no.certificates", "Svaret saknar certifikat"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "Certifikatet importerades inte. Aliaset <{0}> finns redan"},
- {"Input.not.an.X.509.certificate", "Indata \u00E4r inte ett X.509-certifikat"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "Certifikatet finns redan i nyckellagerfilen under aliaset <{0}>"},
- {"Do.you.still.want.to.add.it.no.",
- "Vill du fortfarande l\u00E4gga till det? [nej]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "Certifikatet finns redan i den systemomsp\u00E4nnande CA-nyckellagerfilen under aliaset <{0}>"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]: "},
- {"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]: "},
- {"YES", "Ja"},
- {"New.prompt.", "Nytt {0}: "},
- {"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"},
- {"Re.enter.new.prompt.", "Ange nytt {0} igen: "},
- {"Re.enter.new.password.", "Ange det nya l\u00F6senordet igen: "},
- {"They.don.t.match.Try.again", "De matchar inte. F\u00F6rs\u00F6k igen"},
- {"Enter.prompt.alias.name.", "Ange aliasnamn f\u00F6r {0}: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "Ange ett nytt aliasnamn\t(skriv RETURN f\u00F6r att avbryta importen av denna post): "},
- {"Enter.alias.name.", "Ange aliasnamn: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(RETURN om det \u00E4r det samma som f\u00F6r <{0}>)"},
- {".PATTERN.printX509Cert",
- "\u00C4gare: {0}\nUtf\u00E4rdare: {1}\nSerienummer: {2}\nGiltigt fr\u00E5n den: {3} till: {4}\nCertifikatets fingeravtryck:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Namn p\u00E5 signaturalgoritm: {8}\n\t Version: {9}"},
- {"What.is.your.first.and.last.name.",
- "Vad heter du i f\u00F6r- och efternamn?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "Vad heter din avdelning inom organisationen?"},
- {"What.is.the.name.of.your.organization.",
- "Vad heter din organisation?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "Vad heter din ort eller plats?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "Vad heter ditt land eller din provins?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "Vilken \u00E4r den tv\u00E5st\u00E4lliga landskoden?"},
- {"Is.name.correct.", "\u00C4r {0} korrekt?"},
- {"no", "nej"},
- {"yes", "ja"},
- {"y", "j"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "Aliaset <{0}> saknar nyckel"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** Varning Varning Varning *****************"},
- {"Signer.d.", "Signerare #%d:"},
- {"Timestamp.", "Tidsst\u00E4mpel:"},
- {"Signature.", "Underskrift:"},
- {"CRLs.", "CRL:er:"},
- {"Certificate.owner.", "Certifikat\u00E4gare: "},
- {"Not.a.signed.jar.file", "Ingen signerad jar-fil"},
- {"No.certificate.from.the.SSL.server",
- "Inget certifikat fr\u00E5n SSL-servern"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret. *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore. *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "Certifikatsvaret inneh\u00E5ller inte n\u00E5gon offentlig nyckel f\u00F6r <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
- "Ofullst\u00E4ndig certifikatskedja i svaret"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "Certifikatskedjan i svaret g\u00E5r inte att verifiera: "},
- {"Top.level.certificate.in.reply.",
- "Toppniv\u00E5certifikatet i svaret:\n"},
- {".is.not.trusted.", "... \u00E4r inte betrott. "},
- {"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]: "},
- {"NO", "Nej"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "Certifikatsvaret och certifikatet i nyckellagret \u00E4r identiska"},
- {"Failed.to.establish.chain.from.reply",
- "Kunde inte uppr\u00E4tta kedja fr\u00E5n svaret"},
- {"n", "n"},
- {"Wrong.answer.try.again", "Fel svar. F\u00F6rs\u00F6k p\u00E5 nytt."},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "Den hemliga nyckeln har inte genererats eftersom aliaset <{0}> redan finns"},
- {"Please.provide.keysize.for.secret.key.generation",
- "Ange -keysize f\u00F6r att skapa hemlig nyckel"},
-
- {"Extensions.", "Till\u00E4gg: "},
- {".Empty.value.", "(Tomt v\u00E4rde)"},
- {"Extension.Request.", "Till\u00E4ggsbeg\u00E4ran:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10 certifikatbeg\u00E4ran (version 1.0)\n\u00C4mne: %s\nAllm\u00E4n nyckel: %s-format %s-nyckel\n"},
- {"Unknown.keyUsage.type.", "Ok\u00E4nd keyUsage-typ: "},
- {"Unknown.extendedkeyUsage.type.", "Ok\u00E4nd extendedkeyUsage-typ: "},
- {"Unknown.AccessDescription.type.", "Ok\u00E4nd AccessDescription-typ: "},
- {"Unrecognized.GeneralName.type.", "Ok\u00E4nd GeneralName-typ: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "Detta till\u00E4gg kan inte markeras som kritiskt. "},
- {"Odd.number.of.hex.digits.found.", "Udda antal hex-siffror p\u00E5tr\u00E4ffades: "},
- {"Unknown.extension.type.", "Ok\u00E4nd till\u00E4ggstyp: "},
- {"command.{0}.is.ambiguous.", "kommandot {0} \u00E4r tvetydigt:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "Varning! Det finns ingen offentlig nyckel f\u00F6r aliaset {0}. Kontrollera att det aktuella nyckellagret \u00E4r korrekt konfigurerat."},
- {"Warning.Class.not.found.class", "Varning! Klassen hittades inte: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "Varning! Ogiltiga argument f\u00F6r konstruktor: {0}"},
- {"Illegal.Principal.Type.type", "Otill\u00E5ten identitetshavaretyp: {0}"},
- {"Illegal.option.option", "Otill\u00E5tet alternativ: {0}"},
- {"Usage.policytool.options.", "Syntax: policytool [alternativ]"},
- {".file.file.policy.file.location",
- " [-file <fil>] policyfilens plats"},
- {"New", "Nytt"},
- {"Open", "\u00D6ppna"},
- {"Save", "Spara"},
- {"Save.As", "Spara som"},
- {"View.Warning.Log", "Visa varningslogg"},
- {"Exit", "Avsluta"},
- {"Add.Policy.Entry", "L\u00E4gg till policypost"},
- {"Edit.Policy.Entry", "Redigera policypost"},
- {"Remove.Policy.Entry", "Ta bort policypost"},
- {"Edit", "Redigera"},
- {"Retain", "Beh\u00E5ll"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "Varning! Filnamnet kan inneh\u00E5lla omv\u00E4nda snedstreck inom citattecken. Citattecken kr\u00E4vs inte f\u00F6r omv\u00E4nda snedstreck (verktyget hanterar detta n\u00E4r policyinneh\u00E5llet skrivs till det best\u00E4ndiga lagret).\n\nKlicka p\u00E5 Beh\u00E5ll f\u00F6r att beh\u00E5lla det angivna namnet, eller klicka p\u00E5 Redigera f\u00F6r att \u00E4ndra det."},
-
- {"Add.Public.Key.Alias", "L\u00E4gg till offentligt nyckelalias"},
- {"Remove.Public.Key.Alias", "Ta bort offentligt nyckelalias"},
- {"File", "Fil"},
- {"KeyStore", "Nyckellager"},
- {"Policy.File.", "Policyfil:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "Kan inte \u00F6ppna policyfilen: {0}: {1}"},
- {"Policy.Tool", "Policyverktyg"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "Det uppstod ett fel n\u00E4r policykonfigurationen skulle \u00F6ppnas. Se varningsloggen f\u00F6r mer information."},
- {"Error", "Fel"},
- {"OK", "OK"},
- {"Status", "Status"},
- {"Warning", "Varning"},
- {"Permission.",
- "Beh\u00F6righet: "},
- {"Principal.Type.", "Identitetshavaretyp:"},
- {"Principal.Name.", "Identitetshavare:"},
- {"Target.Name.",
- "M\u00E5l: "},
- {"Actions.",
- "Funktioner: "},
- {"OK.to.overwrite.existing.file.filename.",
- "Ska den befintliga filen {0} skrivas \u00F6ver?"},
- {"Cancel", "Avbryt"},
- {"CodeBase.", "Kodbas:"},
- {"SignedBy.", "Signerad av:"},
- {"Add.Principal", "L\u00E4gg till identitetshavare"},
- {"Edit.Principal", "Redigera identitetshavare"},
- {"Remove.Principal", "Ta bort identitetshavare"},
- {"Principals.", "Identitetshavare:"},
- {".Add.Permission", " L\u00E4gg till beh\u00F6righet"},
- {".Edit.Permission", " Redigera beh\u00F6righet"},
- {"Remove.Permission", "Ta bort beh\u00F6righet"},
- {"Done", "Utf\u00F6rd"},
- {"KeyStore.URL.", "URL f\u00F6r nyckellager:"},
- {"KeyStore.Type.", "Nyckellagertyp:"},
- {"KeyStore.Provider.", "Nyckellagerleverant\u00F6r:"},
- {"KeyStore.Password.URL.", "URL f\u00F6r l\u00F6senord till nyckellager:"},
- {"Principals", "Identitetshavare"},
- {".Edit.Principal.", " Redigera identitetshavare:"},
- {".Add.New.Principal.", " L\u00E4gg till ny identitetshavare:"},
- {"Permissions", "Beh\u00F6righet"},
- {".Edit.Permission.", " Redigera beh\u00F6righet:"},
- {".Add.New.Permission.", " L\u00E4gg till ny beh\u00F6righet:"},
- {"Signed.By.", "Signerad av:"},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "Kan inte specificera identitetshavare med jokerteckenklass utan jokerteckennamn"},
- {"Cannot.Specify.Principal.without.a.Name",
- "Kan inte specificera identitetshavare utan namn"},
- {"Permission.and.Target.Name.must.have.a.value",
- "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"},
- {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"},
- {"Overwrite.File", "Skriv \u00F6ver fil"},
- {"Policy.successfully.written.to.filename",
- "Policy har skrivits till {0}"},
- {"null.filename", "nullfilnamn"},
- {"Save.changes.", "Vill du spara \u00E4ndringarna?"},
- {"Yes", "Ja"},
- {"No", "Nej"},
- {"Policy.Entry", "Policyfel"},
- {"Save.Changes", "Spara \u00E4ndringar"},
- {"No.Policy.Entry.selected", "Ingen policypost har valts"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "Kan inte \u00F6ppna nyckellagret: {0}"},
- {"No.principal.selected", "Ingen identitetshavare har valts"},
- {"No.permission.selected", "Ingen beh\u00F6righet har valts"},
- {"name", "namn"},
- {"configuration.type", "konfigurationstyp"},
- {"environment.variable.name", "variabelnamn f\u00F6r milj\u00F6"},
- {"library.name", "biblioteksnamn"},
- {"package.name", "paketnamn"},
- {"policy.type", "policytyp"},
- {"property.name", "egenskapsnamn"},
- {"Principal.List", "Lista \u00F6ver identitetshavare"},
- {"Permission.List", "Beh\u00F6righetslista"},
- {"Code.Base", "Kodbas"},
- {"KeyStore.U.R.L.", "URL f\u00F6r nyckellager:"},
- {"KeyStore.Password.U.R.L.", "URL f\u00F6r l\u00F6senord till nyckellager:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "ogiltiga null-indata"},
{"actions.can.only.be.read.", "funktioner kan endast 'l\u00E4sas'"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "null-OID-mappning tillhandah\u00F6lls"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"ogiltigt null-AccessControlContext"},
{"invalid.null.action.provided", "ogiltig null-funktion"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java b/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
index fa4f7a4..80b8763 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [\u9009\u9879]..."},
- {"Options.", "\u9009\u9879:"},
- {"Use.keytool.help.for.all.available.commands",
- "\u4F7F\u7528 \"keytool -help\" \u83B7\u53D6\u6240\u6709\u53EF\u7528\u547D\u4EE4"},
- {"Key.and.Certificate.Management.Tool",
- "\u5BC6\u94A5\u548C\u8BC1\u4E66\u7BA1\u7406\u5DE5\u5177"},
- {"Commands.", "\u547D\u4EE4:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "\u4F7F\u7528 \"keytool -command_name -help\" \u83B7\u53D6 command_name \u7684\u7528\u6CD5"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "\u751F\u6210\u8BC1\u4E66\u8BF7\u6C42"}, //-certreq
- {"Changes.an.entry.s.alias",
- "\u66F4\u6539\u6761\u76EE\u7684\u522B\u540D"}, //-changealias
- {"Deletes.an.entry",
- "\u5220\u9664\u6761\u76EE"}, //-delete
- {"Exports.certificate",
- "\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert
- {"Generates.a.key.pair",
- "\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert
- {"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "\u4ECE JDK 1.1.x \u6837\u5F0F\u7684\u8EAB\u4EFD\u6570\u636E\u5E93\u5BFC\u5165\u6761\u76EE"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "\u5BFC\u5165\u8BC1\u4E66\u6216\u8BC1\u4E66\u94FE"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "\u4ECE\u5176\u4ED6\u5BC6\u94A5\u5E93\u5BFC\u5165\u4E00\u4E2A\u6216\u6240\u6709\u6761\u76EE"}, //-importkeystore
- {"Clones.a.key.entry",
- "\u514B\u9686\u5BC6\u94A5\u6761\u76EE"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\u66F4\u6539\u6761\u76EE\u7684\u5BC6\u94A5\u53E3\u4EE4"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "\u5217\u51FA\u5BC6\u94A5\u5E93\u4E2D\u7684\u6761\u76EE"}, //-list
- {"Prints.the.content.of.a.certificate",
- "\u6253\u5370\u8BC1\u4E66\u5185\u5BB9"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "\u6253\u5370\u8BC1\u4E66\u8BF7\u6C42\u7684\u5185\u5BB9"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "\u6253\u5370 CRL \u6587\u4EF6\u7684\u5185\u5BB9"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "\u751F\u6210\u81EA\u7B7E\u540D\u8BC1\u4E66"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "\u8981\u5904\u7406\u7684\u6761\u76EE\u7684\u522B\u540D"}, //-alias
- {"destination.alias",
- "\u76EE\u6807\u522B\u540D"}, //-destalias
- {"destination.key.password",
- "\u76EE\u6807\u5BC6\u94A5\u53E3\u4EE4"}, //-destkeypass
- {"destination.keystore.name",
- "\u76EE\u6807\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-destkeystore
- {"destination.keystore.password.protected",
- "\u53D7\u4FDD\u62A4\u7684\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-destprotected
- {"destination.keystore.provider.name",
- "\u76EE\u6807\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-destprovidername
- {"destination.keystore.password",
- "\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-deststorepass
- {"destination.keystore.type",
- "\u76EE\u6807\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-deststoretype
- {"distinguished.name",
- "\u552F\u4E00\u5224\u522B\u540D"}, //-dname
- {"X.509.extension",
- "X.509 \u6269\u5C55"}, //-ext
- {"output.file.name",
- "\u8F93\u51FA\u6587\u4EF6\u540D"}, //-file and -outfile
- {"input.file.name",
- "\u8F93\u5165\u6587\u4EF6\u540D"}, //-file and -infile
- {"key.algorithm.name",
- "\u5BC6\u94A5\u7B97\u6CD5\u540D\u79F0"}, //-keyalg
- {"key.password",
- "\u5BC6\u94A5\u53E3\u4EE4"}, //-keypass
- {"key.bit.size",
- "\u5BC6\u94A5\u4F4D\u5927\u5C0F"}, //-keysize
- {"keystore.name",
- "\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-keystore
- {"new.password",
- "\u65B0\u53E3\u4EE4"}, //-new
- {"do.not.prompt",
- "\u4E0D\u63D0\u793A"}, //-noprompt
- {"password.through.protected.mechanism",
- "\u901A\u8FC7\u53D7\u4FDD\u62A4\u7684\u673A\u5236\u7684\u53E3\u4EE4"}, //-protected
- {"provider.argument",
- "\u63D0\u4F9B\u65B9\u53C2\u6570"}, //-providerarg
- {"provider.class.name",
- "\u63D0\u4F9B\u65B9\u7C7B\u540D"}, //-providerclass
- {"provider.name",
- "\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-providername
- {"provider.classpath",
- "\u63D0\u4F9B\u65B9\u7C7B\u8DEF\u5F84"}, //-providerpath
- {"output.in.RFC.style",
- "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
- {"signature.algorithm.name",
- "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
- {"source.alias",
- "\u6E90\u522B\u540D"}, //-srcalias
- {"source.key.password",
- "\u6E90\u5BC6\u94A5\u53E3\u4EE4"}, //-srckeypass
- {"source.keystore.name",
- "\u6E90\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-srckeystore
- {"source.keystore.password.protected",
- "\u53D7\u4FDD\u62A4\u7684\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcprotected
- {"source.keystore.provider.name",
- "\u6E90\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-srcprovidername
- {"source.keystore.password",
- "\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcstorepass
- {"source.keystore.type",
- "\u6E90\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL \u670D\u52A1\u5668\u4E3B\u673A\u548C\u7AEF\u53E3"}, //-sslserver
- {"signed.jar.file",
- "\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"}, //=jarfile
- {"certificate.validity.start.date.time",
- "\u8BC1\u4E66\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F/\u65F6\u95F4"}, //-startdate
- {"keystore.password",
- "\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-storepass
- {"keystore.type",
- "\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-storetype
- {"trust.certificates.from.cacerts",
- "\u4FE1\u4EFB\u6765\u81EA cacerts \u7684\u8BC1\u4E66"}, //-trustcacerts
- {"verbose.output",
- "\u8BE6\u7EC6\u8F93\u51FA"}, //-v
- {"validity.number.of.days",
- "\u6709\u6548\u5929\u6570"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "\u8981\u64A4\u9500\u7684\u8BC1\u4E66\u7684\u5E8F\u5217 ID"}, //-id
- // keytool: Running part
- {"keytool.error.", "keytool \u9519\u8BEF: "},
- {"Illegal.option.", "\u975E\u6CD5\u9009\u9879: "},
- {"Illegal.value.", "\u975E\u6CD5\u503C: "},
- {"Unknown.password.type.", "\u672A\u77E5\u53E3\u4EE4\u7C7B\u578B: "},
- {"Cannot.find.environment.variable.",
- "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
- {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
- {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "\u8B66\u544A: PKCS12 KeyStore \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"},
- {"Too.many.retries.program.terminated",
- "\u91CD\u8BD5\u6B21\u6570\u8FC7\u591A, \u7A0B\u5E8F\u5DF2\u7EC8\u6B62"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u652F\u6301 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "\u5982\u679C -storetype \u4E3A PKCS12, \u5219\u4E0D\u652F\u6301 -keypasswd \u547D\u4EE4"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "\u5982\u679C\u6307\u5B9A\u4E86 -protected, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\u5982\u679C\u6307\u5B9A\u4E86 -srcprotected, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
- {"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"},
- {"Validity.must.be.greater.than.zero",
- "\u6709\u6548\u671F\u5FC5\u987B\u5927\u4E8E\u96F6"},
- {"provName.not.a.provider", "{0}\u4E0D\u662F\u63D0\u4F9B\u65B9"},
- {"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"},
- {"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
- {"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- "'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -v \u53CA -rfc"},
- {"Key.password.must.be.at.least.6.characters",
- "\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"New.password.must.be.at.least.6.characters",
- "\u65B0\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"Keystore.file.exists.but.is.empty.",
- "\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
- {"Keystore.file.does.not.exist.",
- "\u5BC6\u94A5\u5E93\u6587\u4EF6\u4E0D\u5B58\u5728: "},
- {"Must.specify.destination.alias", "\u5FC5\u987B\u6307\u5B9A\u76EE\u6807\u522B\u540D"},
- {"Must.specify.alias", "\u5FC5\u987B\u6307\u5B9A\u522B\u540D"},
- {"Keystore.password.must.be.at.least.6.characters",
- "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"Enter.keystore.password.", "\u8F93\u5165\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
- {"Enter.source.keystore.password.", "\u8F93\u5165\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
- {"Enter.destination.keystore.password.", "\u8F93\u5165\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"Unknown.Entry.Type", "\u672A\u77E5\u6761\u76EE\u7C7B\u578B"},
- {"Too.many.failures.Alias.not.changed", "\u6545\u969C\u592A\u591A\u3002\u672A\u66F4\u6539\u522B\u540D"},
- {"Entry.for.alias.alias.successfully.imported.",
- "\u5DF2\u6210\u529F\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
- {"Entry.for.alias.alias.not.imported.", "\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u65F6\u51FA\u73B0\u95EE\u9898: {1}\u3002\n\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "\u5DF2\u5B8C\u6210\u5BFC\u5165\u547D\u4EE4: {0} \u4E2A\u6761\u76EE\u6210\u529F\u5BFC\u5165, {1} \u4E2A\u6761\u76EE\u5931\u8D25\u6216\u53D6\u6D88"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [no]: "},
- {"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"},
- {"Certification.request.stored.in.file.filename.",
- "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"},
- {"Submit.this.to.your.CA", "\u5C06\u6B64\u63D0\u4EA4\u7ED9\u60A8\u7684 CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "\u5982\u679C\u6CA1\u6709\u6307\u5B9A\u522B\u540D, \u5219\u4E0D\u80FD\u6307\u5B9A\u76EE\u6807\u522B\u540D, \u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u548C\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"},
- {"Certificate.stored.in.file.filename.",
- "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BC1\u4E66"},
- {"Certificate.reply.was.installed.in.keystore",
- "\u8BC1\u4E66\u56DE\u590D\u5DF2\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "\u8BC1\u4E66\u56DE\u590D\u672A\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
- {"Certificate.was.added.to.keystore",
- "\u8BC1\u4E66\u5DF2\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
- {"Certificate.was.not.added.to.keystore",
- "\u8BC1\u4E66\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
- {".Storing.ksfname.", "[\u6B63\u5728\u5B58\u50A8{0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5 (\u8BC1\u4E66)"},
- {"Cannot.derive.signature.algorithm",
- "\u65E0\u6CD5\u6D3E\u751F\u7B7E\u540D\u7B97\u6CD5"},
- {"Alias.alias.does.not.exist",
- "\u522B\u540D <{0}> \u4E0D\u5B58\u5728"},
- {"Alias.alias.has.no.certificate",
- "\u522B\u540D <{0}> \u6CA1\u6709\u8BC1\u4E66"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
- {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "\u5BC6\u94A5\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"Too.many.failures.key.not.added.to.keystore",
- "\u6545\u969C\u592A\u591A - \u5BC6\u94A5\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
- {"Destination.alias.dest.already.exists",
- "\u76EE\u6807\u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
- {"Too.many.failures.Key.entry.not.cloned",
- "\u6545\u969C\u592A\u591A\u3002\u672A\u514B\u9686\u5BC6\u94A5\u6761\u76EE"},
- {"key.password.for.alias.", "<{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
- {"Keystore.entry.for.id.getName.already.exists",
- "<{0}> \u7684\u5BC6\u94A5\u5E93\u6761\u76EE\u5DF2\u7ECF\u5B58\u5728"},
- {"Creating.keystore.entry.for.id.getName.",
- "\u6B63\u5728\u521B\u5EFA <{0}> \u7684\u5BC6\u94A5\u5E93\u6761\u76EE..."},
- {"No.entries.from.identity.database.added",
- "\u672A\u4ECE\u8EAB\u4EFD\u6570\u636E\u5E93\u4E2D\u6DFB\u52A0\u4EFB\u4F55\u6761\u76EE"},
- {"Alias.name.alias", "\u522B\u540D: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "\u521B\u5EFA\u65E5\u671F: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "\u6761\u76EE\u7C7B\u578B: {0}"},
- {"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "},
- {"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "\u8BC1\u4E66\u6307\u7EB9 (SHA1): "},
- {"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "},
- {"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
- {"Your.keystore.contains.keyStore.size.entries",
- "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
- {"Failed.to.parse.input", "\u65E0\u6CD5\u5BF9\u8F93\u5165\u8FDB\u884C\u8BED\u6CD5\u5206\u6790"},
- {"Empty.input", "\u7A7A\u8F93\u5165"},
- {"Not.X.509.certificate", "\u975E X.509 \u8BC1\u4E66"},
- {"alias.has.no.public.key", "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5"},
- {"alias.has.no.X.509.certificate", "{0}\u6CA1\u6709 X.509 \u8BC1\u4E66"},
- {"New.certificate.self.signed.", "\u65B0\u8BC1\u4E66 (\u81EA\u7B7E\u540D):"},
- {"Reply.has.no.certificates", "\u56DE\u590D\u4E2D\u6CA1\u6709\u8BC1\u4E66"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "\u8BC1\u4E66\u672A\u5BFC\u5165, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
- {"Input.not.an.X.509.certificate", "\u6240\u8F93\u5165\u7684\u4E0D\u662F X.509 \u8BC1\u4E66"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"},
- {"Do.you.still.want.to.add.it.no.",
- "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [no]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [no]: "},
- {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [no]: "},
- {"YES", "\u662F"},
- {"New.prompt.", "\u65B0{0}: "},
- {"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"},
- {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "},
- {"Re.enter.new.password.", "\u518D\u6B21\u8F93\u5165\u65B0\u53E3\u4EE4: "},
- {"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"},
- {"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "\u8F93\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "},
- {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"},
- {".PATTERN.printX509Cert",
- "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F: {3}, \u622A\u6B62\u65E5\u671F: {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {8}\n\t \u7248\u672C: {9}"},
- {"What.is.your.first.and.last.name.",
- "\u60A8\u7684\u540D\u5B57\u4E0E\u59D3\u6C0F\u662F\u4EC0\u4E48?"},
- {"What.is.the.name.of.your.organizational.unit.",
- "\u60A8\u7684\u7EC4\u7EC7\u5355\u4F4D\u540D\u79F0\u662F\u4EC0\u4E48?"},
- {"What.is.the.name.of.your.organization.",
- "\u60A8\u7684\u7EC4\u7EC7\u540D\u79F0\u662F\u4EC0\u4E48?"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u533A\u57DF\u540D\u79F0\u662F\u4EC0\u4E48?"},
- {"What.is.the.name.of.your.State.or.Province.",
- "\u60A8\u6240\u5728\u7684\u7701/\u5E02/\u81EA\u6CBB\u533A\u540D\u79F0\u662F\u4EC0\u4E48?"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "\u8BE5\u5355\u4F4D\u7684\u53CC\u5B57\u6BCD\u56FD\u5BB6/\u5730\u533A\u4EE3\u7801\u662F\u4EC0\u4E48?"},
- {"Is.name.correct.", "{0}\u662F\u5426\u6B63\u786E?"},
- {"no", "\u5426"},
- {"yes", "\u662F"},
- {"y", "y"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "\u522B\u540D <{0}> \u6CA1\u6709\u5BC6\u94A5"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
- {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
- {"Timestamp.", "\u65F6\u95F4\u6233:"},
- {"Signature.", "\u7B7E\u540D:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
- {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
- {"No.certificate.from.the.SSL.server",
- "\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"},
- {"Incomplete.certificate.chain.in.reply",
- "\u56DE\u590D\u4E2D\u7684\u8BC1\u4E66\u94FE\u4E0D\u5B8C\u6574"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "\u56DE\u590D\u4E2D\u7684\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1: "},
- {"Top.level.certificate.in.reply.",
- "\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"},
- {".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"},
- {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [no]: "},
- {"NO", "\u5426"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "\u8BC1\u4E66\u56DE\u590D\u4E0E\u5BC6\u94A5\u5E93\u4E2D\u7684\u8BC1\u4E66\u662F\u76F8\u540C\u7684"},
- {"Failed.to.establish.chain.from.reply",
- "\u65E0\u6CD5\u4ECE\u56DE\u590D\u4E2D\u5EFA\u7ACB\u94FE"},
- {"n", "n"},
- {"Wrong.answer.try.again", "\u9519\u8BEF\u7684\u7B54\u6848, \u8BF7\u518D\u8BD5\u4E00\u6B21"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
- {"Please.provide.keysize.for.secret.key.generation",
- "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"},
-
- {"Extensions.", "\u6269\u5C55: "},
- {".Empty.value.", "(\u7A7A\u503C)"},
- {"Extension.Request.", "\u6269\u5C55\u8BF7\u6C42:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10 \u8BC1\u4E66\u8BF7\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9898: %s\n\u516C\u5171\u5BC6\u94A5: %s \u683C\u5F0F %s \u5BC6\u94A5\n"},
- {"Unknown.keyUsage.type.", "\u672A\u77E5 keyUsage \u7C7B\u578B: "},
- {"Unknown.extendedkeyUsage.type.", "\u672A\u77E5 extendedkeyUsage \u7C7B\u578B: "},
- {"Unknown.AccessDescription.type.", "\u672A\u77E5 AccessDescription \u7C7B\u578B: "},
- {"Unrecognized.GeneralName.type.", "\u65E0\u6CD5\u8BC6\u522B\u7684 GeneralName \u7C7B\u578B: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "\u65E0\u6CD5\u5C06\u6B64\u6269\u5C55\u6807\u8BB0\u4E3A\u201C\u4E25\u91CD\u201D\u3002"},
- {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5947\u6570\u4E2A\u5341\u516D\u8FDB\u5236\u6570\u5B57: "},
- {"Unknown.extension.type.", "\u672A\u77E5\u6269\u5C55\u7C7B\u578B: "},
- {"command.{0}.is.ambiguous.", "\u547D\u4EE4{0}\u4E0D\u660E\u786E:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "\u8B66\u544A: \u522B\u540D {0} \u7684\u516C\u5171\u5BC6\u94A5\u4E0D\u5B58\u5728\u3002\u8BF7\u786E\u4FDD\u5DF2\u6B63\u786E\u914D\u7F6E KeyStore\u3002"},
- {"Warning.Class.not.found.class", "\u8B66\u544A: \u627E\u4E0D\u5230\u7C7B: {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "\u8B66\u544A: \u6784\u9020\u5668\u7684\u53C2\u6570\u65E0\u6548: {0}"},
- {"Illegal.Principal.Type.type", "\u975E\u6CD5\u7684\u4E3B\u7528\u6237\u7C7B\u578B: {0}"},
- {"Illegal.option.option", "\u975E\u6CD5\u9009\u9879: {0}"},
- {"Usage.policytool.options.", "\u7528\u6CD5: policytool [\u9009\u9879]"},
- {".file.file.policy.file.location",
- " [-file <file>] \u7B56\u7565\u6587\u4EF6\u4F4D\u7F6E"},
- {"New", "\u65B0\u5EFA"},
- {"Open", "\u6253\u5F00"},
- {"Save", "\u4FDD\u5B58"},
- {"Save.As", "\u53E6\u5B58\u4E3A"},
- {"View.Warning.Log", "\u67E5\u770B\u8B66\u544A\u65E5\u5FD7"},
- {"Exit", "\u9000\u51FA"},
- {"Add.Policy.Entry", "\u6DFB\u52A0\u7B56\u7565\u6761\u76EE"},
- {"Edit.Policy.Entry", "\u7F16\u8F91\u7B56\u7565\u6761\u76EE"},
- {"Remove.Policy.Entry", "\u5220\u9664\u7B56\u7565\u6761\u76EE"},
- {"Edit", "\u7F16\u8F91"},
- {"Retain", "\u4FDD\u7559"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "\u8B66\u544A: \u6587\u4EF6\u540D\u5305\u542B\u8F6C\u4E49\u7684\u53CD\u659C\u6760\u5B57\u7B26\u3002\u4E0D\u9700\u8981\u5BF9\u53CD\u659C\u6760\u5B57\u7B26\u8FDB\u884C\u8F6C\u4E49 (\u8BE5\u5DE5\u5177\u5728\u5C06\u7B56\u7565\u5185\u5BB9\u5199\u5165\u6C38\u4E45\u5B58\u50A8\u65F6\u4F1A\u6839\u636E\u9700\u8981\u5BF9\u5B57\u7B26\u8FDB\u884C\u8F6C\u4E49)\u3002\n\n\u5355\u51FB\u201C\u4FDD\u7559\u201D\u53EF\u4FDD\u7559\u8F93\u5165\u7684\u540D\u79F0, \u6216\u8005\u5355\u51FB\u201C\u7F16\u8F91\u201D\u53EF\u7F16\u8F91\u8BE5\u540D\u79F0\u3002"},
-
- {"Add.Public.Key.Alias", "\u6DFB\u52A0\u516C\u5171\u5BC6\u94A5\u522B\u540D"},
- {"Remove.Public.Key.Alias", "\u5220\u9664\u516C\u5171\u5BC6\u94A5\u522B\u540D"},
- {"File", "\u6587\u4EF6"},
- {"KeyStore", "KeyStore"},
- {"Policy.File.", "\u7B56\u7565\u6587\u4EF6:"},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "\u65E0\u6CD5\u6253\u5F00\u7B56\u7565\u6587\u4EF6: {0}: {1}"},
- {"Policy.Tool", "\u7B56\u7565\u5DE5\u5177"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "\u6253\u5F00\u7B56\u7565\u914D\u7F6E\u65F6\u51FA\u9519\u3002\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u67E5\u770B\u8B66\u544A\u65E5\u5FD7\u3002"},
- {"Error", "\u9519\u8BEF"},
- {"OK", "\u786E\u5B9A"},
- {"Status", "\u72B6\u6001"},
- {"Warning", "\u8B66\u544A"},
- {"Permission.",
- "\u6743\u9650: "},
- {"Principal.Type.", "\u4E3B\u7528\u6237\u7C7B\u578B:"},
- {"Principal.Name.", "\u4E3B\u7528\u6237\u540D\u79F0:"},
- {"Target.Name.",
- "\u76EE\u6807\u540D\u79F0: "},
- {"Actions.",
- "\u64CD\u4F5C: "},
- {"OK.to.overwrite.existing.file.filename.",
- "\u786E\u8BA4\u8986\u76D6\u73B0\u6709\u7684\u6587\u4EF6{0}?"},
- {"Cancel", "\u53D6\u6D88"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "\u6DFB\u52A0\u4E3B\u7528\u6237"},
- {"Edit.Principal", "\u7F16\u8F91\u4E3B\u7528\u6237"},
- {"Remove.Principal", "\u5220\u9664\u4E3B\u7528\u6237"},
- {"Principals.", "\u4E3B\u7528\u6237:"},
- {".Add.Permission", " \u6DFB\u52A0\u6743\u9650"},
- {".Edit.Permission", " \u7F16\u8F91\u6743\u9650"},
- {"Remove.Permission", "\u5220\u9664\u6743\u9650"},
- {"Done", "\u5B8C\u6210"},
- {"KeyStore.URL.", "KeyStore URL:"},
- {"KeyStore.Type.", "KeyStore \u7C7B\u578B:"},
- {"KeyStore.Provider.", "KeyStore \u63D0\u4F9B\u65B9:"},
- {"KeyStore.Password.URL.", "KeyStore \u53E3\u4EE4 URL:"},
- {"Principals", "\u4E3B\u7528\u6237"},
- {".Edit.Principal.", " \u7F16\u8F91\u4E3B\u7528\u6237:"},
- {".Add.New.Principal.", " \u6DFB\u52A0\u65B0\u4E3B\u7528\u6237:"},
- {"Permissions", "\u6743\u9650"},
- {".Edit.Permission.", " \u7F16\u8F91\u6743\u9650:"},
- {".Add.New.Permission.", " \u52A0\u5165\u65B0\u7684\u6743\u9650:"},
- {"Signed.By.", "\u7B7E\u7F72\u4EBA: "},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"},
- {"Cannot.Specify.Principal.without.a.Name",
- "\u6CA1\u6709\u540D\u79F0, \u65E0\u6CD5\u6307\u5B9A\u4E3B\u7528\u6237"},
- {"Permission.and.Target.Name.must.have.a.value",
- "\u6743\u9650\u53CA\u76EE\u6807\u540D\u5FC5\u987B\u6709\u4E00\u4E2A\u503C"},
- {"Remove.this.Policy.Entry.", "\u662F\u5426\u5220\u9664\u6B64\u7B56\u7565\u6761\u76EE?"},
- {"Overwrite.File", "\u8986\u76D6\u6587\u4EF6"},
- {"Policy.successfully.written.to.filename",
- "\u7B56\u7565\u5DF2\u6210\u529F\u5199\u5165\u5230{0}"},
- {"null.filename", "\u7A7A\u6587\u4EF6\u540D"},
- {"Save.changes.", "\u662F\u5426\u4FDD\u5B58\u6240\u505A\u7684\u66F4\u6539?"},
- {"Yes", "\u662F"},
- {"No", "\u5426"},
- {"Policy.Entry", "\u7B56\u7565\u6761\u76EE"},
- {"Save.Changes", "\u4FDD\u5B58\u66F4\u6539"},
- {"No.Policy.Entry.selected", "\u6CA1\u6709\u9009\u62E9\u7B56\u7565\u6761\u76EE"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "\u65E0\u6CD5\u6253\u5F00 KeyStore: {0}"},
- {"No.principal.selected", "\u672A\u9009\u62E9\u4E3B\u7528\u6237"},
- {"No.permission.selected", "\u6CA1\u6709\u9009\u62E9\u6743\u9650"},
- {"name", "\u540D\u79F0"},
- {"configuration.type", "\u914D\u7F6E\u7C7B\u578B"},
- {"environment.variable.name", "\u73AF\u5883\u53D8\u91CF\u540D"},
- {"library.name", "\u5E93\u540D\u79F0"},
- {"package.name", "\u7A0B\u5E8F\u5305\u540D\u79F0"},
- {"policy.type", "\u7B56\u7565\u7C7B\u578B"},
- {"property.name", "\u5C5E\u6027\u540D\u79F0"},
- {"Principal.List", "\u4E3B\u7528\u6237\u5217\u8868"},
- {"Permission.List", "\u6743\u9650\u5217\u8868"},
- {"Code.Base", "\u4EE3\u7801\u5E93"},
- {"KeyStore.U.R.L.", "KeyStore URL:"},
- {"KeyStore.Password.U.R.L.", "KeyStore \u53E3\u4EE4 URL:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "\u65E0\u6548\u7684\u7A7A\u8F93\u5165"},
{"actions.can.only.be.read.", "\u64CD\u4F5C\u53EA\u80FD\u4E3A '\u8BFB\u53D6'"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "\u63D0\u4F9B\u7684 OID \u6620\u5C04\u4E3A\u7A7A\u503C"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A AccessControlContext"},
{"invalid.null.action.provided", "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A\u64CD\u4F5C"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java b/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
index cf0fe5e..b95647a 100644
--- a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
+++ b/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,501 +34,6 @@
private static final Object[][] contents = {
- // shared (from jarsigner)
- {"SPACE", " "},
- {"2SPACE", " "},
- {"6SPACE", " "},
- {"COMMA", ", "},
- // shared (from keytool)
- {"NEWLINE", "\n"},
- {"STAR",
- "*******************************************"},
- {"STARNN",
- "*******************************************\n\n"},
-
- // keytool: Help part
-// "Option" should be translated.
- {".OPTION.", " [\u9078\u9805]..."},
- {"Options.", "\u9078\u9805:"},
- {"Use.keytool.help.for.all.available.commands",
- "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
- {"Key.and.Certificate.Management.Tool",
- "\u91D1\u9470\u8207\u6191\u8B49\u7BA1\u7406\u5DE5\u5177"},
- {"Commands.", "\u547D\u4EE4:"},
- {"Use.keytool.command.name.help.for.usage.of.command.name",
- "\u4F7F\u7528 \"keytool -command_name -help\" \u53D6\u5F97 command_name \u7684\u7528\u6CD5"},
- // keytool: help: commands
- {"Generates.a.certificate.request",
- "\u7522\u751F\u6191\u8B49\u8981\u6C42"}, //-certreq
- {"Changes.an.entry.s.alias",
- "\u8B8A\u66F4\u9805\u76EE\u7684\u5225\u540D"}, //-changealias
- {"Deletes.an.entry",
- "\u522A\u9664\u9805\u76EE"}, //-delete
- {"Exports.certificate",
- "\u532F\u51FA\u6191\u8B49"}, //-exportcert
- {"Generates.a.key.pair",
- "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
- {"Generates.a.secret.key",
- "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
- {"Generates.certificate.from.a.certificate.request",
- "\u5F9E\u6191\u8B49\u8981\u6C42\u7522\u751F\u6191\u8B49"}, //-gencert
- {"Generates.CRL", "\u7522\u751F CRL"}, //-gencrl
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "\u5F9E JDK 1.1.x-style \u8B58\u5225\u8CC7\u6599\u5EAB\u532F\u5165\u9805\u76EE"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
- "\u532F\u5165\u6191\u8B49\u6216\u6191\u8B49\u93C8"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "\u5F9E\u5176\u4ED6\u91D1\u9470\u5132\u5B58\u5EAB\u532F\u5165\u4E00\u500B\u6216\u5168\u90E8\u9805\u76EE"}, //-importkeystore
- {"Clones.a.key.entry",
- "\u8907\u88FD\u91D1\u9470\u9805\u76EE"}, //-keyclone
- {"Changes.the.key.password.of.an.entry",
- "\u8B8A\u66F4\u9805\u76EE\u7684\u91D1\u9470\u5BC6\u78BC"}, //-keypasswd
- {"Lists.entries.in.a.keystore",
- "\u5217\u793A\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u9805\u76EE"}, //-list
- {"Prints.the.content.of.a.certificate",
- "\u5217\u5370\u6191\u8B49\u7684\u5167\u5BB9"}, //-printcert
- {"Prints.the.content.of.a.certificate.request",
- "\u5217\u5370\u6191\u8B49\u8981\u6C42\u7684\u5167\u5BB9"}, //-printcertreq
- {"Prints.the.content.of.a.CRL.file",
- "\u5217\u5370 CRL \u6A94\u6848\u7684\u5167\u5BB9"}, //-printcrl
- {"Generates.a.self.signed.certificate",
- "\u7522\u751F\u81EA\u884C\u7C3D\u7F72\u7684\u6191\u8B49"}, //-selfcert
- {"Changes.the.store.password.of.a.keystore",
- "\u8B8A\u66F4\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5132\u5B58\u5BC6\u78BC"}, //-storepasswd
- // keytool: help: options
- {"alias.name.of.the.entry.to.process",
- "\u8981\u8655\u7406\u9805\u76EE\u7684\u5225\u540D\u540D\u7A31"}, //-alias
- {"destination.alias",
- "\u76EE\u7684\u5730\u5225\u540D"}, //-destalias
- {"destination.key.password",
- "\u76EE\u7684\u5730\u91D1\u9470\u5BC6\u78BC"}, //-destkeypass
- {"destination.keystore.name",
- "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-destkeystore
- {"destination.keystore.password.protected",
- "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-destprotected
- {"destination.keystore.provider.name",
- "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-destprovidername
- {"destination.keystore.password",
- "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-deststorepass
- {"destination.keystore.type",
- "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-deststoretype
- {"distinguished.name",
- "\u8FA8\u5225\u540D\u7A31"}, //-dname
- {"X.509.extension",
- "X.509 \u64F4\u5145\u5957\u4EF6"}, //-ext
- {"output.file.name",
- "\u8F38\u51FA\u6A94\u6848\u540D\u7A31"}, //-file and -outfile
- {"input.file.name",
- "\u8F38\u5165\u6A94\u6848\u540D\u7A31"}, //-file and -infile
- {"key.algorithm.name",
- "\u91D1\u9470\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-keyalg
- {"key.password",
- "\u91D1\u9470\u5BC6\u78BC"}, //-keypass
- {"key.bit.size",
- "\u91D1\u9470\u4F4D\u5143\u5927\u5C0F"}, //-keysize
- {"keystore.name",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-keystore
- {"new.password",
- "\u65B0\u5BC6\u78BC"}, //-new
- {"do.not.prompt",
- "\u4E0D\u8981\u63D0\u793A"}, //-noprompt
- {"password.through.protected.mechanism",
- "\u7D93\u7531\u4FDD\u8B77\u6A5F\u5236\u7684\u5BC6\u78BC"}, //-protected
- {"provider.argument",
- "\u63D0\u4F9B\u8005\u5F15\u6578"}, //-providerarg
- {"provider.class.name",
- "\u63D0\u4F9B\u8005\u985E\u5225\u540D\u7A31"}, //-providerclass
- {"provider.name",
- "\u63D0\u4F9B\u8005\u540D\u7A31"}, //-providername
- {"provider.classpath",
- "\u63D0\u4F9B\u8005\u985E\u5225\u8DEF\u5F91"}, //-providerpath
- {"output.in.RFC.style",
- "\u4EE5 RFC \u6A23\u5F0F\u8F38\u51FA"}, //-rfc
- {"signature.algorithm.name",
- "\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-sigalg
- {"source.alias",
- "\u4F86\u6E90\u5225\u540D"}, //-srcalias
- {"source.key.password",
- "\u4F86\u6E90\u91D1\u9470\u5BC6\u78BC"}, //-srckeypass
- {"source.keystore.name",
- "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-srckeystore
- {"source.keystore.password.protected",
- "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-srcprotected
- {"source.keystore.provider.name",
- "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-srcprovidername
- {"source.keystore.password",
- "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-srcstorepass
- {"source.keystore.type",
- "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-srcstoretype
- {"SSL.server.host.and.port",
- "SSL \u4F3A\u670D\u5668\u4E3B\u6A5F\u8207\u9023\u63A5\u57E0"}, //-sslserver
- {"signed.jar.file",
- "\u7C3D\u7F72\u7684 jar \u6A94\u6848"}, //=jarfile
- {"certificate.validity.start.date.time",
- "\u6191\u8B49\u6709\u6548\u6027\u958B\u59CB\u65E5\u671F/\u6642\u9593"}, //-startdate
- {"keystore.password",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-storepass
- {"keystore.type",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-storetype
- {"trust.certificates.from.cacerts",
- "\u4F86\u81EA cacerts \u7684\u4FE1\u4EFB\u6191\u8B49"}, //-trustcacerts
- {"verbose.output",
- "\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA"}, //-v
- {"validity.number.of.days",
- "\u6709\u6548\u6027\u65E5\u6578"}, //-validity
- {"Serial.ID.of.cert.to.revoke",
- "\u8981\u64A4\u92B7\u6191\u8B49\u7684\u5E8F\u5217 ID"}, //-id
- // keytool: Running part
- {"keytool.error.", "\u91D1\u9470\u5DE5\u5177\u932F\u8AA4: "},
- {"Illegal.option.", "\u7121\u6548\u7684\u9078\u9805:"},
- {"Illegal.value.", "\u7121\u6548\u503C: "},
- {"Unknown.password.type.", "\u4E0D\u660E\u7684\u5BC6\u78BC\u985E\u578B: "},
- {"Cannot.find.environment.variable.",
- "\u627E\u4E0D\u5230\u74B0\u5883\u8B8A\u6578: "},
- {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6A94\u6848: "},
- {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9078\u9805 {0} \u9700\u8981\u5F15\u6578\u3002"},
- {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
- "\u8B66\u544A: PKCS12 \u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u652F\u63F4\u4E0D\u540C\u7684\u5132\u5B58\u5EAB\u548C\u91D1\u9470\u5BC6\u78BC\u3002\u5FFD\u7565\u4F7F\u7528\u8005\u6307\u5B9A\u7684 {0} \u503C\u3002"},
- {".keystore.must.be.NONE.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247 -keystore \u5FC5\u9808\u70BA NONE"},
- {"Too.many.retries.program.terminated",
- "\u91CD\u8A66\u6B21\u6578\u592A\u591A\uFF0C\u7A0B\u5F0F\u5DF2\u7D42\u6B62"},
- {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u652F\u63F4 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
- {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
- "\u5982\u679C -storetype \u70BA PKCS12\uFF0C\u5247\u4E0D\u652F\u63F4 -keypasswd \u547D\u4EE4"},
- {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
- "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
- {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
- "\u5982\u679C\u6307\u5B9A -protected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
- {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\u5982\u679C\u6307\u5B9A -srcprotected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
- {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
- "\u5982\u679C\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
- {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
- "\u5982\u679C\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
- {"Illegal.startdate.value", "\u7121\u6548\u7684 startdate \u503C"},
- {"Validity.must.be.greater.than.zero",
- "\u6709\u6548\u6027\u5FC5\u9808\u5927\u65BC\u96F6"},
- {"provName.not.a.provider", "{0} \u4E0D\u662F\u4E00\u500B\u63D0\u4F9B\u8005"},
- {"Usage.error.no.command.provided", "\u7528\u6CD5\u932F\u8AA4: \u672A\u63D0\u4F9B\u547D\u4EE4"},
- {"Source.keystore.file.exists.but.is.empty.", "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A: "},
- {"Please.specify.srckeystore", "\u8ACB\u6307\u5B9A -srckeystore"},
- {"Must.not.specify.both.v.and.rfc.with.list.command",
- " 'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u6642\u6307\u5B9A -v \u53CA -rfc"},
- {"Key.password.must.be.at.least.6.characters",
- "\u91D1\u9470\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"New.password.must.be.at.least.6.characters",
- "\u65B0\u7684\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"Keystore.file.exists.but.is.empty.",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A\u767D: "},
- {"Keystore.file.does.not.exist.",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u4E0D\u5B58\u5728: "},
- {"Must.specify.destination.alias", "\u5FC5\u9808\u6307\u5B9A\u76EE\u7684\u5730\u5225\u540D"},
- {"Must.specify.alias", "\u5FC5\u9808\u6307\u5B9A\u5225\u540D"},
- {"Keystore.password.must.be.at.least.6.characters",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"Enter.keystore.password.", "\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
- {"Enter.source.keystore.password.", "\u8ACB\u8F38\u5165\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
- {"Enter.destination.keystore.password.", "\u8ACB\u8F38\u5165\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
- {"Keystore.password.is.too.short.must.be.at.least.6.characters",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"Unknown.Entry.Type", "\u4E0D\u660E\u7684\u9805\u76EE\u985E\u578B"},
- {"Too.many.failures.Alias.not.changed", "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8B8A\u66F4\u5225\u540D"},
- {"Entry.for.alias.alias.successfully.imported.",
- "\u5DF2\u6210\u529F\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
- {"Entry.for.alias.alias.not.imported.", "\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
- {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
- "\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u6642\u51FA\u73FE\u554F\u984C: {1}\u3002\n\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
- {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
- "\u5DF2\u5B8C\u6210\u532F\u5165\u547D\u4EE4: \u6210\u529F\u532F\u5165 {0} \u500B\u9805\u76EE\uFF0C{1} \u500B\u9805\u76EE\u5931\u6557\u6216\u5DF2\u53D6\u6D88"},
- {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
- "\u8B66\u544A: \u6B63\u5728\u8986\u5BEB\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u73FE\u6709\u5225\u540D {0}"},
- {"Existing.entry.alias.alias.exists.overwrite.no.",
- "\u73FE\u6709\u9805\u76EE\u5225\u540D {0} \u5B58\u5728\uFF0C\u662F\u5426\u8986\u5BEB\uFF1F[\u5426]: "},
- {"Too.many.failures.try.later", "\u592A\u591A\u932F\u8AA4 - \u8ACB\u7A0D\u5F8C\u518D\u8A66"},
- {"Certification.request.stored.in.file.filename.",
- "\u8A8D\u8B49\u8981\u6C42\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
- {"Submit.this.to.your.CA", "\u5C07\u6B64\u9001\u51FA\u81F3\u60A8\u7684 CA"},
- {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
- "\u5982\u679C\u672A\u6307\u5B9A\u5225\u540D\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A destalias\u3001srckeypass \u53CA destkeypass"},
- {"Certificate.stored.in.file.filename.",
- "\u6191\u8B49\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
- {"Certificate.reply.was.installed.in.keystore",
- "\u6191\u8B49\u56DE\u8986\u5DF2\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
- {"Certificate.reply.was.not.installed.in.keystore",
- "\u6191\u8B49\u56DE\u8986\u672A\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
- {"Certificate.was.added.to.keystore",
- "\u6191\u8B49\u5DF2\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
- {"Certificate.was.not.added.to.keystore",
- "\u6191\u8B49\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
- {".Storing.ksfname.", "[\u5132\u5B58 {0}]"},
- {"alias.has.no.public.key.certificate.",
- "{0} \u6C92\u6709\u516C\u958B\u91D1\u9470 (\u6191\u8B49)"},
- {"Cannot.derive.signature.algorithm",
- "\u7121\u6CD5\u53D6\u5F97\u7C3D\u7AE0\u6F14\u7B97\u6CD5"},
- {"Alias.alias.does.not.exist",
- "\u5225\u540D <{0}> \u4E0D\u5B58\u5728"},
- {"Alias.alias.has.no.certificate",
- "\u5225\u540D <{0}> \u6C92\u6709\u6191\u8B49"},
- {"Key.pair.not.generated.alias.alias.already.exists",
- "\u6C92\u6709\u5EFA\u7ACB\u91D1\u9470\u7D44\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
- {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
- "\u91DD\u5C0D {4} \u7522\u751F\u6709\u6548\u671F {3} \u5929\u7684 {0} \u4F4D\u5143 {1} \u91D1\u9470\u7D44\u4EE5\u53CA\u81EA\u6211\u7C3D\u7F72\u6191\u8B49 ({2})\n\t"},
- {"Enter.key.password.for.alias.", "\u8F38\u5165 <{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
- {".RETURN.if.same.as.keystore.password.",
- "\t(RETURN \u5982\u679C\u548C\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u76F8\u540C): "},
- {"Key.password.is.too.short.must.be.at.least.6.characters",
- "\u91D1\u9470\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"Too.many.failures.key.not.added.to.keystore",
- "\u592A\u591A\u932F\u8AA4 - \u91D1\u9470\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB"},
- {"Destination.alias.dest.already.exists",
- "\u76EE\u7684\u5730\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
- {"Password.is.too.short.must.be.at.least.6.characters",
- "\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
- {"Too.many.failures.Key.entry.not.cloned",
- "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8907\u88FD\u91D1\u9470\u9805\u76EE"},
- {"key.password.for.alias.", "<{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
- {"Keystore.entry.for.id.getName.already.exists",
- "<{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE\u5DF2\u7D93\u5B58\u5728"},
- {"Creating.keystore.entry.for.id.getName.",
- "\u5EFA\u7ACB <{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE..."},
- {"No.entries.from.identity.database.added",
- "\u6C92\u6709\u65B0\u589E\u4F86\u81EA\u8B58\u5225\u8CC7\u6599\u5EAB\u7684\u9805\u76EE"},
- {"Alias.name.alias", "\u5225\u540D\u540D\u7A31: {0}"},
- {"Creation.date.keyStore.getCreationDate.alias.",
- "\u5EFA\u7ACB\u65E5\u671F: {0,date}"},
- {"alias.keyStore.getCreationDate.alias.",
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "\u9805\u76EE\u985E\u578B: {0}"},
- {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
- {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "},
- {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
- {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
- {"Your.keystore.contains.keyStore.size.entry",
- "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
- {"Your.keystore.contains.keyStore.size.entries",
- "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
- {"Failed.to.parse.input", "\u7121\u6CD5\u5256\u6790\u8F38\u5165"},
- {"Empty.input", "\u7A7A\u8F38\u5165"},
- {"Not.X.509.certificate", "\u975E X.509 \u6191\u8B49"},
- {"alias.has.no.public.key", "{0} \u7121\u516C\u958B\u91D1\u9470"},
- {"alias.has.no.X.509.certificate", "{0} \u7121 X.509 \u6191\u8B49"},
- {"New.certificate.self.signed.", "\u65B0\u6191\u8B49 (\u81EA\u6211\u7C3D\u7F72): "},
- {"Reply.has.no.certificates", "\u56DE\u8986\u4E0D\u542B\u6191\u8B49"},
- {"Certificate.not.imported.alias.alias.already.exists",
- "\u6191\u8B49\u672A\u8F38\u5165\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
- {"Input.not.an.X.509.certificate", "\u8F38\u5165\u7684\u4E0D\u662F X.509 \u6191\u8B49"},
- {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
- "\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
- {"Do.you.still.want.to.add.it.no.",
- "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u55CE\uFF1F [\u5426]: "},
- {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
- "\u6574\u500B\u7CFB\u7D71 CA \u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
- {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
- "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u81F3\u81EA\u5DF1\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u55CE\uFF1F [\u5426]: "},
- {"Trust.this.certificate.no.", "\u4FE1\u4EFB\u9019\u500B\u6191\u8B49\uFF1F [\u5426]: "},
- {"YES", "\u662F"},
- {"New.prompt.", "\u65B0 {0}: "},
- {"Passwords.must.differ", "\u5FC5\u9808\u662F\u4E0D\u540C\u7684\u5BC6\u78BC"},
- {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F38\u5165\u65B0 {0}: "},
- {"Re.enter.new.password.", "\u91CD\u65B0\u8F38\u5165\u65B0\u5BC6\u78BC: "},
- {"They.don.t.match.Try.again", "\u5B83\u5011\u4E0D\u76F8\u7B26\u3002\u8ACB\u91CD\u8A66"},
- {"Enter.prompt.alias.name.", "\u8F38\u5165 {0} \u5225\u540D\u540D\u7A31: "},
- {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
- "\u8ACB\u8F38\u5165\u65B0\u7684\u5225\u540D\u540D\u7A31\t(RETURN \u4EE5\u53D6\u6D88\u532F\u5165\u6B64\u9805\u76EE):"},
- {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31: "},
- {".RETURN.if.same.as.for.otherAlias.",
- "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"},
- {".PATTERN.printX509Cert",
- "\u64C1\u6709\u8005: {0}\n\u767C\u51FA\u8005: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\t \u7248\u672C: {9}"},
- {"What.is.your.first.and.last.name.",
- "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"},
- {"What.is.the.name.of.your.organizational.unit.",
- "\u60A8\u7684\u7D44\u7E54\u55AE\u4F4D\u540D\u7A31\u70BA\u4F55\uFF1F"},
- {"What.is.the.name.of.your.organization.",
- "\u60A8\u7684\u7D44\u7E54\u540D\u7A31\u70BA\u4F55\uFF1F"},
- {"What.is.the.name.of.your.City.or.Locality.",
- "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u5730\u5340\u540D\u7A31\u70BA\u4F55\uFF1F"},
- {"What.is.the.name.of.your.State.or.Province.",
- "\u60A8\u6240\u5728\u7684\u5DDE\u53CA\u7701\u4EFD\u540D\u7A31\u70BA\u4F55\uFF1F"},
- {"What.is.the.two.letter.country.code.for.this.unit.",
- "\u6B64\u55AE\u4F4D\u7684\u5169\u500B\u5B57\u6BCD\u570B\u5225\u4EE3\u78BC\u70BA\u4F55\uFF1F"},
- {"Is.name.correct.", "{0} \u6B63\u78BA\u55CE\uFF1F"},
- {"no", "\u5426"},
- {"yes", "\u662F"},
- {"y", "y"},
- {".defaultValue.", " [{0}]: "},
- {"Alias.alias.has.no.key",
- "\u5225\u540D <{0}> \u6C92\u6709\u91D1\u9470"},
- {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
- "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
-
- {".WARNING.WARNING.WARNING.",
- "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"},
- {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
- {"Timestamp.", "\u6642\u6233:"},
- {"Signature.", "\u7C3D\u7AE0:"},
- {"CRLs.", "CRL:"},
- {"Certificate.owner.", "\u6191\u8B49\u64C1\u6709\u8005: "},
- {"Not.a.signed.jar.file", "\u4E0D\u662F\u7C3D\u7F72\u7684 jar \u6A94\u6848"},
- {"No.certificate.from.the.SSL.server",
- "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
-
- {".The.integrity.of.the.information.stored.in.your.keystore.",
- "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"},
- {".The.integrity.of.the.information.stored.in.the.srckeystore.",
- "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"},
-
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
- {"Incomplete.certificate.chain.in.reply",
- "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u4E0D\u5B8C\u6574"},
- {"Certificate.chain.in.reply.does.not.verify.",
- "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
- {"Top.level.certificate.in.reply.",
- "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
- {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
- {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "},
- {"NO", "\u5426"},
- {"Public.keys.in.reply.and.keystore.don.t.match",
- "\u56DE\u8986\u6642\u7684\u516C\u958B\u91D1\u9470\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u7B26"},
- {"Certificate.reply.and.certificate.in.keystore.are.identical",
- "\u6191\u8B49\u56DE\u8986\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u6191\u8B49\u662F\u76F8\u540C\u7684"},
- {"Failed.to.establish.chain.from.reply",
- "\u7121\u6CD5\u5F9E\u56DE\u8986\u4E2D\u5C07\u93C8\u5EFA\u7ACB\u8D77\u4F86"},
- {"n", "n"},
- {"Wrong.answer.try.again", "\u932F\u8AA4\u7684\u7B54\u6848\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21"},
- {"Secret.key.not.generated.alias.alias.already.exists",
- "\u672A\u7522\u751F\u79D8\u5BC6\u91D1\u9470\uFF0C\u5225\u540D <{0}> \u5DF2\u5B58\u5728"},
- {"Please.provide.keysize.for.secret.key.generation",
- "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"},
-
- {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "},
- {".Empty.value.", "(\u7A7A\u767D\u503C)"},
- {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"},
- {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
- "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u516C\u7528\u91D1\u9470: %s \u683C\u5F0F %s \u91D1\u9470\n"},
- {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "},
- {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "},
- {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "},
- {"Unrecognized.GeneralName.type.", "\u7121\u6CD5\u8FA8\u8B58\u7684 GeneralName \u985E\u578B: "},
- {"This.extension.cannot.be.marked.as.critical.",
- "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"},
- {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "},
- {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "},
- {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"},
-
- // policytool
- {"Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured.",
- "\u8B66\u544A: \u5225\u540D {0} \u7684\u516C\u958B\u91D1\u9470\u4E0D\u5B58\u5728\u3002\u8ACB\u78BA\u5B9A\u91D1\u9470\u5132\u5B58\u5EAB\u914D\u7F6E\u6B63\u78BA\u3002"},
- {"Warning.Class.not.found.class", "\u8B66\u544A: \u627E\u4E0D\u5230\u985E\u5225 {0}"},
- {"Warning.Invalid.argument.s.for.constructor.arg",
- "\u8B66\u544A: \u7121\u6548\u7684\u5EFA\u69CB\u5B50\u5F15\u6578: {0}"},
- {"Illegal.Principal.Type.type", "\u7121\u6548\u7684 Principal \u985E\u578B: {0}"},
- {"Illegal.option.option", "\u7121\u6548\u7684\u9078\u9805: {0}"},
- {"Usage.policytool.options.", "\u7528\u6CD5: policytool [options]"},
- {".file.file.policy.file.location",
- " [-file <file>] \u539F\u5247\u6A94\u6848\u4F4D\u7F6E"},
- {"New", "\u65B0\u589E"},
- {"Open", "\u958B\u555F"},
- {"Save", "\u5132\u5B58"},
- {"Save.As", "\u53E6\u5B58\u65B0\u6A94"},
- {"View.Warning.Log", "\u6AA2\u8996\u8B66\u544A\u8A18\u9304"},
- {"Exit", "\u7D50\u675F"},
- {"Add.Policy.Entry", "\u65B0\u589E\u539F\u5247\u9805\u76EE"},
- {"Edit.Policy.Entry", "\u7DE8\u8F2F\u539F\u5247\u9805\u76EE"},
- {"Remove.Policy.Entry", "\u79FB\u9664\u539F\u5247\u9805\u76EE"},
- {"Edit", "\u7DE8\u8F2F"},
- {"Retain", "\u4FDD\u7559"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
- "\u8B66\u544A: \u6A94\u6848\u540D\u7A31\u5305\u542B\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143\u3002\u4E0D\u9700\u8981\u9041\u96E2\u53CD\u659C\u7DDA\u5B57\u5143 (\u64B0\u5BEB\u539F\u5247\u5167\u5BB9\u81F3\u6C38\u4E45\u5B58\u653E\u5340\u6642\u9700\u8981\u5DE5\u5177\u9041\u96E2\u5B57\u5143)\u3002\n\n\u6309\u4E00\u4E0B\u300C\u4FDD\u7559\u300D\u4EE5\u4FDD\u7559\u8F38\u5165\u7684\u540D\u7A31\uFF0C\u6216\u6309\u4E00\u4E0B\u300C\u7DE8\u8F2F\u300D\u4EE5\u7DE8\u8F2F\u540D\u7A31\u3002"},
-
- {"Add.Public.Key.Alias", "\u65B0\u589E\u516C\u958B\u91D1\u9470\u5225\u540D"},
- {"Remove.Public.Key.Alias", "\u79FB\u9664\u516C\u958B\u91D1\u9470\u5225\u540D"},
- {"File", "\u6A94\u6848"},
- {"KeyStore", "\u91D1\u9470\u5132\u5B58\u5EAB"},
- {"Policy.File.", "\u539F\u5247\u6A94\u6848: "},
- {"Could.not.open.policy.file.policyFile.e.toString.",
- "\u7121\u6CD5\u958B\u555F\u539F\u5247\u6A94\u6848: {0}: {1}"},
- {"Policy.Tool", "\u539F\u5247\u5DE5\u5177"},
- {"Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information.",
- "\u958B\u555F\u539F\u5247\u8A18\u7F6E\u6642\u767C\u751F\u932F\u8AA4\u3002\u8ACB\u6AA2\u8996\u8B66\u544A\u8A18\u9304\u4EE5\u53D6\u5F97\u66F4\u591A\u7684\u8CC7\u8A0A"},
- {"Error", "\u932F\u8AA4"},
- {"OK", "\u78BA\u5B9A"},
- {"Status", "\u72C0\u614B"},
- {"Warning", "\u8B66\u544A"},
- {"Permission.",
- "\u6B0A\u9650: "},
- {"Principal.Type.", "Principal \u985E\u578B: "},
- {"Principal.Name.", "Principal \u540D\u7A31: "},
- {"Target.Name.",
- "\u76EE\u6A19\u540D\u7A31: "},
- {"Actions.",
- "\u52D5\u4F5C: "},
- {"OK.to.overwrite.existing.file.filename.",
- "\u78BA\u8A8D\u8986\u5BEB\u73FE\u5B58\u7684\u6A94\u6848 {0}\uFF1F"},
- {"Cancel", "\u53D6\u6D88"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "\u65B0\u589E Principal"},
- {"Edit.Principal", "\u7DE8\u8F2F Principal"},
- {"Remove.Principal", "\u79FB\u9664 Principal"},
- {"Principals.", "Principal:"},
- {".Add.Permission", " \u65B0\u589E\u6B0A\u9650"},
- {".Edit.Permission", " \u7DE8\u8F2F\u6B0A\u9650"},
- {"Remove.Permission", "\u79FB\u9664\u6B0A\u9650"},
- {"Done", "\u5B8C\u6210"},
- {"KeyStore.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB URL: "},
- {"KeyStore.Type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B:"},
- {"KeyStore.Provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005:"},
- {"KeyStore.Password.URL.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL: "},
- {"Principals", "Principal"},
- {".Edit.Principal.", " \u7DE8\u8F2F Principal: "},
- {".Add.New.Principal.", " \u65B0\u589E Principal: "},
- {"Permissions", "\u6B0A\u9650"},
- {".Edit.Permission.", " \u7DE8\u8F2F\u6B0A\u9650:"},
- {".Add.New.Permission.", " \u65B0\u589E\u6B0A\u9650:"},
- {"Signed.By.", "\u7C3D\u7F72\u4EBA: "},
- {"Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name",
- "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
- {"Cannot.Specify.Principal.without.a.Name",
- "\u6C92\u6709\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A Principal"},
- {"Permission.and.Target.Name.must.have.a.value",
- "\u6B0A\u9650\u53CA\u76EE\u6A19\u540D\u7A31\u5FC5\u9808\u6709\u4E00\u500B\u503C\u3002"},
- {"Remove.this.Policy.Entry.", "\u79FB\u9664\u9019\u500B\u539F\u5247\u9805\u76EE\uFF1F"},
- {"Overwrite.File", "\u8986\u5BEB\u6A94\u6848"},
- {"Policy.successfully.written.to.filename",
- "\u539F\u5247\u6210\u529F\u5BEB\u5165\u81F3 {0}"},
- {"null.filename", "\u7A7A\u503C\u6A94\u540D"},
- {"Save.changes.", "\u5132\u5B58\u8B8A\u66F4\uFF1F"},
- {"Yes", "\u662F"},
- {"No", "\u5426"},
- {"Policy.Entry", "\u539F\u5247\u9805\u76EE"},
- {"Save.Changes", "\u5132\u5B58\u8B8A\u66F4"},
- {"No.Policy.Entry.selected", "\u6C92\u6709\u9078\u53D6\u539F\u5247\u9805\u76EE"},
- {"Unable.to.open.KeyStore.ex.toString.",
- "\u7121\u6CD5\u958B\u555F\u91D1\u9470\u5132\u5B58\u5EAB: {0}"},
- {"No.principal.selected", "\u672A\u9078\u53D6 Principal"},
- {"No.permission.selected", "\u6C92\u6709\u9078\u53D6\u6B0A\u9650"},
- {"name", "\u540D\u7A31"},
- {"configuration.type", "\u7D44\u614B\u985E\u578B"},
- {"environment.variable.name", "\u74B0\u5883\u8B8A\u6578\u540D\u7A31"},
- {"library.name", "\u7A0B\u5F0F\u5EAB\u540D\u7A31"},
- {"package.name", "\u5957\u88DD\u7A0B\u5F0F\u540D\u7A31"},
- {"policy.type", "\u539F\u5247\u985E\u578B"},
- {"property.name", "\u5C6C\u6027\u540D\u7A31"},
- {"Principal.List", "Principal \u6E05\u55AE"},
- {"Permission.List", "\u6B0A\u9650\u6E05\u55AE"},
- {"Code.Base", "\u4EE3\u78BC\u57FA\u6E96"},
- {"KeyStore.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB URL:"},
- {"KeyStore.Password.U.R.L.", "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC URL:"},
-
-
// javax.security.auth.PrivateCredentialPermission
{"invalid.null.input.s.", "\u7121\u6548\u7A7A\u503C\u8F38\u5165"},
{"actions.can.only.be.read.", "\u52D5\u4F5C\u53EA\u80FD\u88AB\u300C\u8B80\u53D6\u300D"},
@@ -553,6 +58,7 @@
{"provided.null.OID.map", "\u63D0\u4F9B\u7A7A\u503C OID \u5C0D\u6620"},
// javax.security.auth.Subject
+ {"NEWLINE", "\n"},
{"invalid.null.AccessControlContext.provided",
"\u63D0\u4F9B\u7121\u6548\u7684\u7A7A\u503C AccessControlContext"},
{"invalid.null.action.provided", "\u63D0\u4F9B\u7121\u6548\u7684\u7A7A\u503C\u52D5\u4F5C"},
@@ -656,6 +162,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
return contents;
}
diff --git a/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java b/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
index 3308711..cfa805f 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
+++ b/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
@@ -26,10 +26,9 @@
package sun.util.locale.provider;
import java.util.Locale;
-import java.util.MissingResourceException;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.spi.CurrencyNameProvider;
-import sun.util.resources.OpenListResourceBundle;
/**
* Concrete implementation of the
@@ -121,16 +120,10 @@
throw new NullPointerException();
}
- OpenListResourceBundle bundle = LocaleProviderAdapter.forType(type).getLocaleData().getCurrencyNames(locale);
- LocaleServiceProviderPool pool =
- LocaleServiceProviderPool.getPool(CurrencyNameProvider.class);
- try {
- if (!pool.hasProviders() ||
- (bundle.getLocale().equals(locale) &&
- bundle.handleGetKeys().contains(key))) {
+ ResourceBundle bundle = LocaleProviderAdapter.forType(type).getLocaleData().getCurrencyNames(locale);
+ if (bundle.containsKey(key)) {
return bundle.getString(key);
}
- } catch (MissingResourceException mre) {}
return null;
}
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java b/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
index 0344cac..952078f 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
@@ -26,10 +26,9 @@
package sun.util.locale.provider;
import java.util.Locale;
-import java.util.MissingResourceException;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.spi.LocaleNameProvider;
-import sun.util.resources.OpenListResourceBundle;
/**
* Concrete implementation of the
@@ -175,15 +174,10 @@
throw new NullPointerException();
}
- OpenListResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
- LocaleServiceProviderPool pool =
- LocaleServiceProviderPool.getPool(LocaleNameProvider.class);
- try {
- if (!pool.hasProviders() ||
- (rb.getLocale().equals(locale) && rb.handleGetKeys().contains(key))) {
+ ResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
+ if (rb.containsKey(key)) {
return rb.getString(key);
}
- } catch (MissingResourceException mre) {}
return null;
}
diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java b/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
index a804561..71e6b42 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
@@ -302,7 +302,7 @@
for (LocaleProviderAdapter.Type type: findProviders(current)) {
LocaleServiceProvider lsp = providers.get(type);
- providersObj = getter.getObject((P)lsp, current, key, params);
+ providersObj = getter.getObject((P)lsp, locale, key, params);
if (providersObj != null) {
return providersObj;
} else if (isObjectProvider) {
diff --git a/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java b/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
index ea436fb..ff09286 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
+++ b/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
@@ -26,11 +26,10 @@
package sun.util.locale.provider;
import java.util.Locale;
-import java.util.MissingResourceException;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.TimeZone;
import java.util.spi.TimeZoneNameProvider;
-import sun.util.resources.OpenListResourceBundle;
/**
* Concrete implementation of the
@@ -102,12 +101,8 @@
}
LocaleProviderAdapter adapter = LocaleProviderAdapter.forType(type);
- OpenListResourceBundle rb = adapter.getLocaleResources(locale).getTimeZoneNames();
- LocaleServiceProviderPool pool =
- LocaleServiceProviderPool.getPool(TimeZoneNameProvider.class);
- try {
- if (!pool.hasProviders() ||
- (rb.getLocale().equals(locale) && rb.handleGetKeys().contains(id))) {
+ ResourceBundle rb = adapter.getLocaleResources(locale).getTimeZoneNames();
+ if (rb.containsKey(id)) {
String[] names = rb.getStringArray(id);
int index = daylight ? 3 : 1;
if (style == TimeZone.SHORT) {
@@ -115,8 +110,6 @@
}
return names[index];
}
- } catch (MissingResourceException mre) {
- }
return null;
}
diff --git a/jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java b/jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java
index 42194da..3e4acdd 100644
--- a/jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java
+++ b/jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java
@@ -55,6 +55,9 @@
* @param props the properties table to populate
* @param in the input stream from which to read the XML document
* @throws IOException if reading from the specified input stream fails
+ * @throws java.io.UnsupportedEncodingException if the document's encoding
+ * declaration can be read and it specifies an encoding that is not
+ * supported
* @throws InvalidPropertiesFormatException Data on input stream does not
* constitute a valid XML document with the mandated document type.
*
@@ -73,6 +76,8 @@
* @param encoding the name of a supported character encoding
*
* @throws IOException if writing to the specified output stream fails
+ * @throws java.io.UnsupportedEncodingException if the encoding is not
+ * supported by the implementation
* @throws NullPointerException if {@code out} is null.
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
diff --git a/jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java b/jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java
index f4e4010..0878c3d 100644
--- a/jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java
+++ b/jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java
@@ -27,6 +27,7 @@
import java.io.*;
import java.util.*;
+import java.nio.charset.*;
import org.xml.sax.*;
import org.w3c.dom.*;
import javax.xml.parsers.*;
@@ -127,6 +128,13 @@
String encoding)
throws IOException
{
+ // fast-fail for unsupported charsets as UnsupportedEncodingException may
+ // not be thrown later (see JDK-8000621)
+ try {
+ Charset.forName(encoding);
+ } catch (IllegalCharsetNameException | UnsupportedCharsetException x) {
+ throw new UnsupportedEncodingException(encoding);
+ }
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = null;
try {
diff --git a/jdk/src/share/lib/security/java.security b/jdk/src/share/lib/security/java.security
index e8ca7bd..22103ad 100644
--- a/jdk/src/share/lib/security/java.security
+++ b/jdk/src/share/lib/security/java.security
@@ -145,7 +145,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -157,7 +157,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 1c04236..3db909b 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -146,7 +146,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -158,7 +158,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 87a6f1e..cebe4e7 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -147,7 +147,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -159,7 +159,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index e7c36d8..737a600 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -146,7 +146,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# List of comma-separated packages that start with or equal this string
@@ -158,7 +158,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
index 1195f7c..910969f 100644
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
@@ -253,6 +253,16 @@
if (sProf.pf == NULL) {
JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ } else {
+ /* Sanity check: try to save the profile in order
+ * to force basic validation.
+ */
+ cmsUInt32Number pfSize = 0;
+ if (!cmsSaveProfileToMem(sProf.pf, NULL, &pfSize) ||
+ pfSize < sizeof(cmsICCHeader))
+ {
+ JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ }
}
return sProf.j;
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
index 6ba84a8..7d63625 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
@@ -379,6 +379,25 @@
keysym2UCSHash.put( (long)0xFFB8, (char)0x0038); // XK_KP_8 --> DIGIT EIGHT
keysym2UCSHash.put( (long)0xFFB9, (char)0x0039); // XK_KP_9 --> DIGIT NINE
keysym2UCSHash.put( (long)0xFE20, (char)0x0009); // XK_ISO_Left_Tab --> <control>
+ keysym2UCSHash.put( (long)0xFE50, (char)0x02CB); // XK_dead_grave --> MODIFIER LETTER GRAVE ACCENT
+ keysym2UCSHash.put( (long)0xFE51, (char)0x02CA); // XK_dead_acute --> MODIFIER LETTER ACUTE ACCENT
+ keysym2UCSHash.put( (long)0xFE52, (char)0x02C6); // XK_dead_circumflex --> MODIFIER LETTER CIRCUMFLEX ACCENT
+ keysym2UCSHash.put( (long)0xFE53, (char)0x02DC); // XK_dead_tilde --> SMALL TILDE
+ keysym2UCSHash.put( (long)0xFE54, (char)0x02C9); // XK_dead_macron --> MODIFIER LETTER MACRON
+ keysym2UCSHash.put( (long)0xFE55, (char)0x02D8); // XK_dead_breve --> BREVE
+ keysym2UCSHash.put( (long)0xFE56, (char)0x02D9); // XK_dead_abovedot --> DOT ABOVE
+ keysym2UCSHash.put( (long)0xFE57, (char)0x00A8); // XK_dead_diaeresis --> DIAERESIS
+ keysym2UCSHash.put( (long)0xFE58, (char)0x02DA); // XK_dead_abovering --> RING ABOVE
+ keysym2UCSHash.put( (long)0xFE59, (char)0x02DD); // XK_dead_doubleacute --> DOUBLE ACUTE ACCENT
+ keysym2UCSHash.put( (long)0xFE5A, (char)0x02C7); // XK_dead_caron --> CARON
+ keysym2UCSHash.put( (long)0xFE5B, (char)0x00B8); // XK_dead_cedilla --> CEDILLA
+ keysym2UCSHash.put( (long)0xFE5C, (char)0x02DB); // XK_dead_ogonek --> OGONEK
+ keysym2UCSHash.put( (long)0xFE5D, (char)0x0269); // XK_dead_iota --> LATIN SMALL LETTER IOTA
+ keysym2UCSHash.put( (long)0xFE5E, (char)0x3099); // XK_dead_voiced_sound --> COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ keysym2UCSHash.put( (long)0xFE5F, (char)0x309A); // XK_dead_semivoiced_sound --> COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ keysym2UCSHash.put( (long)0xFE60, (char)0x0323); // XK_dead_belowdot --> COMBINING DOT BELOW
+ keysym2UCSHash.put( (long)0xFE61, (char)0x0321); // XK_dead_hook --> COMBINING PALATALIZED HOOK BELOW
+ keysym2UCSHash.put( (long)0xFE62, (char)0x031B); // XK_dead_horn --> COMBINING HORN
keysym2UCSHash.put( (long)0x1a1, (char)0x0104); // XK_Aogonek --> LATIN CAPITAL LETTER A WITH OGONEK
keysym2UCSHash.put( (long)0x1a2, (char)0x02d8); // XK_breve --> BREVE
keysym2UCSHash.put( (long)0x1a3, (char)0x0141); // XK_Lstroke --> LATIN CAPITAL LETTER L WITH STROKE
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java
index a4c039c..0eebbd4 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java
@@ -1115,7 +1115,10 @@
// (1) either XIM could not handle it or
// (2) it was Latin 1:1 mapping.
//
- XKeysym.Keysym2JavaKeycode jkc = XKeysym.getJavaKeycode(ev);
+ // Preserve modifiers to get Java key code for dead keys
+ boolean isDeadKey = isDeadKey(keysym[0]);
+ XKeysym.Keysym2JavaKeycode jkc = isDeadKey ? XKeysym.getJavaKeycode(keysym[0])
+ : XKeysym.getJavaKeycode(ev);
if( jkc == null ) {
jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN);
}
@@ -1141,7 +1144,7 @@
jkc.getJavaKeycode();
postKeyEvent( java.awt.event.KeyEvent.KEY_PRESSED,
ev.get_time(),
- jkeyToReturn,
+ isDeadKey ? jkeyExtended : jkeyToReturn,
(unicodeKey == 0 ? java.awt.event.KeyEvent.CHAR_UNDEFINED : unicodeKey),
jkc.getKeyLocation(),
ev.get_state(),ev.getPData(), XKeyEvent.getSize(), (long)(ev.get_keycode()),
@@ -1149,7 +1152,7 @@
jkeyExtended);
- if( unicodeKey > 0 ) {
+ if (unicodeKey > 0 && !isDeadKey) {
keyEventLog.fine("fire _TYPED on "+unicodeKey);
postKeyEvent( java.awt.event.KeyEvent.KEY_TYPED,
ev.get_time(),
@@ -1176,9 +1179,7 @@
}
// un-private it if you need to call it from elsewhere
private void handleKeyRelease(XKeyEvent ev) {
- long keysym[] = new long[2];
int unicodeKey = 0;
- keysym[0] = XConstants.NoSymbol;
if (keyEventLog.isLoggable(PlatformLogger.FINE)) {
logIncomingKeyEvent( ev );
@@ -1187,7 +1188,11 @@
// and Java KeyEvent keycode should be calculated.
// For release we should post released event.
//
- XKeysym.Keysym2JavaKeycode jkc = XKeysym.getJavaKeycode(ev);
+ // Preserve modifiers to get Java key code for dead keys
+ long keysym = xkeycodeToKeysym(ev);
+ boolean isDeadKey = isDeadKey(keysym);
+ XKeysym.Keysym2JavaKeycode jkc = isDeadKey ? XKeysym.getJavaKeycode(keysym)
+ : XKeysym.getJavaKeycode(ev);
if( jkc == null ) {
jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN);
}
@@ -1219,7 +1224,7 @@
jkc.getJavaKeycode();
postKeyEvent( java.awt.event.KeyEvent.KEY_RELEASED,
ev.get_time(),
- jkeyToReturn,
+ isDeadKey ? jkeyExtended : jkeyToReturn,
(unicodeKey == 0 ? java.awt.event.KeyEvent.CHAR_UNDEFINED : unicodeKey),
jkc.getKeyLocation(),
ev.get_state(),ev.getPData(), XKeyEvent.getSize(), (long)(ev.get_keycode()),
@@ -1229,6 +1234,11 @@
}
+
+ private boolean isDeadKey(long keysym){
+ return XKeySymConstants.XK_dead_grave <= keysym && keysym <= XKeySymConstants.XK_dead_semivoiced_sound;
+ }
+
/*
* XmNiconic and Map/UnmapNotify (that XmNiconic relies on) are
* unreliable, since mapping changes can happen for a virtual desktop
diff --git a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
index deb7a8d..f816887 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
+++ b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
@@ -695,25 +695,25 @@
0x0000 #define XK_ISO_Center_Object 0xFE33
0x0000 #define XK_ISO_Enter 0xFE34
-0x0000 #define XK_dead_grave 0xFE50
-0x0000 #define XK_dead_acute 0xFE51
-0x0000 #define XK_dead_circumflex 0xFE52
-0x0000 #define XK_dead_tilde 0xFE53
-0x0000 #define XK_dead_macron 0xFE54
-0x0000 #define XK_dead_breve 0xFE55
-0x0000 #define XK_dead_abovedot 0xFE56
-0x0000 #define XK_dead_diaeresis 0xFE57
-0x0000 #define XK_dead_abovering 0xFE58
-0x0000 #define XK_dead_doubleacute 0xFE59
-0x0000 #define XK_dead_caron 0xFE5A
-0x0000 #define XK_dead_cedilla 0xFE5B
-0x0000 #define XK_dead_ogonek 0xFE5C
-0x0000 #define XK_dead_iota 0xFE5D
-0x0000 #define XK_dead_voiced_sound 0xFE5E
-0x0000 #define XK_dead_semivoiced_sound 0xFE5F
-0x0000 #define XK_dead_belowdot 0xFE60
-0x0000 #define XK_dead_hook 0xFE61
-0x0000 #define XK_dead_horn 0xFE62
+0x02CB #define XK_dead_grave 0xFE50
+0x02CA #define XK_dead_acute 0xFE51
+0x02C6 #define XK_dead_circumflex 0xFE52
+0x02DC #define XK_dead_tilde 0xFE53
+0x02C9 #define XK_dead_macron 0xFE54
+0x02D8 #define XK_dead_breve 0xFE55
+0x02D9 #define XK_dead_abovedot 0xFE56
+0x00A8 #define XK_dead_diaeresis 0xFE57
+0x02DA #define XK_dead_abovering 0xFE58
+0x02DD #define XK_dead_doubleacute 0xFE59
+0x02C7 #define XK_dead_caron 0xFE5A
+0x00B8 #define XK_dead_cedilla 0xFE5B
+0x02DB #define XK_dead_ogonek 0xFE5C
+0x0269 #define XK_dead_iota 0xFE5D
+0x3099 #define XK_dead_voiced_sound 0xFE5E
+0x309A #define XK_dead_semivoiced_sound 0xFE5F
+0x0323 #define XK_dead_belowdot 0xFE60
+0x0321 #define XK_dead_hook 0xFE61
+0x031B #define XK_dead_horn 0xFE62
0x0000 #define XK_First_Virtual_Screen 0xFED0
0x0000 #define XK_Prev_Virtual_Screen 0xFED1
@@ -2466,6 +2466,7 @@
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Meta_L), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_META, java.awt.event.KeyEvent.KEY_LOCATION_LEFT));
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Meta_R), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_META, java.awt.event.KeyEvent.KEY_LOCATION_RIGHT));
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Caps_Lock), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CAPS_LOCK, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Shift_Lock), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CAPS_LOCK, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
tojava
tojava /* Misc Functions */
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Print), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_PRINTSCREEN, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
@@ -2640,6 +2641,21 @@
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kanji), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CONVERT, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
tojava /* Type 5c Japanese keyboard: nihongo */
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Henkan_Mode), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_INPUT_METHOD_ON_OFF, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Eisu_Shift ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALPHANUMERIC , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Eisu_toggle ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALPHANUMERIC , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Zenkaku ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_FULL_WIDTH , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Hankaku ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_HALF_WIDTH , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Hiragana ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_HIRAGANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Katakana ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KATAKANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Romaji ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_JAPANESE_ROMAN , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kana_Shift ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kana_Lock ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA_LOCK , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Muhenkan ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_NONCONVERT , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Zen_Koho ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_ALL_CANDIDATES , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Kanji_Bangou ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_CODE_INPUT , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.XK_Mae_Koho ), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_PREVIOUS_CANDIDATE , java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
+tojava
+tojava
tojava /* VK_KANA_LOCK is handled separately because it generates the
tojava * same keysym as ALT_GRAPH in spite of its different behavior.
tojava */
diff --git a/jdk/src/solaris/native/com/sun/security/auth/module/Unix.c b/jdk/src/solaris/native/com/sun/security/auth/module/Unix.c
index 677a70b..fec020b 100644
--- a/jdk/src/solaris/native/com/sun/security/auth/module/Unix.c
+++ b/jdk/src/solaris/native/com/sun/security/auth/module/Unix.c
@@ -47,83 +47,53 @@
jsize numSuppGroups = getgroups(0, NULL);
gid_t *groups = (gid_t *)calloc(numSuppGroups, sizeof(gid_t));
- jfieldID fid;
+ jfieldID userNameID;
+ jfieldID userID;
+ jfieldID groupID;
+ jfieldID supplementaryGroupID;
+
jstring jstr;
jlongArray jgroups;
jlong *jgroupsAsArray;
jclass cls = (*env)->GetObjectClass(env, obj);
memset(pwd_buf, 0, sizeof(pwd_buf));
+
if (getpwuid_r(getuid(), &resbuf, pwd_buf, sizeof(pwd_buf), &pwd) == 0 &&
pwd != NULL &&
getgroups(numSuppGroups, groups) != -1) {
- /*
- * set username
- */
- fid = (*env)->GetFieldID(env, cls, "username", "Ljava/lang/String;");
- if (fid == 0) {
- jclass newExcCls =
- (*env)->FindClass(env, "java/lang/IllegalArgumentException");
- if (newExcCls == 0) {
- /* Unable to find the new exception class, give up. */
- return;
- }
- (*env)->ThrowNew(env, newExcCls, "invalid field: username");
- }
+ userNameID = (*env)->GetFieldID(env, cls, "username", "Ljava/lang/String;");
+ if (userNameID == 0)
+ goto cleanUpAndReturn;
+
+ userID = (*env)->GetFieldID(env, cls, "uid", "J");
+ if (userID == 0)
+ goto cleanUpAndReturn;
+
+ groupID = (*env)->GetFieldID(env, cls, "gid", "J");
+ if (groupID == 0)
+ goto cleanUpAndReturn;
+
+ supplementaryGroupID = (*env)->GetFieldID(env, cls, "groups", "[J");
+ if (supplementaryGroupID == 0)
+ goto cleanUpAndReturn;
+
jstr = (*env)->NewStringUTF(env, pwd->pw_name);
- (*env)->SetObjectField(env, obj, fid, jstr);
+ (*env)->SetObjectField(env, obj, userNameID, jstr);
- /*
- * set uid
- */
- fid = (*env)->GetFieldID(env, cls, "uid", "J");
- if (fid == 0) {
- jclass newExcCls =
- (*env)->FindClass(env, "java/lang/IllegalArgumentException");
- if (newExcCls == 0) {
- /* Unable to find the new exception class, give up. */
- return;
- }
- (*env)->ThrowNew(env, newExcCls, "invalid field: username");
- }
- (*env)->SetLongField(env, obj, fid, pwd->pw_uid);
+ (*env)->SetLongField(env, obj, userID, pwd->pw_uid);
- /*
- * set gid
- */
- fid = (*env)->GetFieldID(env, cls, "gid", "J");
- if (fid == 0) {
- jclass newExcCls =
- (*env)->FindClass(env, "java/lang/IllegalArgumentException");
- if (newExcCls == 0) {
- /* Unable to find the new exception class, give up. */
- return;
- }
- (*env)->ThrowNew(env, newExcCls, "invalid field: username");
- }
- (*env)->SetLongField(env, obj, fid, pwd->pw_gid);
-
- /*
- * set supplementary groups
- */
- fid = (*env)->GetFieldID(env, cls, "groups", "[J");
- if (fid == 0) {
- jclass newExcCls =
- (*env)->FindClass(env, "java/lang/IllegalArgumentException");
- if (newExcCls == 0) {
- /* Unable to find the new exception class, give up. */
- return;
- }
- (*env)->ThrowNew(env, newExcCls, "invalid field: username");
- }
+ (*env)->SetLongField(env, obj, groupID, pwd->pw_gid);
jgroups = (*env)->NewLongArray(env, numSuppGroups);
jgroupsAsArray = (*env)->GetLongArrayElements(env, jgroups, 0);
for (i = 0; i < numSuppGroups; i++)
jgroupsAsArray[i] = groups[i];
(*env)->ReleaseLongArrayElements(env, jgroups, jgroupsAsArray, 0);
- (*env)->SetObjectField(env, obj, fid, jgroups);
+ (*env)->SetObjectField(env, obj, supplementaryGroupID, jgroups);
}
+cleanUpAndReturn:
+ free(groups);
return;
}
diff --git a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
index 40b375d..4249382 100644
--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -1318,10 +1318,8 @@
jobject value) {
int fd;
int level, optname, optlen;
- union {
- int i;
- char c;
- } optval;
+ int optval;
+ optlen = sizeof(int);
/*
* Check that socket hasn't been closed
@@ -1381,8 +1379,7 @@
fid = (*env)->GetFieldID(env, cls, "value", "I");
CHECK_NULL(fid);
- optval.i = (*env)->GetIntField(env, value, fid);
- optlen = sizeof(optval.i);
+ optval = (*env)->GetIntField(env, value, fid);
break;
}
@@ -1401,8 +1398,7 @@
on = (*env)->GetBooleanField(env, value, fid);
/* SO_REUSEADDR or SO_BROADCAST */
- optval.i = (on ? 1 : 0);
- optlen = sizeof(optval.i);
+ optval = (on ? 1 : 0);
break;
}
diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
index 2cc122c..7ae4cdd 100644
--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
+++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -753,7 +753,7 @@
sizeof(errmsg),
"Can't connect to X11 window server using '%s' as the value of the DISPLAY variable.",
(getenv("DISPLAY") == NULL) ? ":0.0" : getenv("DISPLAY"));
- JNU_ThrowInternalError(env, errmsg);
+ JNU_ThrowByName(env, "java/awt/AWTError", errmsg);
return NULL;
}
diff --git a/jdk/src/windows/classes/java/io/Win32FileSystem.java b/jdk/src/windows/classes/java/io/Win32FileSystem.java
deleted file mode 100644
index 4040c12..0000000
--- a/jdk/src/windows/classes/java/io/Win32FileSystem.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Copyright (c) 1998, 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.
- */
-
-package java.io;
-
-import java.security.AccessController;
-import java.util.Locale;
-import sun.security.action.GetPropertyAction;
-
-
-class Win32FileSystem extends FileSystem {
-
- private final char slash;
- private final char altSlash;
- private final char semicolon;
-
- public Win32FileSystem() {
- slash = AccessController.doPrivileged(
- new GetPropertyAction("file.separator")).charAt(0);
- semicolon = AccessController.doPrivileged(
- new GetPropertyAction("path.separator")).charAt(0);
- altSlash = (this.slash == '\\') ? '/' : '\\';
- }
-
- private boolean isSlash(char c) {
- return (c == '\\') || (c == '/');
- }
-
- private boolean isLetter(char c) {
- return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'));
- }
-
- private String slashify(String p) {
- if ((p.length() > 0) && (p.charAt(0) != slash)) return slash + p;
- else return p;
- }
-
-
- /* -- Normalization and construction -- */
-
- public char getSeparator() {
- return slash;
- }
-
- public char getPathSeparator() {
- return semicolon;
- }
-
- /* A normal Win32 pathname contains no duplicate slashes, except possibly
- for a UNC prefix, and does not end with a slash. It may be the empty
- string. Normalized Win32 pathnames have the convenient property that
- the length of the prefix almost uniquely identifies the type of the path
- and whether it is absolute or relative:
-
- 0 relative to both drive and directory
- 1 drive-relative (begins with '\\')
- 2 absolute UNC (if first char is '\\'),
- else directory-relative (has form "z:foo")
- 3 absolute local pathname (begins with "z:\\")
- */
-
- private int normalizePrefix(String path, int len, StringBuffer sb) {
- int src = 0;
- while ((src < len) && isSlash(path.charAt(src))) src++;
- char c;
- if ((len - src >= 2)
- && isLetter(c = path.charAt(src))
- && path.charAt(src + 1) == ':') {
- /* Remove leading slashes if followed by drive specifier.
- This hack is necessary to support file URLs containing drive
- specifiers (e.g., "file://c:/path"). As a side effect,
- "/c:/path" can be used as an alternative to "c:/path". */
- sb.append(c);
- sb.append(':');
- src += 2;
- } else {
- src = 0;
- if ((len >= 2)
- && isSlash(path.charAt(0))
- && isSlash(path.charAt(1))) {
- /* UNC pathname: Retain first slash; leave src pointed at
- second slash so that further slashes will be collapsed
- into the second slash. The result will be a pathname
- beginning with "\\\\" followed (most likely) by a host
- name. */
- src = 1;
- sb.append(slash);
- }
- }
- return src;
- }
-
- /* Normalize the given pathname, whose length is len, starting at the given
- offset; everything before this offset is already normal. */
- private String normalize(String path, int len, int off) {
- if (len == 0) return path;
- if (off < 3) off = 0; /* Avoid fencepost cases with UNC pathnames */
- int src;
- char slash = this.slash;
- StringBuffer sb = new StringBuffer(len);
-
- if (off == 0) {
- /* Complete normalization, including prefix */
- src = normalizePrefix(path, len, sb);
- } else {
- /* Partial normalization */
- src = off;
- sb.append(path.substring(0, off));
- }
-
- /* Remove redundant slashes from the remainder of the path, forcing all
- slashes into the preferred slash */
- while (src < len) {
- char c = path.charAt(src++);
- if (isSlash(c)) {
- while ((src < len) && isSlash(path.charAt(src))) src++;
- if (src == len) {
- /* Check for trailing separator */
- int sn = sb.length();
- if ((sn == 2) && (sb.charAt(1) == ':')) {
- /* "z:\\" */
- sb.append(slash);
- break;
- }
- if (sn == 0) {
- /* "\\" */
- sb.append(slash);
- break;
- }
- if ((sn == 1) && (isSlash(sb.charAt(0)))) {
- /* "\\\\" is not collapsed to "\\" because "\\\\" marks
- the beginning of a UNC pathname. Even though it is
- not, by itself, a valid UNC pathname, we leave it as
- is in order to be consistent with the win32 APIs,
- which treat this case as an invalid UNC pathname
- rather than as an alias for the root directory of
- the current drive. */
- sb.append(slash);
- break;
- }
- /* Path does not denote a root directory, so do not append
- trailing slash */
- break;
- } else {
- sb.append(slash);
- }
- } else {
- sb.append(c);
- }
- }
-
- String rv = sb.toString();
- return rv;
- }
-
- /* Check that the given pathname is normal. If not, invoke the real
- normalizer on the part of the pathname that requires normalization.
- This way we iterate through the whole pathname string only once. */
- public String normalize(String path) {
- int n = path.length();
- char slash = this.slash;
- char altSlash = this.altSlash;
- char prev = 0;
- for (int i = 0; i < n; i++) {
- char c = path.charAt(i);
- if (c == altSlash)
- return normalize(path, n, (prev == slash) ? i - 1 : i);
- if ((c == slash) && (prev == slash) && (i > 1))
- return normalize(path, n, i - 1);
- if ((c == ':') && (i > 1))
- return normalize(path, n, 0);
- prev = c;
- }
- if (prev == slash) return normalize(path, n, n - 1);
- return path;
- }
-
- public int prefixLength(String path) {
- char slash = this.slash;
- int n = path.length();
- if (n == 0) return 0;
- char c0 = path.charAt(0);
- char c1 = (n > 1) ? path.charAt(1) : 0;
- if (c0 == slash) {
- if (c1 == slash) return 2; /* Absolute UNC pathname "\\\\foo" */
- return 1; /* Drive-relative "\\foo" */
- }
- if (isLetter(c0) && (c1 == ':')) {
- if ((n > 2) && (path.charAt(2) == slash))
- return 3; /* Absolute local pathname "z:\\foo" */
- return 2; /* Directory-relative "z:foo" */
- }
- return 0; /* Completely relative */
- }
-
- public String resolve(String parent, String child) {
- int pn = parent.length();
- if (pn == 0) return child;
- int cn = child.length();
- if (cn == 0) return parent;
-
- String c = child;
- int childStart = 0;
- int parentEnd = pn;
-
- if ((cn > 1) && (c.charAt(0) == slash)) {
- if (c.charAt(1) == slash) {
- /* Drop prefix when child is a UNC pathname */
- childStart = 2;
- } else {
- /* Drop prefix when child is drive-relative */
- childStart = 1;
-
- }
- if (cn == childStart) { // Child is double slash
- if (parent.charAt(pn - 1) == slash)
- return parent.substring(0, pn - 1);
- return parent;
- }
- }
-
- if (parent.charAt(pn - 1) == slash)
- parentEnd--;
-
- int strlen = parentEnd + cn - childStart;
- char[] theChars = null;
- if (child.charAt(childStart) == slash) {
- theChars = new char[strlen];
- parent.getChars(0, parentEnd, theChars, 0);
- child.getChars(childStart, cn, theChars, parentEnd);
- } else {
- theChars = new char[strlen + 1];
- parent.getChars(0, parentEnd, theChars, 0);
- theChars[parentEnd] = slash;
- child.getChars(childStart, cn, theChars, parentEnd + 1);
- }
- return new String(theChars);
- }
-
- public String getDefaultParent() {
- return ("" + slash);
- }
-
- public String fromURIPath(String path) {
- String p = path;
- if ((p.length() > 2) && (p.charAt(2) == ':')) {
- // "/c:/foo" --> "c:/foo"
- p = p.substring(1);
- // "c:/foo/" --> "c:/foo", but "c:/" --> "c:/"
- if ((p.length() > 3) && p.endsWith("/"))
- p = p.substring(0, p.length() - 1);
- } else if ((p.length() > 1) && p.endsWith("/")) {
- // "/foo/" --> "/foo"
- p = p.substring(0, p.length() - 1);
- }
- return p;
- }
-
-
-
- /* -- Path operations -- */
-
- public boolean isAbsolute(File f) {
- int pl = f.getPrefixLength();
- return (((pl == 2) && (f.getPath().charAt(0) == slash))
- || (pl == 3));
- }
-
- protected native String getDriveDirectory(int drive);
-
- private static String[] driveDirCache = new String[26];
-
- private static int driveIndex(char d) {
- if ((d >= 'a') && (d <= 'z')) return d - 'a';
- if ((d >= 'A') && (d <= 'Z')) return d - 'A';
- return -1;
- }
-
- private String getDriveDirectory(char drive) {
- int i = driveIndex(drive);
- if (i < 0) return null;
- String s = driveDirCache[i];
- if (s != null) return s;
- s = getDriveDirectory(i + 1);
- driveDirCache[i] = s;
- return s;
- }
-
- private String getUserPath() {
- /* For both compatibility and security,
- we must look this up every time */
- return normalize(System.getProperty("user.dir"));
- }
-
- private String getDrive(String path) {
- int pl = prefixLength(path);
- return (pl == 3) ? path.substring(0, 2) : null;
- }
-
- public String resolve(File f) {
- String path = f.getPath();
- int pl = f.getPrefixLength();
- if ((pl == 2) && (path.charAt(0) == slash))
- return path; /* UNC */
- if (pl == 3)
- return path; /* Absolute local */
- if (pl == 0)
- return getUserPath() + slashify(path); /* Completely relative */
- if (pl == 1) { /* Drive-relative */
- String up = getUserPath();
- String ud = getDrive(up);
- if (ud != null) return ud + path;
- return up + path; /* User dir is a UNC path */
- }
- if (pl == 2) { /* Directory-relative */
- String up = getUserPath();
- String ud = getDrive(up);
- if ((ud != null) && path.startsWith(ud))
- return up + slashify(path.substring(2));
- char drive = path.charAt(0);
- String dir = getDriveDirectory(drive);
- String np;
- if (dir != null) {
- /* When resolving a directory-relative path that refers to a
- drive other than the current drive, insist that the caller
- have read permission on the result */
- String p = drive + (':' + dir + slashify(path.substring(2)));
- SecurityManager security = System.getSecurityManager();
- try {
- if (security != null) security.checkRead(p);
- } catch (SecurityException x) {
- /* Don't disclose the drive's directory in the exception */
- throw new SecurityException("Cannot resolve path " + path);
- }
- return p;
- }
- return drive + ":" + slashify(path.substring(2)); /* fake it */
- }
- throw new InternalError("Unresolvable path: " + path);
- }
-
- // Caches for canonicalization results to improve startup performance.
- // The first cache handles repeated canonicalizations of the same path
- // name. The prefix cache handles repeated canonicalizations within the
- // same directory, and must not create results differing from the true
- // canonicalization algorithm in canonicalize_md.c. For this reason the
- // prefix cache is conservative and is not used for complex path names.
- private ExpiringCache cache = new ExpiringCache();
- private ExpiringCache prefixCache = new ExpiringCache();
-
- public String canonicalize(String path) throws IOException {
- // If path is a drive letter only then skip canonicalization
- int len = path.length();
- if ((len == 2) &&
- (isLetter(path.charAt(0))) &&
- (path.charAt(1) == ':')) {
- char c = path.charAt(0);
- if ((c >= 'A') && (c <= 'Z'))
- return path;
- return "" + ((char) (c-32)) + ':';
- } else if ((len == 3) &&
- (isLetter(path.charAt(0))) &&
- (path.charAt(1) == ':') &&
- (path.charAt(2) == '\\')) {
- char c = path.charAt(0);
- if ((c >= 'A') && (c <= 'Z'))
- return path;
- return "" + ((char) (c-32)) + ':' + '\\';
- }
- if (!useCanonCaches) {
- return canonicalize0(path);
- } else {
- String res = cache.get(path);
- if (res == null) {
- String dir = null;
- String resDir = null;
- if (useCanonPrefixCache) {
- dir = parentOrNull(path);
- if (dir != null) {
- resDir = prefixCache.get(dir);
- if (resDir != null) {
- // Hit only in prefix cache; full path is canonical,
- // but we need to get the canonical name of the file
- // in this directory to get the appropriate capitalization
- String filename = path.substring(1 + dir.length());
- res = canonicalizeWithPrefix(resDir, filename);
- cache.put(dir + File.separatorChar + filename, res);
- }
- }
- }
- if (res == null) {
- res = canonicalize0(path);
- cache.put(path, res);
- if (useCanonPrefixCache && dir != null) {
- resDir = parentOrNull(res);
- if (resDir != null) {
- File f = new File(res);
- if (f.exists() && !f.isDirectory()) {
- prefixCache.put(dir, resDir);
- }
- }
- }
- }
- }
- return res;
- }
- }
-
- protected native String canonicalize0(String path)
- throws IOException;
- protected String canonicalizeWithPrefix(String canonicalPrefix,
- String filename) throws IOException
- {
- return canonicalizeWithPrefix0(canonicalPrefix,
- canonicalPrefix + File.separatorChar + filename);
- }
- // Run the canonicalization operation assuming that the prefix
- // (everything up to the last filename) is canonical; just gets
- // the canonical name of the last element of the path
- protected native String canonicalizeWithPrefix0(String canonicalPrefix,
- String pathWithCanonicalPrefix)
- throws IOException;
- // Best-effort attempt to get parent of this path; used for
- // optimization of filename canonicalization. This must return null for
- // any cases where the code in canonicalize_md.c would throw an
- // exception or otherwise deal with non-simple pathnames like handling
- // of "." and "..". It may conservatively return null in other
- // situations as well. Returning null will cause the underlying
- // (expensive) canonicalization routine to be called.
- static String parentOrNull(String path) {
- if (path == null) return null;
- char sep = File.separatorChar;
- char altSep = '/';
- int last = path.length() - 1;
- int idx = last;
- int adjacentDots = 0;
- int nonDotCount = 0;
- while (idx > 0) {
- char c = path.charAt(idx);
- if (c == '.') {
- if (++adjacentDots >= 2) {
- // Punt on pathnames containing . and ..
- return null;
- }
- if (nonDotCount == 0) {
- // Punt on pathnames ending in a .
- return null;
- }
- } else if (c == sep) {
- if (adjacentDots == 1 && nonDotCount == 0) {
- // Punt on pathnames containing . and ..
- return null;
- }
- if (idx == 0 ||
- idx >= last - 1 ||
- path.charAt(idx - 1) == sep ||
- path.charAt(idx - 1) == altSep) {
- // Punt on pathnames containing adjacent slashes
- // toward the end
- return null;
- }
- return path.substring(0, idx);
- } else if (c == altSep) {
- // Punt on pathnames containing both backward and
- // forward slashes
- return null;
- } else if (c == '*' || c == '?') {
- // Punt on pathnames containing wildcards
- return null;
- } else {
- ++nonDotCount;
- adjacentDots = 0;
- }
- --idx;
- }
- return null;
- }
-
-
- /* -- Attribute accessors -- */
-
- public native int getBooleanAttributes(File f);
- public native boolean checkAccess(File f, int access);
- public native long getLastModifiedTime(File f);
- public native long getLength(File f);
- public native boolean setPermission(File f, int access, boolean enable, boolean owneronly);
-
- /* -- File operations -- */
-
- public native boolean createFileExclusively(String path)
- throws IOException;
- public boolean delete(File f) {
- // Keep canonicalization caches in sync after file deletion
- // and renaming operations. Could be more clever than this
- // (i.e., only remove/update affected entries) but probably
- // not worth it since these entries expire after 30 seconds
- // anyway.
- cache.clear();
- prefixCache.clear();
- return delete0(f);
- }
- protected native boolean delete0(File f);
- public native String[] list(File f);
- public native boolean createDirectory(File f);
- public boolean rename(File f1, File f2) {
- // Keep canonicalization caches in sync after file deletion
- // and renaming operations. Could be more clever than this
- // (i.e., only remove/update affected entries) but probably
- // not worth it since these entries expire after 30 seconds
- // anyway.
- cache.clear();
- prefixCache.clear();
- return rename0(f1, f2);
- }
- protected native boolean rename0(File f1, File f2);
- public native boolean setLastModifiedTime(File f, long time);
- public native boolean setReadOnly(File f);
-
-
- /* -- Filesystem interface -- */
-
- private boolean access(String path) {
- try {
- SecurityManager security = System.getSecurityManager();
- if (security != null) security.checkRead(path);
- return true;
- } catch (SecurityException x) {
- return false;
- }
- }
-
- private static native int listRoots0();
-
- public File[] listRoots() {
- int ds = listRoots0();
- int n = 0;
- for (int i = 0; i < 26; i++) {
- if (((ds >> i) & 1) != 0) {
- if (!access((char)('A' + i) + ":" + slash))
- ds &= ~(1 << i);
- else
- n++;
- }
- }
- File[] fs = new File[n];
- int j = 0;
- char slash = this.slash;
- for (int i = 0; i < 26; i++) {
- if (((ds >> i) & 1) != 0)
- fs[j++] = new File((char)('A' + i) + ":" + slash);
- }
- return fs;
- }
-
-
- /* -- Disk usage -- */
- public long getSpace(File f, int t) {
- if (f.exists()) {
- File file = (f.isDirectory() ? f : f.getParentFile());
- return getSpace0(file, t);
- }
- return 0;
- }
-
- private native long getSpace0(File f, int t);
-
-
- /* -- Basic infrastructure -- */
-
- public int compare(File f1, File f2) {
- return f1.getPath().compareToIgnoreCase(f2.getPath());
- }
-
- public int hashCode(File f) {
- /* Could make this more efficient: String.hashCodeIgnoreCase */
- return f.getPath().toLowerCase(Locale.ENGLISH).hashCode() ^ 1234321;
- }
-
-
- private static native void initIDs();
-
- static {
- initIDs();
- }
-
-}
diff --git a/jdk/src/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/windows/classes/java/io/WinNTFileSystem.java
index 5ad2eeb..caa47f8 100644
--- a/jdk/src/windows/classes/java/io/WinNTFileSystem.java
+++ b/jdk/src/windows/classes/java/io/WinNTFileSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -23,34 +23,601 @@
* questions.
*/
-/*
- */
-
package java.io;
+import java.security.AccessController;
+import java.util.Locale;
+import sun.security.action.GetPropertyAction;
+
/**
* Unicode-aware FileSystem for Windows NT/2000.
*
* @author Konstantin Kladko
* @since 1.4
*/
-class WinNTFileSystem extends Win32FileSystem {
+class WinNTFileSystem extends FileSystem {
- protected native String canonicalize0(String path)
- throws IOException;
- protected native String canonicalizeWithPrefix0(String canonicalPrefix,
- String pathWithCanonicalPrefix)
- throws IOException;
+ private final char slash;
+ private final char altSlash;
+ private final char semicolon;
+
+ public WinNTFileSystem() {
+ slash = AccessController.doPrivileged(
+ new GetPropertyAction("file.separator")).charAt(0);
+ semicolon = AccessController.doPrivileged(
+ new GetPropertyAction("path.separator")).charAt(0);
+ altSlash = (this.slash == '\\') ? '/' : '\\';
+ }
+
+ private boolean isSlash(char c) {
+ return (c == '\\') || (c == '/');
+ }
+
+ private boolean isLetter(char c) {
+ return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'));
+ }
+
+ private String slashify(String p) {
+ if ((p.length() > 0) && (p.charAt(0) != slash)) return slash + p;
+ else return p;
+ }
+
+ /* -- Normalization and construction -- */
+
+ @Override
+ public char getSeparator() {
+ return slash;
+ }
+
+ @Override
+ public char getPathSeparator() {
+ return semicolon;
+ }
+
+ /* Check that the given pathname is normal. If not, invoke the real
+ normalizer on the part of the pathname that requires normalization.
+ This way we iterate through the whole pathname string only once. */
+ @Override
+ public String normalize(String path) {
+ int n = path.length();
+ char slash = this.slash;
+ char altSlash = this.altSlash;
+ char prev = 0;
+ for (int i = 0; i < n; i++) {
+ char c = path.charAt(i);
+ if (c == altSlash)
+ return normalize(path, n, (prev == slash) ? i - 1 : i);
+ if ((c == slash) && (prev == slash) && (i > 1))
+ return normalize(path, n, i - 1);
+ if ((c == ':') && (i > 1))
+ return normalize(path, n, 0);
+ prev = c;
+ }
+ if (prev == slash) return normalize(path, n, n - 1);
+ return path;
+ }
+
+ /* Normalize the given pathname, whose length is len, starting at the given
+ offset; everything before this offset is already normal. */
+ private String normalize(String path, int len, int off) {
+ if (len == 0) return path;
+ if (off < 3) off = 0; /* Avoid fencepost cases with UNC pathnames */
+ int src;
+ char slash = this.slash;
+ StringBuffer sb = new StringBuffer(len);
+
+ if (off == 0) {
+ /* Complete normalization, including prefix */
+ src = normalizePrefix(path, len, sb);
+ } else {
+ /* Partial normalization */
+ src = off;
+ sb.append(path.substring(0, off));
+ }
+
+ /* Remove redundant slashes from the remainder of the path, forcing all
+ slashes into the preferred slash */
+ while (src < len) {
+ char c = path.charAt(src++);
+ if (isSlash(c)) {
+ while ((src < len) && isSlash(path.charAt(src))) src++;
+ if (src == len) {
+ /* Check for trailing separator */
+ int sn = sb.length();
+ if ((sn == 2) && (sb.charAt(1) == ':')) {
+ /* "z:\\" */
+ sb.append(slash);
+ break;
+ }
+ if (sn == 0) {
+ /* "\\" */
+ sb.append(slash);
+ break;
+ }
+ if ((sn == 1) && (isSlash(sb.charAt(0)))) {
+ /* "\\\\" is not collapsed to "\\" because "\\\\" marks
+ the beginning of a UNC pathname. Even though it is
+ not, by itself, a valid UNC pathname, we leave it as
+ is in order to be consistent with the win32 APIs,
+ which treat this case as an invalid UNC pathname
+ rather than as an alias for the root directory of
+ the current drive. */
+ sb.append(slash);
+ break;
+ }
+ /* Path does not denote a root directory, so do not append
+ trailing slash */
+ break;
+ } else {
+ sb.append(slash);
+ }
+ } else {
+ sb.append(c);
+ }
+ }
+
+ String rv = sb.toString();
+ return rv;
+ }
+
+ /* A normal Win32 pathname contains no duplicate slashes, except possibly
+ for a UNC prefix, and does not end with a slash. It may be the empty
+ string. Normalized Win32 pathnames have the convenient property that
+ the length of the prefix almost uniquely identifies the type of the path
+ and whether it is absolute or relative:
+
+ 0 relative to both drive and directory
+ 1 drive-relative (begins with '\\')
+ 2 absolute UNC (if first char is '\\'),
+ else directory-relative (has form "z:foo")
+ 3 absolute local pathname (begins with "z:\\")
+ */
+ private int normalizePrefix(String path, int len, StringBuffer sb) {
+ int src = 0;
+ while ((src < len) && isSlash(path.charAt(src))) src++;
+ char c;
+ if ((len - src >= 2)
+ && isLetter(c = path.charAt(src))
+ && path.charAt(src + 1) == ':') {
+ /* Remove leading slashes if followed by drive specifier.
+ This hack is necessary to support file URLs containing drive
+ specifiers (e.g., "file://c:/path"). As a side effect,
+ "/c:/path" can be used as an alternative to "c:/path". */
+ sb.append(c);
+ sb.append(':');
+ src += 2;
+ } else {
+ src = 0;
+ if ((len >= 2)
+ && isSlash(path.charAt(0))
+ && isSlash(path.charAt(1))) {
+ /* UNC pathname: Retain first slash; leave src pointed at
+ second slash so that further slashes will be collapsed
+ into the second slash. The result will be a pathname
+ beginning with "\\\\" followed (most likely) by a host
+ name. */
+ src = 1;
+ sb.append(slash);
+ }
+ }
+ return src;
+ }
+
+ @Override
+ public int prefixLength(String path) {
+ char slash = this.slash;
+ int n = path.length();
+ if (n == 0) return 0;
+ char c0 = path.charAt(0);
+ char c1 = (n > 1) ? path.charAt(1) : 0;
+ if (c0 == slash) {
+ if (c1 == slash) return 2; /* Absolute UNC pathname "\\\\foo" */
+ return 1; /* Drive-relative "\\foo" */
+ }
+ if (isLetter(c0) && (c1 == ':')) {
+ if ((n > 2) && (path.charAt(2) == slash))
+ return 3; /* Absolute local pathname "z:\\foo" */
+ return 2; /* Directory-relative "z:foo" */
+ }
+ return 0; /* Completely relative */
+ }
+
+ @Override
+ public String resolve(String parent, String child) {
+ int pn = parent.length();
+ if (pn == 0) return child;
+ int cn = child.length();
+ if (cn == 0) return parent;
+
+ String c = child;
+ int childStart = 0;
+ int parentEnd = pn;
+
+ if ((cn > 1) && (c.charAt(0) == slash)) {
+ if (c.charAt(1) == slash) {
+ /* Drop prefix when child is a UNC pathname */
+ childStart = 2;
+ } else {
+ /* Drop prefix when child is drive-relative */
+ childStart = 1;
+
+ }
+ if (cn == childStart) { // Child is double slash
+ if (parent.charAt(pn - 1) == slash)
+ return parent.substring(0, pn - 1);
+ return parent;
+ }
+ }
+
+ if (parent.charAt(pn - 1) == slash)
+ parentEnd--;
+
+ int strlen = parentEnd + cn - childStart;
+ char[] theChars = null;
+ if (child.charAt(childStart) == slash) {
+ theChars = new char[strlen];
+ parent.getChars(0, parentEnd, theChars, 0);
+ child.getChars(childStart, cn, theChars, parentEnd);
+ } else {
+ theChars = new char[strlen + 1];
+ parent.getChars(0, parentEnd, theChars, 0);
+ theChars[parentEnd] = slash;
+ child.getChars(childStart, cn, theChars, parentEnd + 1);
+ }
+ return new String(theChars);
+ }
+
+ @Override
+ public String getDefaultParent() {
+ return ("" + slash);
+ }
+
+ @Override
+ public String fromURIPath(String path) {
+ String p = path;
+ if ((p.length() > 2) && (p.charAt(2) == ':')) {
+ // "/c:/foo" --> "c:/foo"
+ p = p.substring(1);
+ // "c:/foo/" --> "c:/foo", but "c:/" --> "c:/"
+ if ((p.length() > 3) && p.endsWith("/"))
+ p = p.substring(0, p.length() - 1);
+ } else if ((p.length() > 1) && p.endsWith("/")) {
+ // "/foo/" --> "/foo"
+ p = p.substring(0, p.length() - 1);
+ }
+ return p;
+ }
+
+ /* -- Path operations -- */
+
+ @Override
+ public boolean isAbsolute(File f) {
+ int pl = f.getPrefixLength();
+ return (((pl == 2) && (f.getPath().charAt(0) == slash))
+ || (pl == 3));
+ }
+
+ @Override
+ public String resolve(File f) {
+ String path = f.getPath();
+ int pl = f.getPrefixLength();
+ if ((pl == 2) && (path.charAt(0) == slash))
+ return path; /* UNC */
+ if (pl == 3)
+ return path; /* Absolute local */
+ if (pl == 0)
+ return getUserPath() + slashify(path); /* Completely relative */
+ if (pl == 1) { /* Drive-relative */
+ String up = getUserPath();
+ String ud = getDrive(up);
+ if (ud != null) return ud + path;
+ return up + path; /* User dir is a UNC path */
+ }
+ if (pl == 2) { /* Directory-relative */
+ String up = getUserPath();
+ String ud = getDrive(up);
+ if ((ud != null) && path.startsWith(ud))
+ return up + slashify(path.substring(2));
+ char drive = path.charAt(0);
+ String dir = getDriveDirectory(drive);
+ String np;
+ if (dir != null) {
+ /* When resolving a directory-relative path that refers to a
+ drive other than the current drive, insist that the caller
+ have read permission on the result */
+ String p = drive + (':' + dir + slashify(path.substring(2)));
+ SecurityManager security = System.getSecurityManager();
+ try {
+ if (security != null) security.checkRead(p);
+ } catch (SecurityException x) {
+ /* Don't disclose the drive's directory in the exception */
+ throw new SecurityException("Cannot resolve path " + path);
+ }
+ return p;
+ }
+ return drive + ":" + slashify(path.substring(2)); /* fake it */
+ }
+ throw new InternalError("Unresolvable path: " + path);
+ }
+
+ private String getUserPath() {
+ /* For both compatibility and security,
+ we must look this up every time */
+ return normalize(System.getProperty("user.dir"));
+ }
+
+ private String getDrive(String path) {
+ int pl = prefixLength(path);
+ return (pl == 3) ? path.substring(0, 2) : null;
+ }
+
+ private static String[] driveDirCache = new String[26];
+
+ private static int driveIndex(char d) {
+ if ((d >= 'a') && (d <= 'z')) return d - 'a';
+ if ((d >= 'A') && (d <= 'Z')) return d - 'A';
+ return -1;
+ }
+
+ private native String getDriveDirectory(int drive);
+
+ private String getDriveDirectory(char drive) {
+ int i = driveIndex(drive);
+ if (i < 0) return null;
+ String s = driveDirCache[i];
+ if (s != null) return s;
+ s = getDriveDirectory(i + 1);
+ driveDirCache[i] = s;
+ return s;
+ }
+
+ // Caches for canonicalization results to improve startup performance.
+ // The first cache handles repeated canonicalizations of the same path
+ // name. The prefix cache handles repeated canonicalizations within the
+ // same directory, and must not create results differing from the true
+ // canonicalization algorithm in canonicalize_md.c. For this reason the
+ // prefix cache is conservative and is not used for complex path names.
+ private ExpiringCache cache = new ExpiringCache();
+ private ExpiringCache prefixCache = new ExpiringCache();
+
+ @Override
+ public String canonicalize(String path) throws IOException {
+ // If path is a drive letter only then skip canonicalization
+ int len = path.length();
+ if ((len == 2) &&
+ (isLetter(path.charAt(0))) &&
+ (path.charAt(1) == ':')) {
+ char c = path.charAt(0);
+ if ((c >= 'A') && (c <= 'Z'))
+ return path;
+ return "" + ((char) (c-32)) + ':';
+ } else if ((len == 3) &&
+ (isLetter(path.charAt(0))) &&
+ (path.charAt(1) == ':') &&
+ (path.charAt(2) == '\\')) {
+ char c = path.charAt(0);
+ if ((c >= 'A') && (c <= 'Z'))
+ return path;
+ return "" + ((char) (c-32)) + ':' + '\\';
+ }
+ if (!useCanonCaches) {
+ return canonicalize0(path);
+ } else {
+ String res = cache.get(path);
+ if (res == null) {
+ String dir = null;
+ String resDir = null;
+ if (useCanonPrefixCache) {
+ dir = parentOrNull(path);
+ if (dir != null) {
+ resDir = prefixCache.get(dir);
+ if (resDir != null) {
+ /*
+ * Hit only in prefix cache; full path is canonical,
+ * but we need to get the canonical name of the file
+ * in this directory to get the appropriate
+ * capitalization
+ */
+ String filename = path.substring(1 + dir.length());
+ res = canonicalizeWithPrefix(resDir, filename);
+ cache.put(dir + File.separatorChar + filename, res);
+ }
+ }
+ }
+ if (res == null) {
+ res = canonicalize0(path);
+ cache.put(path, res);
+ if (useCanonPrefixCache && dir != null) {
+ resDir = parentOrNull(res);
+ if (resDir != null) {
+ File f = new File(res);
+ if (f.exists() && !f.isDirectory()) {
+ prefixCache.put(dir, resDir);
+ }
+ }
+ }
+ }
+ }
+ return res;
+ }
+ }
+
+ private native String canonicalize0(String path)
+ throws IOException;
+
+ private String canonicalizeWithPrefix(String canonicalPrefix,
+ String filename) throws IOException
+ {
+ return canonicalizeWithPrefix0(canonicalPrefix,
+ canonicalPrefix + File.separatorChar + filename);
+ }
+
+ // Run the canonicalization operation assuming that the prefix
+ // (everything up to the last filename) is canonical; just gets
+ // the canonical name of the last element of the path
+ private native String canonicalizeWithPrefix0(String canonicalPrefix,
+ String pathWithCanonicalPrefix)
+ throws IOException;
+
+ // Best-effort attempt to get parent of this path; used for
+ // optimization of filename canonicalization. This must return null for
+ // any cases where the code in canonicalize_md.c would throw an
+ // exception or otherwise deal with non-simple pathnames like handling
+ // of "." and "..". It may conservatively return null in other
+ // situations as well. Returning null will cause the underlying
+ // (expensive) canonicalization routine to be called.
+ private static String parentOrNull(String path) {
+ if (path == null) return null;
+ char sep = File.separatorChar;
+ char altSep = '/';
+ int last = path.length() - 1;
+ int idx = last;
+ int adjacentDots = 0;
+ int nonDotCount = 0;
+ while (idx > 0) {
+ char c = path.charAt(idx);
+ if (c == '.') {
+ if (++adjacentDots >= 2) {
+ // Punt on pathnames containing . and ..
+ return null;
+ }
+ if (nonDotCount == 0) {
+ // Punt on pathnames ending in a .
+ return null;
+ }
+ } else if (c == sep) {
+ if (adjacentDots == 1 && nonDotCount == 0) {
+ // Punt on pathnames containing . and ..
+ return null;
+ }
+ if (idx == 0 ||
+ idx >= last - 1 ||
+ path.charAt(idx - 1) == sep ||
+ path.charAt(idx - 1) == altSep) {
+ // Punt on pathnames containing adjacent slashes
+ // toward the end
+ return null;
+ }
+ return path.substring(0, idx);
+ } else if (c == altSep) {
+ // Punt on pathnames containing both backward and
+ // forward slashes
+ return null;
+ } else if (c == '*' || c == '?') {
+ // Punt on pathnames containing wildcards
+ return null;
+ } else {
+ ++nonDotCount;
+ adjacentDots = 0;
+ }
+ --idx;
+ }
+ return null;
+ }
/* -- Attribute accessors -- */
+ @Override
public native int getBooleanAttributes(File f);
+
+ @Override
public native boolean checkAccess(File f, int access);
+
+ @Override
public native long getLastModifiedTime(File f);
+
+ @Override
public native long getLength(File f);
- public native boolean setPermission(File f, int access, boolean enable, boolean owneronly);
+ @Override
+ public native boolean setPermission(File f, int access, boolean enable,
+ boolean owneronly);
+ /* -- File operations -- */
+
+ @Override
+ public native boolean createFileExclusively(String path)
+ throws IOException;
+
+ @Override
+ public native String[] list(File f);
+
+ @Override
+ public native boolean createDirectory(File f);
+
+ @Override
+ public native boolean setLastModifiedTime(File f, long time);
+
+ @Override
+ public native boolean setReadOnly(File f);
+
+ @Override
+ public boolean delete(File f) {
+ // Keep canonicalization caches in sync after file deletion
+ // and renaming operations. Could be more clever than this
+ // (i.e., only remove/update affected entries) but probably
+ // not worth it since these entries expire after 30 seconds
+ // anyway.
+ cache.clear();
+ prefixCache.clear();
+ return delete0(f);
+ }
+
+ private native boolean delete0(File f);
+
+ @Override
+ public boolean rename(File f1, File f2) {
+ // Keep canonicalization caches in sync after file deletion
+ // and renaming operations. Could be more clever than this
+ // (i.e., only remove/update affected entries) but probably
+ // not worth it since these entries expire after 30 seconds
+ // anyway.
+ cache.clear();
+ prefixCache.clear();
+ return rename0(f1, f2);
+ }
+
+ private native boolean rename0(File f1, File f2);
+
+ /* -- Filesystem interface -- */
+
+ @Override
+ public File[] listRoots() {
+ int ds = listRoots0();
+ int n = 0;
+ for (int i = 0; i < 26; i++) {
+ if (((ds >> i) & 1) != 0) {
+ if (!access((char)('A' + i) + ":" + slash))
+ ds &= ~(1 << i);
+ else
+ n++;
+ }
+ }
+ File[] fs = new File[n];
+ int j = 0;
+ char slash = this.slash;
+ for (int i = 0; i < 26; i++) {
+ if (((ds >> i) & 1) != 0)
+ fs[j++] = new File((char)('A' + i) + ":" + slash);
+ }
+ return fs;
+ }
+
+ private static native int listRoots0();
+
+ private boolean access(String path) {
+ try {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) security.checkRead(path);
+ return true;
+ } catch (SecurityException x) {
+ return false;
+ }
+ }
+
+ /* -- Disk usage -- */
+
+ @Override
public long getSpace(File f, int t) {
if (f.exists()) {
return getSpace0(f, t);
@@ -60,20 +627,22 @@
private native long getSpace0(File f, int t);
- /* -- File operations -- */
+ /* -- Basic infrastructure -- */
- public native boolean createFileExclusively(String path)
- throws IOException;
- protected native boolean delete0(File f);
- public native String[] list(File f);
- public native boolean createDirectory(File f);
- protected native boolean rename0(File f1, File f2);
- public native boolean setLastModifiedTime(File f, long time);
- public native boolean setReadOnly(File f);
- protected native String getDriveDirectory(int drive);
+ @Override
+ public int compare(File f1, File f2) {
+ return f1.getPath().compareToIgnoreCase(f2.getPath());
+ }
+
+ @Override
+ public int hashCode(File f) {
+ /* Could make this more efficient: String.hashCodeIgnoreCase */
+ return f.getPath().toLowerCase(Locale.ENGLISH).hashCode() ^ 1234321;
+ }
+
private static native void initIDs();
static {
- initIDs();
+ initIDs();
}
}
diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
index 06331ba..c6cde3c 100644
--- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
+++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
@@ -1099,7 +1099,7 @@
? SwingConstants.CENTER
: SwingConstants.LEADING);
- column.setComparator(new ColumnComparator(getIShellFolder(), i));
+ column.setComparator(new ColumnComparator(Win32ShellFolder2.this, i));
notNullColumns.add(column);
}
@@ -1135,7 +1135,7 @@
// synchronize the whole code of the sort method once
invoke(new Callable<Void>() {
public Void call() {
- Collections.sort(files, new ColumnComparator(getIShellFolder(), 0));
+ Collections.sort(files, new ColumnComparator(Win32ShellFolder2.this, 0));
return null;
}
@@ -1143,12 +1143,12 @@
}
private static class ColumnComparator implements Comparator<File> {
- private final long parentIShellFolder;
+ private final Win32ShellFolder2 shellFolder;
private final int columnIdx;
- public ColumnComparator(long parentIShellFolder, int columnIdx) {
- this.parentIShellFolder = parentIShellFolder;
+ public ColumnComparator(Win32ShellFolder2 shellFolder, int columnIdx) {
+ this.shellFolder = shellFolder;
this.columnIdx = columnIdx;
}
@@ -1159,7 +1159,7 @@
if (o instanceof Win32ShellFolder2
&& o1 instanceof Win32ShellFolder2) {
// delegates comparison to native method
- return compareIDsByColumn(parentIShellFolder,
+ return compareIDsByColumn(shellFolder.getIShellFolder(),
((Win32ShellFolder2) o).getRelativePIDL(),
((Win32ShellFolder2) o1).getRelativePIDL(),
columnIdx);
diff --git a/jdk/src/windows/native/java/io/FileSystem_md.c b/jdk/src/windows/native/java/io/FileSystem_md.c
index a56c5b5..bd813e7 100644
--- a/jdk/src/windows/native/java/io/FileSystem_md.c
+++ b/jdk/src/windows/native/java/io/FileSystem_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,16 +27,8 @@
#include "jni.h"
#include "jni_util.h"
-extern jboolean onNT;
-extern void initializeWindowsVersion();
-
JNIEXPORT jobject JNICALL
Java_java_io_FileSystem_getFileSystem(JNIEnv *env, jclass ignored)
{
- initializeWindowsVersion();
- if (onNT) {
- return JNU_NewObjectByName(env, "java/io/WinNTFileSystem", "()V");
- } else {
- return JNU_NewObjectByName(env, "java/io/Win32FileSystem", "()V");
- }
+ return JNU_NewObjectByName(env, "java/io/WinNTFileSystem", "()V");
}
diff --git a/jdk/src/windows/native/java/io/Win32FileSystem_md.c b/jdk/src/windows/native/java/io/Win32FileSystem_md.c
deleted file mode 100644
index 91c086c..0000000
--- a/jdk/src/windows/native/java/io/Win32FileSystem_md.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
- * 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 <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <direct.h>
-#include <windows.h>
-#include <io.h>
-
-#include "jvm.h"
-#include "jni.h"
-#include "jni_util.h"
-#include "jlong.h"
-#include "io_util.h"
-#include "dirent_md.h"
-#include "java_io_FileSystem.h"
-
-/* This macro relies upon the fact that JNU_GetStringPlatformChars always makes
- a copy of the string */
-
-#define WITH_NATIVE_PATH(env, object, id, var) \
- WITH_FIELD_PLATFORM_STRING(env, object, id, var) \
- JVM_NativePath((char *)var);
-
-#define END_NATIVE_PATH(env, var) END_PLATFORM_STRING(env, var)
-
-
-static struct {
- jfieldID path;
-} ids;
-
-JNIEXPORT void JNICALL
-Java_java_io_Win32FileSystem_initIDs(JNIEnv *env, jclass cls)
-{
- jclass fileClass = (*env)->FindClass(env, "java/io/File");
- if (!fileClass) return;
- ids.path = (*env)->GetFieldID(env, fileClass,
- "path", "Ljava/lang/String;");
-}
-
-
-/* -- Path operations -- */
-
-
-extern int canonicalize(char *path, const char *out, int len);
-extern int canonicalizeWithPrefix(const char* canonicalPrefix, const char *pathWithCanonicalPrefix, char *out, int len);
-
-JNIEXPORT jstring JNICALL
-Java_java_io_Win32FileSystem_canonicalize0(JNIEnv *env, jobject this,
- jstring pathname)
-{
- jstring rv = NULL;
-
- WITH_PLATFORM_STRING(env, pathname, path) {
- char canonicalPath[JVM_MAXPATHLEN];
- if (canonicalize(JVM_NativePath((char *)path),
- canonicalPath, JVM_MAXPATHLEN) < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "Bad pathname");
- } else {
- rv = JNU_NewStringPlatform(env, canonicalPath);
- }
- } END_PLATFORM_STRING(env, path);
- return rv;
-}
-
-
-JNIEXPORT jstring JNICALL
-Java_java_io_Win32FileSystem_canonicalizeWithPrefix0(JNIEnv *env, jobject this,
- jstring canonicalPrefixString,
- jstring pathWithCanonicalPrefixString)
-{
- jstring rv = NULL;
- char canonicalPath[JVM_MAXPATHLEN];
-
- WITH_PLATFORM_STRING(env, canonicalPrefixString, canonicalPrefix) {
- WITH_PLATFORM_STRING(env, pathWithCanonicalPrefixString, pathWithCanonicalPrefix) {
- if (canonicalizeWithPrefix(canonicalPrefix,
- pathWithCanonicalPrefix,
- canonicalPath, JVM_MAXPATHLEN) < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "Bad pathname");
- } else {
- rv = JNU_NewStringPlatform(env, canonicalPath);
- }
- } END_PLATFORM_STRING(env, pathWithCanonicalPrefix);
- } END_PLATFORM_STRING(env, canonicalPrefix);
- return rv;
-}
-
-
-
-/* -- Attribute accessors -- */
-
-/* Check whether or not the file name in "path" is a Windows reserved
- device name (CON, PRN, AUX, NUL, COM[1-9], LPT[1-9]) based on the
- returned result from GetFullPathName. If the file name in the path
- is indeed a reserved device name GetFuulPathName returns
- "\\.\[ReservedDeviceName]".
- */
-BOOL isReservedDeviceName(const char* path) {
-#define BUFSIZE 9
- char buf[BUFSIZE];
- char *lpf = NULL;
- DWORD retLen = GetFullPathName(path,
- BUFSIZE,
- buf,
- &lpf);
- if ((retLen == BUFSIZE - 1 || retLen == BUFSIZE - 2) &&
- buf[0] == '\\' && buf[1] == '\\' &&
- buf[2] == '.' && buf[3] == '\\') {
- char* dname = _strupr(buf + 4);
- if (strcmp(dname, "CON") == 0 ||
- strcmp(dname, "PRN") == 0 ||
- strcmp(dname, "AUX") == 0 ||
- strcmp(dname, "NUL") == 0)
- return TRUE;
- if ((strncmp(dname, "COM", 3) == 0 ||
- strncmp(dname, "LPT", 3) == 0) &&
- dname[3] - '0' > 0 &&
- dname[3] - '0' <= 9)
- return TRUE;
- }
- return FALSE;
-}
-
-JNIEXPORT jint JNICALL
-Java_java_io_Win32FileSystem_getBooleanAttributes(JNIEnv *env, jobject this,
- jobject file)
-{
- jint rv = 0;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- WIN32_FILE_ATTRIBUTE_DATA wfad;
- if (!isReservedDeviceName(path) &&
- GetFileAttributesEx(path, GetFileExInfoStandard, &wfad)) {
- rv = (java_io_FileSystem_BA_EXISTS
- | ((wfad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- ? java_io_FileSystem_BA_DIRECTORY
- : java_io_FileSystem_BA_REGULAR)
- | ((wfad.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
- ? java_io_FileSystem_BA_HIDDEN : 0));
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_checkAccess(JNIEnv *env, jobject this,
- jobject file, jint a)
-{
- jboolean rv = JNI_FALSE;
- int mode;
- switch (a) {
- case java_io_FileSystem_ACCESS_READ:
- case java_io_FileSystem_ACCESS_EXECUTE:
- mode = 4;
- break;
- case java_io_FileSystem_ACCESS_WRITE:
- mode = 2;
- break;
- default: assert(0);
- }
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- if (access(path, mode) == 0) {
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_setPermission(JNIEnv *env, jobject this,
- jobject file,
- jint access,
- jboolean enable,
- jboolean owneronly)
-{
- jboolean rv = JNI_FALSE;
- if (access == java_io_FileSystem_ACCESS_READ ||
- access == java_io_FileSystem_ACCESS_EXECUTE) {
- return enable;
- }
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- DWORD a;
- a = GetFileAttributes(path);
- if (a != INVALID_FILE_ATTRIBUTES) {
- if (enable)
- a = a & ~FILE_ATTRIBUTE_READONLY;
- else
- a = a | FILE_ATTRIBUTE_READONLY;
- if (SetFileAttributes(path, a))
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-JNIEXPORT jlong JNICALL
-Java_java_io_Win32FileSystem_getLastModifiedTime(JNIEnv *env, jobject this,
- jobject file)
-{
- jlong rv = 0;
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- /* Win95, Win98, WinME */
- WIN32_FIND_DATA fd;
- jlong temp = 0;
- LARGE_INTEGER modTime;
- HANDLE h = FindFirstFile(path, &fd);
- if (h != INVALID_HANDLE_VALUE) {
- FindClose(h);
- modTime.LowPart = (DWORD) fd.ftLastWriteTime.dwLowDateTime;
- modTime.HighPart = (LONG) fd.ftLastWriteTime.dwHighDateTime;
- rv = modTime.QuadPart / 10000;
- rv -= 11644473600000;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-JNIEXPORT jlong JNICALL
-Java_java_io_Win32FileSystem_getLength(JNIEnv *env, jobject this,
- jobject file)
-{
- jlong rv = 0;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- struct _stati64 sb;
- if (_stati64(path, &sb) == 0) {
- rv = sb.st_size;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-
-/* -- File operations -- */
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_createFileExclusively(JNIEnv *env, jclass cls,
- jstring pathname)
-{
- jboolean rv = JNI_FALSE;
- DWORD a;
-
- WITH_PLATFORM_STRING(env, pathname, path) {
- int orv;
- int error;
- JVM_NativePath((char *)path);
- orv = JVM_Open(path, JVM_O_RDWR | JVM_O_CREAT | JVM_O_EXCL, 0666);
- if (orv < 0) {
- if (orv != JVM_EEXIST) {
- error = GetLastError();
-
- // If a directory by the named path already exists,
- // return false (behavior of solaris and linux) instead of
- // throwing an exception
- a = GetFileAttributes(path);
-
- if ((a == INVALID_FILE_ATTRIBUTES) ||
- !(a & FILE_ATTRIBUTE_DIRECTORY)) {
- SetLastError(error);
- JNU_ThrowIOExceptionWithLastError(env, path);
- }
- }
- } else {
- JVM_Close(orv);
- rv = JNI_TRUE;
- }
- } END_PLATFORM_STRING(env, path);
- return rv;
-}
-
-
-static int
-removeFileOrDirectory(const char *path) /* Returns 0 on success */
-{
- DWORD a;
-
- SetFileAttributes(path, 0);
- a = GetFileAttributes(path);
- if (a == INVALID_FILE_ATTRIBUTES) {
- return 1;
- } else if (a & FILE_ATTRIBUTE_DIRECTORY) {
- return !RemoveDirectory(path);
- } else {
- return !DeleteFile(path);
- }
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_delete0(JNIEnv *env, jobject this,
- jobject file)
-{
- jboolean rv = JNI_FALSE;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- if (removeFileOrDirectory(path) == 0) {
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-
-/* ## Clean this up to use direct Win32 calls */
-
-JNIEXPORT jobjectArray JNICALL
-Java_java_io_Win32FileSystem_list(JNIEnv *env, jobject this,
- jobject file)
-{
- DIR *dir;
- struct dirent *ptr;
- int len, maxlen;
- jobjectArray rv, old;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- dir = opendir(path);
- } END_NATIVE_PATH(env, path);
- if (dir == NULL) return NULL;
-
- /* Allocate an initial String array */
- len = 0;
- maxlen = 16;
- rv = (*env)->NewObjectArray(env, maxlen, JNU_ClassString(env), NULL);
- if (rv == NULL) goto error;
-
- /* Scan the directory */
- while ((ptr = readdir(dir)) != NULL) {
- jstring name;
- if (!strcmp(ptr->d_name, ".") || !strcmp(ptr->d_name, ".."))
- continue;
- if (len == maxlen) {
- old = rv;
- rv = (*env)->NewObjectArray(env, maxlen <<= 1,
- JNU_ClassString(env), NULL);
- if (rv == NULL) goto error;
- if (JNU_CopyObjectArray(env, rv, old, len) < 0) goto error;
- (*env)->DeleteLocalRef(env, old);
- }
- name = JNU_NewStringPlatform(env, ptr->d_name);
- if (name == NULL) goto error;
- (*env)->SetObjectArrayElement(env, rv, len++, name);
- (*env)->DeleteLocalRef(env, name);
- }
- closedir(dir);
-
- /* Copy the final results into an appropriately-sized array */
- old = rv;
- rv = (*env)->NewObjectArray(env, len, JNU_ClassString(env), NULL);
- if (rv == NULL) goto error;
- if (JNU_CopyObjectArray(env, rv, old, len) < 0) goto error;
- return rv;
-
- error:
- closedir(dir);
- return NULL;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_createDirectory(JNIEnv *env, jobject this,
- jobject file)
-{
- jboolean rv = JNI_FALSE;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- if (mkdir(path) == 0) {
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_rename0(JNIEnv *env, jobject this,
- jobject from, jobject to)
-{
- jboolean rv = JNI_FALSE;
-
- WITH_NATIVE_PATH(env, from, ids.path, fromPath) {
- WITH_NATIVE_PATH(env, to, ids.path, toPath) {
- if (rename(fromPath, toPath) == 0) {
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, toPath);
- } END_NATIVE_PATH(env, fromPath);
- return rv;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_setLastModifiedTime(JNIEnv *env, jobject this,
- jobject file, jlong time)
-{
- jboolean rv = JNI_FALSE;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- HANDLE h;
- h = CreateFile(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, 0);
- if (h != INVALID_HANDLE_VALUE) {
- LARGE_INTEGER modTime;
- FILETIME t;
- modTime.QuadPart = (time + 11644473600000L) * 10000L;
- t.dwLowDateTime = (DWORD)modTime.LowPart;
- t.dwHighDateTime = (DWORD)modTime.HighPart;
- if (SetFileTime(h, NULL, NULL, &t)) {
- rv = JNI_TRUE;
- }
- CloseHandle(h);
- }
- } END_NATIVE_PATH(env, path);
-
- return rv;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_Win32FileSystem_setReadOnly(JNIEnv *env, jobject this,
- jobject file)
-{
- jboolean rv = JNI_FALSE;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- DWORD a;
- a = GetFileAttributes(path);
- if (a != INVALID_FILE_ATTRIBUTES) {
- if (SetFileAttributes(path, a | FILE_ATTRIBUTE_READONLY))
- rv = JNI_TRUE;
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
-
-
-/* -- Filesystem interface -- */
-
-
-JNIEXPORT jobject JNICALL
-Java_java_io_Win32FileSystem_getDriveDirectory(JNIEnv *env, jclass ignored,
- jint drive)
-{
- char buf[_MAX_PATH];
- char *p = _getdcwd(drive, buf, sizeof(buf));
- if (p == NULL) return NULL;
- if (isalpha(*p) && (p[1] == ':')) p += 2;
- return JNU_NewStringPlatform(env, p);
-}
-
-
-JNIEXPORT jint JNICALL
-Java_java_io_Win32FileSystem_listRoots0(JNIEnv *env, jclass ignored)
-{
- return GetLogicalDrives();
-}
-
-JNIEXPORT jlong JNICALL
-Java_java_io_Win32FileSystem_getSpace0(JNIEnv *env, jobject this,
- jobject file, jint t)
-{
- jlong rv = 0L;
-
- WITH_NATIVE_PATH(env, file, ids.path, path) {
- ULARGE_INTEGER totalSpace, freeSpace, usableSpace;
- if (GetDiskFreeSpaceEx(path, &usableSpace, &totalSpace, &freeSpace)) {
- switch(t) {
- case java_io_FileSystem_SPACE_TOTAL:
- rv = long_to_jlong(totalSpace.QuadPart);
- break;
- case java_io_FileSystem_SPACE_FREE:
- rv = long_to_jlong(freeSpace.QuadPart);
- break;
- case java_io_FileSystem_SPACE_USABLE:
- rv = long_to_jlong(usableSpace.QuadPart);
- break;
- default:
- assert(0);
- }
- }
- } END_NATIVE_PATH(env, path);
- return rv;
-}
diff --git a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
index 7d97829..96f9f13 100644
--- a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
+++ b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
@@ -828,6 +828,12 @@
return ret;
}
+JNIEXPORT jint JNICALL
+Java_java_io_WinNTFileSystem_listRoots0(JNIEnv *env, jclass ignored)
+{
+ return GetLogicalDrives();
+}
+
JNIEXPORT jlong JNICALL
Java_java_io_WinNTFileSystem_getSpace0(JNIEnv *env, jobject this,
jobject file, jint t)
diff --git a/jdk/src/windows/native/java/io/io_util_md.c b/jdk/src/windows/native/java/io/io_util_md.c
index 787617e..2f0e74f 100644
--- a/jdk/src/windows/native/java/io/io_util_md.c
+++ b/jdk/src/windows/native/java/io/io_util_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -40,22 +40,8 @@
#include <limits.h>
#include <wincon.h>
-extern jboolean onNT = JNI_FALSE;
-
static DWORD MAX_INPUT_EVENTS = 2000;
-void
-initializeWindowsVersion() {
- OSVERSIONINFO ver;
- ver.dwOSVersionInfoSize = sizeof(ver);
- GetVersionEx(&ver);
- if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT) {
- onNT = JNI_TRUE;
- } else {
- onNT = JNI_FALSE;
- }
-}
-
/* If this returns NULL then an exception is pending */
WCHAR*
fileToNTPath(JNIEnv *env, jobject file, jfieldID id) {
@@ -247,27 +233,21 @@
const DWORD flagsAndAttributes = maybeWriteThrough | maybeDeleteOnClose;
HANDLE h = NULL;
- if (onNT) {
- WCHAR *pathbuf = pathToNTPath(env, path, JNI_TRUE);
- if (pathbuf == NULL) {
- /* Exception already pending */
- return -1;
- }
- h = CreateFileW(
- pathbuf, /* Wide char path name */
- access, /* Read and/or write permission */
- sharing, /* File sharing flags */
- NULL, /* Security attributes */
- disposition, /* creation disposition */
- flagsAndAttributes, /* flags and attributes */
- NULL);
- free(pathbuf);
- } else {
- WITH_PLATFORM_STRING(env, path, _ps) {
- h = CreateFile(_ps, access, sharing, NULL, disposition,
- flagsAndAttributes, NULL);
- } END_PLATFORM_STRING(env, _ps);
+ WCHAR *pathbuf = pathToNTPath(env, path, JNI_TRUE);
+ if (pathbuf == NULL) {
+ /* Exception already pending */
+ return -1;
}
+ h = CreateFileW(
+ pathbuf, /* Wide char path name */
+ access, /* Read and/or write permission */
+ sharing, /* File sharing flags */
+ NULL, /* Security attributes */
+ disposition, /* creation disposition */
+ flagsAndAttributes, /* flags and attributes */
+ NULL);
+ free(pathbuf);
+
if (h == INVALID_HANDLE_VALUE) {
int error = GetLastError();
if (error == ERROR_TOO_MANY_OPEN_FILES) {
diff --git a/jdk/src/windows/native/java/lang/ProcessImpl_md.c b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
index ed14eeb..dfa59f9 100644
--- a/jdk/src/windows/native/java/lang/ProcessImpl_md.c
+++ b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
@@ -40,72 +40,6 @@
*/
#define PIPE_SIZE (4096+24)
-char *
-extractExecutablePath(JNIEnv *env, char *source)
-{
- char *p, *r;
-
- /* If no spaces, then use entire thing */
- if ((p = strchr(source, ' ')) == NULL)
- return source;
-
- /* If no quotes, or quotes after space, return up to space */
- if (((r = strchr(source, '"')) == NULL) || (r > p)) {
- *p = 0;
- return source;
- }
-
- /* Quotes before space, return up to space after next quotes */
- p = strchr(r, '"');
- if ((p = strchr(p, ' ')) == NULL)
- return source;
- *p = 0;
- return source;
-}
-
-DWORD
-selectProcessFlag(JNIEnv *env, jstring cmd0)
-{
- char buf[MAX_PATH];
- DWORD newFlag = 0;
- char *exe, *p, *name;
- unsigned char buffer[2];
- long headerLoc = 0;
- int fd = 0;
-
- exe = (char *)JNU_GetStringPlatformChars(env, cmd0, 0);
- exe = extractExecutablePath(env, exe);
-
- if (exe != NULL) {
- if ((p = strchr(exe, '\\')) == NULL) {
- SearchPath(NULL, exe, ".exe", MAX_PATH, buf, &name);
- } else {
- p = strrchr(exe, '\\');
- *p = 0;
- p++;
- SearchPath(exe, p, ".exe", MAX_PATH, buf, &name);
- }
- }
-
- fd = _open(buf, _O_RDONLY);
- if (fd > 0) {
- _read(fd, buffer, 2);
- if (buffer[0] == 'M' && buffer[1] == 'Z') {
- _lseek(fd, 60L, SEEK_SET);
- _read(fd, buffer, 2);
- headerLoc = (long)buffer[1] << 8 | (long)buffer[0];
- _lseek(fd, headerLoc, SEEK_SET);
- _read(fd, buffer, 2);
- if (buffer[0] == 'P' && buffer[1] == 'E') {
- newFlag = DETACHED_PROCESS;
- }
- }
- _close(fd);
- }
- JNU_ReleaseStringPlatformChars(env, cmd0, exe);
- return newFlag;
-}
-
static void
win32Error(JNIEnv *env, const char *functionName)
{
@@ -151,15 +85,8 @@
const jchar* penvBlock = NULL;
jlong *handles = NULL;
jlong ret = 0;
- OSVERSIONINFO ver;
- jboolean onNT = JNI_FALSE;
DWORD processFlag;
- ver.dwOSVersionInfoSize = sizeof(ver);
- GetVersionEx(&ver);
- if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT)
- onNT = JNI_TRUE;
-
assert(cmd != NULL);
pcmd = (*env)->GetStringChars(env, cmd, NULL);
if (pcmd == NULL) goto Catch;
@@ -229,10 +156,7 @@
}
SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT, TRUE);
- if (onNT)
- processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
- else
- processFlag = selectProcessFlag(env, cmd) | CREATE_UNICODE_ENVIRONMENT;
+ processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
ret = CreateProcessW(0, /* executable name */
(LPWSTR)pcmd, /* command line */
0, /* process security attribute */
diff --git a/jdk/src/windows/native/java/util/TimeZone_md.c b/jdk/src/windows/native/java/util/TimeZone_md.c
index d29558c..57d4b52 100644
--- a/jdk/src/windows/native/java/util/TimeZone_md.c
+++ b/jdk/src/windows/native/java/util/TimeZone_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -65,8 +65,6 @@
#define STANDARD_NAME 0
#define STD_NAME 2
-static int isNT = FALSE; /* TRUE if it is NT. */
-
/*
* Calls RegQueryValueEx() to get the value for the specified key. If
* the platform is NT, 2000 or XP, it calls the Unicode
@@ -95,12 +93,10 @@
int len;
*typePtr = 0;
- if (isNT) {
- ret = RegQueryValueExW(hKey, (WCHAR *) keyNames[keyIndex], NULL,
- typePtr, buf, bufLengthPtr);
- if (ret == ERROR_SUCCESS && *typePtr == REG_SZ) {
- return ret;
- }
+ ret = RegQueryValueExW(hKey, (WCHAR *) keyNames[keyIndex], NULL,
+ typePtr, buf, bufLengthPtr);
+ if (ret == ERROR_SUCCESS && *typePtr == REG_SZ) {
+ return ret;
}
valSize = sizeof(val);
@@ -180,8 +176,7 @@
*/
ver.dwOSVersionInfoSize = sizeof(ver);
GetVersionEx(&ver);
- isNT = ver.dwPlatformId == VER_PLATFORM_WIN32_NT;
- isVista = isNT && ver.dwMajorVersion >= 6;
+ isVista = ver.dwMajorVersion >= 6;
ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_CURRENT_TZ_KEY, 0,
KEY_READ, (PHKEY)&hKey);
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp
index 5c5f53d..b4110ec 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp
@@ -1559,21 +1559,8 @@
BOOL AwtWindow::AwtSetActiveWindow(BOOL isMouseEventCause, UINT hittest)
{
- // Fix for 6458497.
- // Retreat if current foreground window is out of both our and embedder process.
- // The exception is when activation is requested due to a mouse event.
- if (!isMouseEventCause) {
- HWND fgWindow = ::GetForegroundWindow();
- if (NULL != fgWindow) {
- DWORD fgProcessID;
- ::GetWindowThreadProcessId(fgWindow, &fgProcessID);
- if (fgProcessID != ::GetCurrentProcessId()
- && !AwtToolkit::GetInstance().IsEmbedderProcessId(fgProcessID))
- {
- return FALSE;
- }
- }
- }
+ // We used to reject non mouse window activation if our app wasn't active.
+ // This code since has been removed as the fix for 7185280
HWND proxyContainerHWnd = GetProxyToplevelContainer();
HWND proxyHWnd = GetProxyFocusOwner();
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index 87626e3..e42481fa 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -477,25 +477,21 @@
# Stable agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_lang
JDK_DEFAULT_TARGETS += jdk_lang
-jdk_lang: $(call TestDirs, java/lang)
+jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc vm)
$(call RunAgentvmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
-JDK_ALL_TARGETS += jdk_management1
-jdk_management1: $(call TestDirs, javax/management)
+JDK_ALL_TARGETS += jdk_jmx
+jdk_jmx: $(call TestDirs, javax/management com/sun/jmx)
$(call RunOthervmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
-JDK_ALL_TARGETS += jdk_management2
-jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management)
+JDK_ALL_TARGETS += jdk_management
+jdk_management: $(call TestDirs, com/sun/management sun/management)
$(call RunOthervmBatch)
-# All management tests
-jdk_management: jdk_management1 jdk_management2
- @$(SummaryInfo)
-
# Stable agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_math
JDK_DEFAULT_TARGETS += jdk_math
@@ -503,52 +499,42 @@
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_misc
-JDK_DEFAULT_TARGETS += jdk_misc
-jdk_misc: $(call TestDirs, \
- demo/jvmti demo/zipfs javax/naming javax/script \
- javax/smartcardio com/sun/jndi com/sun/xml \
- com/sun/corba sun/misc)
+JDK_ALL_TARGETS += jdk_other
+JDK_DEFAULT_TARGETS += jdk_other
+jdk_other: $(call TestDirs, \
+ demo/jvmti demo/zipfs sample \
+ javax/naming com/sun/jndi \
+ javax/script \
+ javax/sql \
+ javax/smartcardio \
+ javax/xml/ws com/sun/internal/ws \
+ jdk/asm \
+ com/sun/org/apache/xerces \
+ com/sun/corba \
+ com/sun/servicetag \
+ com/sun/tracing \
+ sun/usagetracker)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_net
JDK_DEFAULT_TARGETS += jdk_net
-jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
+jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio1
-JDK_DEFAULT_TARGETS += jdk_nio1
-jdk_nio1: $(call TestDirs, java/nio/file)
- $(call RunAgentvmBatch)
-
-# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio2
-JDK_DEFAULT_TARGETS += jdk_nio2
-jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
- java/nio/channels java/nio/MappedByteBuffer sun/nio/ch)
+jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio)
$(call SharedLibraryPermissions,java/nio/channels)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio3
-JDK_DEFAULT_TARGETS += jdk_nio3
-jdk_nio3: $(call TestDirs, java/nio/charset sun/nio/cs)
- $(call RunAgentvmBatch)
-
-# All nio tests
-jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
- @$(SummaryInfo)
-
-# Stable agentvm testruns (minus items from PROBLEM_LIST)
jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
$(call RunAgentvmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
JDK_ALL_TARGETS += jdk_rmi
-jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi)
+jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl)
$(call RunOthervmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
@@ -566,7 +552,7 @@
JDK_ALL_TARGETS += jdk_security3
jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \
sun/security com/sun/org/apache/xml/internal/security \
- com/oracle/security/ucrypto)
+ com/oracle/security)
$(call SharedLibraryPermissions,sun/security)
$(call RunAgentvmBatch)
@@ -593,23 +579,17 @@
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_tools1
-jdk_tools1: $(call TestDirs, com/sun/jdi)
+JDK_ALL_TARGETS += jdk_jdi
+jdk_jdi: $(call TestDirs, com/sun/jdi)
$(call RunAgentvmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
-JDK_ALL_TARGETS += jdk_tools2
-jdk_tools2: $(call TestDirs, \
- com/sun/tools sun/jvmstat sun/tools tools vm \
- com/sun/servicetag com/sun/tracing)
+JDK_ALL_TARGETS += jdk_tools
+jdk_tools: $(call TestDirs, com/sun/tools sun/jvmstat sun/tools tools)
$(call SharedLibraryPermissions,tools/launcher)
$(call RunAgentvmBatch)
-# All tools tests
-jdk_tools: jdk_tools1 jdk_tools2
- @$(SummaryInfo)
-
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
ifdef OPENJDK
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 23c91cf..1dc0759 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -152,6 +152,10 @@
# jdk_management
+############################################################################
+
+# jdk_jmx
+
# 6959636
javax/management/loading/LibraryLoader/LibraryLoaderTest.java windows-all
@@ -167,7 +171,7 @@
############################################################################
-# jdk_misc
+# jdk_other
# 6988950
demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all
@@ -315,6 +319,9 @@
sun/security/tools/keytool/selfissued.sh solaris-all
sun/security/tools/keytool/standard.sh solaris-all
+# 8000439: NPG: REGRESSION : sun/security/krb5/auto/MaxRetries.java fails with timeout
+sun/security/krb5/auto/MaxRetries.java solaris-sparcv9
+
############################################################################
# jdk_sound
@@ -329,6 +336,7 @@
# 7196199
java/text/Bidi/Bug6665028.java generic-all
+
############################################################################
# jdk_tools
@@ -336,6 +344,24 @@
# 6461635
com/sun/tools/attach/BasicTests.sh generic-all
+# 7172176
+sun/tools/jconsole/ResourceCheckTest.sh generic-all
+sun/tools/jconsole/ImmutableResourceTest.sh generic-all
+
+# 7132203
+sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
+
+# Tests take too long, see 7143279
+tools/pack200/CommandLineTests.java generic-all
+tools/pack200/Pack200Test.java generic-all
+
+# 7150569
+tools/launcher/UnicodeTest.java macosx-all
+
+############################################################################
+
+# jdk_jdi
+
# Filed 6952105
com/sun/jdi/SuspendThreadTest.java generic-all
@@ -351,20 +377,6 @@
# Filed 6402201
com/sun/jdi/ProcessAttachTest.sh generic-all
-# Filed 7172176
-sun/tools/jconsole/ResourceCheckTest.sh generic-all
-sun/tools/jconsole/ImmutableResourceTest.sh generic-all
-
-# 7132203
-sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
-
-# Tests take too long, see 7143279
-tools/pack200/CommandLineTests.java generic-all
-tools/pack200/Pack200Test.java generic-all
-
-# 7150569
-tools/launcher/UnicodeTest.java macosx-all
-
############################################################################
# jdk_util
diff --git a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java
new file mode 100644
index 0000000..03377dc
--- /dev/null
+++ b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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 7094377 8000487 6176036 7056489
+ * @summary Timeout tests for ldap
+ */
+
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.net.SocketTimeoutException;
+import java.io.*;
+import javax.naming.*;
+import javax.naming.directory.*;
+import java.util.Hashtable;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+public class LdapTimeoutTest {
+ private static final ScheduledExecutorService pool =
+ Executors.newScheduledThreadPool(1);
+ static volatile int passed = 0, failed = 0;
+ static void pass() {passed++;}
+ static void fail() {failed++; Thread.dumpStack();}
+
+ public static void main(String[] args) throws Exception {
+ ServerSocket serverSock = new ServerSocket(0);
+ Server s = new Server(serverSock);
+ s.start();
+ Thread.sleep(200);
+
+ Hashtable env = new Hashtable(11);
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.ldap.LdapCtxFactory");
+ env.put(Context.PROVIDER_URL, "ldap://localhost:" +
+ serverSock.getLocalPort());
+
+ env.put(Context.SECURITY_AUTHENTICATION,"simple");
+
+ env.put(Context.SECURITY_PRINCIPAL, "user");
+ env.put(Context.SECURITY_CREDENTIALS, "password");
+
+ env.put("com.sun.jndi.ldap.connect.timeout", "10");
+ env.put("com.sun.jndi.ldap.read.timeout", "3000");
+
+ InitialContext ctx = null;
+ try {
+ new LdapTimeoutTest().ldapReadTimeoutTest(env, false);
+ new LdapTimeoutTest().ldapReadTimeoutTest(env, true);
+ new LdapTimeoutTest().simpleAuthConnectTest(env);
+ } finally {
+ s.interrupt();
+ LdapTimeoutTest.pool.shutdown();
+ }
+
+ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+ if (failed > 0) throw new AssertionError("Some tests failed");
+ }
+
+ void ldapReadTimeoutTest(Hashtable env, boolean ssl) {
+ InitialContext ctx = null;
+ if (ssl) env.put(Context.SECURITY_PROTOCOL, "ssl");
+ ScheduledFuture killer = killSwitch();
+ long start = System.nanoTime();
+ try {
+ ctx = new InitialDirContext(env);
+ SearchControls scl = new SearchControls();
+ scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ NamingEnumeration<SearchResult> answer = ((InitialDirContext)ctx)
+ .search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
+ // shouldn't reach here
+ fail();
+ } catch (NamingException e) {
+ if (ssl) {
+ if (e.getCause() instanceof SocketTimeoutException) {
+ pass();
+ } else if (e.getCause() instanceof InterruptedIOException) {
+ Thread.interrupted();
+ fail();
+ }
+ } else {
+ pass();
+ }
+ } finally {
+ if (!shutItDown(killer, ctx)) fail();
+ }
+ }
+
+ void simpleAuthConnectTest(Hashtable env) {
+ InitialContext ctx = null;
+ ScheduledFuture killer = killSwitch();
+ long start = System.nanoTime();
+ try {
+ ctx = new InitialDirContext(env);
+ // shouldn't reach here
+ System.err.println("Fail: InitialDirContext succeeded");
+ fail();
+ } catch (NamingException e) {
+ long end = System.nanoTime();
+ if (e.getCause() instanceof SocketTimeoutException) {
+ if (TimeUnit.NANOSECONDS.toMillis(end - start) < 2900) {
+ pass();
+ } else {
+ System.err.println("Fail: Waited too long");
+ fail();
+ }
+ } else if (e.getCause() instanceof InterruptedIOException) {
+ Thread.interrupted();
+ fail();
+ } else {
+ fail();
+ }
+ } finally {
+ if (!shutItDown(killer, ctx)) fail();
+ }
+ }
+
+ boolean shutItDown(ScheduledFuture killer, InitialContext ctx) {
+ killer.cancel(true);
+ try {
+ if (ctx != null) ctx.close();
+ return true;
+ } catch (NamingException ex) {
+ return false;
+ }
+ }
+
+ ScheduledFuture killSwitch() {
+ final Thread current = Thread.currentThread();
+ return LdapTimeoutTest.pool.schedule(new Callable<Void>() {
+ public Void call() throws Exception {
+ System.err.println("Fail: killSwitch()");
+ current.interrupt();
+ return null;
+ }
+ }, 5000, TimeUnit.MILLISECONDS);
+ }
+
+ static class Server extends Thread {
+ final ServerSocket serverSock;
+
+ Server(ServerSocket serverSock) {
+ this.serverSock = serverSock;
+ }
+
+ public void run() {
+ try {
+ Socket socket = serverSock.accept();
+ } catch (IOException e) {}
+ }
+ }
+}
+
diff --git a/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java
deleted file mode 100644
index 9fae77d..0000000
--- a/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7094377
- * @summary Com.sun.jndi.ldap.read.timeout doesn't work with ldaps.
- */
-
-import java.net.Socket;
-import java.net.ServerSocket;
-import java.io.*;
-import javax.naming.*;
-import javax.naming.directory.*;
-import java.util.Hashtable;
-
-public class LdapsReadTimeoutTest {
-
- public static void main(String[] args) throws Exception {
- boolean passed = false;
-
- // create the server
- try (Server server = Server.create()) {
- // Set up the environment for creating the initial context
- Hashtable<String,Object> env = new Hashtable<>(11);
- env.put(Context.INITIAL_CONTEXT_FACTORY,
- "com.sun.jndi.ldap.LdapCtxFactory");
- env.put("com.sun.jndi.ldap.connect.timeout", "1000");
- env.put("com.sun.jndi.ldap.read.timeout", "1000");
- env.put(Context.PROVIDER_URL, "ldaps://localhost:" + server.port());
-
-
- // Create initial context
- DirContext ctx = new InitialDirContext(env);
- try {
- System.out.println("LDAP Client: Connected to the Server");
-
- SearchControls scl = new SearchControls();
- scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
- System.out.println("Performing Search");
- NamingEnumeration<SearchResult> answer =
- ctx.search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
- } finally {
- // Close the context when we're done
- ctx.close();
- }
- } catch (NamingException e) {
- passed = true;
- e.printStackTrace();
- }
-
- if (!passed) {
- throw new Exception("Read timeout test failed," +
- " read timeout exception not thrown");
- }
- System.out.println("The test PASSED");
- }
-
- static class Server implements Runnable, Closeable {
- private final ServerSocket ss;
- private Socket sref;
-
- private Server(ServerSocket ss) {
- this.ss = ss;
- }
-
- static Server create() throws IOException {
- Server server = new Server(new ServerSocket(0));
- new Thread(server).start();
- return server;
- }
-
- int port() {
- return ss.getLocalPort();
- }
-
- public void run() {
- try (Socket s = ss.accept()) {
- sref = s;
- System.out.println("Server: Connection accepted");
- BufferedInputStream bis =
- new BufferedInputStream(s.getInputStream());
- byte[] buf = new byte[100];
- int n;
- do {
- n = bis.read(buf);
- } while (n > 0);
- } catch (IOException e) {
- // ignore
- }
- }
-
- public void close() throws IOException {
- ss.close();
- sref.close();
- }
- }
-}
diff --git a/jdk/test/com/sun/jndi/ldap/ReadTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/ReadTimeoutTest.java
deleted file mode 100644
index 20e2917..0000000
--- a/jdk/test/com/sun/jndi/ldap/ReadTimeoutTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 6176036 7056489
- * @summary Read-timeout specification for LDAP operations
- */
-
-import java.net.Socket;
-import java.net.ServerSocket;
-import java.io.*;
-import javax.naming.*;
-import javax.naming.directory.*;
-import java.util.Hashtable;
-
-public class ReadTimeoutTest {
-
- public static void main(String[] args) throws Exception {
- boolean passed = false;
-
- // create the server
- try (Server server = Server.create()) {
- // Set up the environment for creating the initial context
- Hashtable<String,Object> env = new Hashtable<>(11);
- env.put(Context.INITIAL_CONTEXT_FACTORY,
- "com.sun.jndi.ldap.LdapCtxFactory");
- env.put("com.sun.jndi.ldap.read.timeout", "1000");
- env.put(Context.PROVIDER_URL, "ldap://localhost:" + server.port());
-
-
- // Create initial context
- DirContext ctx = new InitialDirContext(env);
- try {
- System.out.println("LDAP Client: Connected to the Server");
-
- SearchControls scl = new SearchControls();
- scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
- System.out.println("Performing Search");
- NamingEnumeration<SearchResult> answer =
- ctx.search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
- } finally {
- // Close the context when we're done
- ctx.close();
- }
- } catch (NamingException e) {
- passed = true;
- e.printStackTrace();
- }
-
- if (!passed) {
- throw new Exception("Read timeout test failed," +
- " read timeout exception not thrown");
- }
- System.out.println("The test PASSED");
- }
-
- static class Server implements Runnable, Closeable {
- private final ServerSocket ss;
-
- private Server(ServerSocket ss) {
- this.ss = ss;
- }
-
- static Server create() throws IOException {
- Server server = new Server(new ServerSocket(0));
- new Thread(server).start();
- return server;
- }
-
- int port() {
- return ss.getLocalPort();
- }
-
- public void run() {
- try (Socket s = ss.accept()) {
- System.out.println("Server: Connection accepted");
- BufferedInputStream bis = new BufferedInputStream(s.getInputStream());
- byte[] buf = new byte[100];
- int n;
- do {
- n = bis.read(buf);
- } while (n > 0);
- } catch (IOException e) {
- // ignore
- }
- }
-
- public void close() throws IOException {
- ss.close();
- }
- }
-}
diff --git a/jdk/test/java/awt/Frame/7024749/bug7024749.java b/jdk/test/java/awt/Frame/7024749/bug7024749.java
index 5eb28b6..4e7f682 100644
--- a/jdk/test/java/awt/Frame/7024749/bug7024749.java
+++ b/jdk/test/java/awt/Frame/7024749/bug7024749.java
@@ -25,7 +25,7 @@
* @test
* @bug 7024749
* @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75
- * @library ../../../regtesthelpers
+ * @library ../../regtesthelpers
* @build Util
* @author Oleg Pekhovskiy: area=awt.toplevel
@run main bug7024749
diff --git a/jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java b/jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java
new file mode 100644
index 0000000..0e5e46b
--- /dev/null
+++ b/jdk/test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 6373505
+ * @summary Tests that the result of Toolkit.getScreenResolution() is
+ * consistent with GraphicsConfiguration.getNormalizingTransform().
+ * @author Dmitri.Trembovetski@Sun.COM: area=GraphicsConfiguration
+ * @run main NormalizingTransformTest
+ */
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
+
+public class NormalizingTransformTest {
+
+ public static void main(String[] args) {
+ GraphicsConfiguration gc =
+ GraphicsEnvironment.getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().getDefaultConfiguration();
+ AffineTransform normTransform = gc.getNormalizingTransform();
+ int dpiX = Toolkit.getDefaultToolkit().getScreenResolution();
+ int normDpiX = (int)(normTransform.getScaleX() * 72.0);
+ if (dpiX != normDpiX) {
+ throw new RuntimeException(
+ "Test FAILED. Toolkit.getScreenResolution()=" + dpiX +
+ " GraphicsConfiguration.getNormalizingTransform()="+normDpiX);
+ }
+ System.out.println("Test PASSED. DPI="+normDpiX);
+ }
+
+}
diff --git a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java
new file mode 100644
index 0000000..a5bed9c
--- /dev/null
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 Test that Toolkit.getDefaultToolkit throws AWTError exception if bad DISPLAY variable was set
+ * @bug 6818083
+ *
+ * @run shell/timeout=240 BadDisplayTest.sh
+ */
+
+import java.awt.*;
+
+public class BadDisplayTest{
+ public static void main(String[] args) {
+
+ Throwable th = null;
+ try {
+ Toolkit.getDefaultToolkit();
+ } catch (Throwable x) {
+ th = x;
+ }
+ if ( !(th instanceof AWTError)) {
+ System.exit(1);
+ }
+ }
+}
diff --git a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh
new file mode 100644
index 0000000..f4a54d3
--- /dev/null
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh
@@ -0,0 +1,42 @@
+# Copyright (c) 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.
+#
+# 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.
+
+${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
+
+
+export DISPLAY=
+
+OS=`uname -s`
+case "$OS" in
+ SunOS )
+ ${TESTJAVA}/bin/java BadDisplayTest
+ ;;
+ Linux )
+ ${TESTJAVA}/bin/java BadDisplayTest
+ ;;
+ * )
+ echo "Unsupported System: ${OS}"
+ exit 0;
+ ;;
+esac
+
+exit $?
+
diff --git a/jdk/test/java/io/pathNames/win32/bug6344646.java b/jdk/test/java/io/pathNames/win32/bug6344646.java
index d39dd40..30f5aa2 100644
--- a/jdk/test/java/io/pathNames/win32/bug6344646.java
+++ b/jdk/test/java/io/pathNames/win32/bug6344646.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -23,7 +23,7 @@
/* @test
* @bug 6344646
- * @summary tests that Win32FileSystem.hashCode() uses
+ * @summary tests that WinNTFileSystem.hashCode() uses
* locale independent case mapping.
*/
diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java
index ff7f051..8ad7bd9 100644
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java
@@ -36,10 +36,12 @@
import static java.lang.ProcessBuilder.Redirect.*;
import java.io.*;
+import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.security.*;
+import sun.misc.Unsafe;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import static java.lang.System.getenv;
@@ -1938,17 +1940,21 @@
final byte[] bytes = new byte[10];
final Process p = new ProcessBuilder(childArgs).start();
final CountDownLatch latch = new CountDownLatch(1);
+ final InputStream s;
+ switch (action & 0x1) {
+ case 0: s = p.getInputStream(); break;
+ case 1: s = p.getErrorStream(); break;
+ default: throw new Error();
+ }
final Thread thread = new Thread() {
public void run() {
try {
- latch.countDown();
int r;
- switch (action) {
- case 0: r = p.getInputStream().read(); break;
- case 1: r = p.getErrorStream().read(); break;
- case 2: r = p.getInputStream().read(bytes); break;
- case 3: r = p.getErrorStream().read(bytes); break;
- default: throw new Error();
+ latch.countDown();
+ switch (action & 0x2) {
+ case 0: r = s.read(); break;
+ case 2: r = s.read(bytes); break;
+ default: throw new Error();
}
equal(-1, r);
} catch (Throwable t) { unexpected(t); }}};
@@ -1956,6 +1962,40 @@
thread.start();
latch.await();
Thread.sleep(10);
+
+ String os = System.getProperty("os.name");
+ if (os.equalsIgnoreCase("Solaris") ||
+ os.equalsIgnoreCase("SunOS"))
+ {
+ final Object deferred;
+ Class<?> c = s.getClass();
+ if (c.getName().equals(
+ "java.lang.UNIXProcess$DeferredCloseInputStream"))
+ {
+ deferred = s;
+ } else {
+ Field deferredField = p.getClass().
+ getDeclaredField("stdout_inner_stream");
+ deferredField.setAccessible(true);
+ deferred = deferredField.get(p);
+ }
+ Field useCountField = deferred.getClass().
+ getDeclaredField("useCount");
+ useCountField.setAccessible(true);
+
+ while (useCountField.getInt(deferred) <= 0) {
+ Thread.yield();
+ }
+ } else if (s instanceof BufferedInputStream) {
+ Field f = Unsafe.class.getDeclaredField("theUnsafe");
+ f.setAccessible(true);
+ Unsafe unsafe = (Unsafe)f.get(null);
+
+ while (unsafe.tryMonitorEnter(s)) {
+ unsafe.monitorExit(s);
+ Thread.sleep(1);
+ }
+ }
p.destroy();
thread.join();
}
diff --git a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
new file mode 100644
index 0000000..48ccb2a
--- /dev/null
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm ClassForNameTest
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class ClassForNameTest {
+ final static String NAME = ClassForNameTest.class.getName();
+
+ public static void main(String[] args) throws Throwable {
+ {
+ final MethodType mt = MethodType.methodType(Class.class, String.class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findStatic(Class.class, "forName", mt);
+
+ Class.forName(NAME);
+
+ mh.invoke(NAME);
+ mh.bindTo(NAME).invoke();
+ mh.invokeWithArguments(Arrays.asList(NAME));
+ mh.invokeWithArguments(NAME);
+ Class cls = (Class) mh.invokeExact(NAME);
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findVirtual(Method.class, "invoke", mt)
+ .bindTo(fnMethod);
+
+ fnMethod.invoke(null, NAME);
+
+ mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();
+ mh.invoke(null, new Object[]{NAME});
+ mh.invokeWithArguments(null, new Object[]{NAME});
+ mh.invokeWithArguments(Arrays.asList(null, new Object[]{NAME}));
+ Object obj = mh.invokeExact((Object) null, new Object[]{NAME});
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+
+ final MethodHandle mh = MethodHandles.lookup()
+ .bind(fnMethod, "invoke", mt);
+
+ mh.bindTo(null).bindTo(new Object[]{NAME}).invoke();
+ mh.invoke(null, new Object[]{NAME});
+ mh.invokeWithArguments(null, NAME);
+ mh.invokeWithArguments(Arrays.asList(null, NAME));
+ Object obj = mh.invokeExact((Object) null, new Object[]{NAME});
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodHandle mh = MethodHandles.lookup().unreflect(fnMethod);
+
+ mh.bindTo(NAME).invoke();
+ mh.invoke(NAME);
+ mh.invokeWithArguments(NAME);
+ mh.invokeWithArguments(Arrays.asList(NAME));
+ Class cls = (Class) mh.invokeExact(NAME);
+ }
+
+ System.out.println("TEST PASSED");
+ }
+}
diff --git a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
new file mode 100644
index 0000000..0fd3cbd
--- /dev/null
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm/policy=jtreg.security.policy/secure=java.lang.SecurityManager GetUnsafeTest
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class GetUnsafeTest {
+ final static String NAME = "sun.misc.Unsafe";
+
+ private static boolean isTestFailed = false;
+
+ private static void fail() {
+ isTestFailed = true;
+ try { throw new Exception(); } catch (Throwable e) {
+ StackTraceElement frame = e.getStackTrace()[1];
+ System.out.printf("Failed at %s:%d\n", frame.getFileName(), frame.getLineNumber());
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ {
+ final MethodType mt = MethodType.methodType(Class.class, String.class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findStatic(Class.class, "forName", mt);
+
+ try { Class.forName(NAME); fail(); } catch (Throwable e) {}
+
+ try { mh.invoke(NAME); fail(); } catch (Throwable e) {}
+ try { mh.bindTo(NAME).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(NAME); fail(); } catch (Throwable e) {}
+ try { Class cls = (Class) mh.invokeExact(NAME); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+ final MethodHandle mh = MethodHandles.lookup()
+ .findVirtual(Method.class, "invoke", mt)
+ .bindTo(fnMethod);
+
+ try { fnMethod.invoke(null, NAME); fail(); } catch (Throwable e) {}
+
+ try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(null, new Object[]{NAME})); fail(); } catch (Throwable e) {}
+ try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodType mt = MethodType.methodType(Object.class, Object.class, Object[].class);
+
+ final MethodHandle mh = MethodHandles.lookup().bind(fnMethod, "invoke", mt);
+
+ try { mh.bindTo(null).bindTo(new Object[]{NAME}).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(null, NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(null, NAME)); fail(); } catch (Throwable e) {}
+ try { Object obj = mh.invokeExact((Object) null, new Object[]{NAME}); fail(); } catch (Throwable e) {}
+ }
+
+ {
+ final Method fnMethod = Class.class.getMethod("forName", String.class);
+ final MethodHandle mh = MethodHandles.lookup().unreflect(fnMethod);
+
+ try { mh.bindTo(NAME).invoke(); fail(); } catch (Throwable e) {}
+ try { mh.invoke(NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(NAME); fail(); } catch (Throwable e) {}
+ try { mh.invokeWithArguments(Arrays.asList(NAME)); fail(); } catch (Throwable e) {}
+ try { Class cls = (Class) mh.invokeExact(NAME); fail(); } catch (Throwable e) {}
+ }
+
+ if (!isTestFailed) {
+ System.out.println("TEST PASSED");
+ } else {
+ System.out.println("TEST FAILED");
+ System.exit(1);
+ }
+ }
+}
diff --git a/jdk/test/java/lang/invoke/7196190/MHProxyTest.java b/jdk/test/java/lang/invoke/7196190/MHProxyTest.java
new file mode 100644
index 0000000..5e07f39
--- /dev/null
+++ b/jdk/test/java/lang/invoke/7196190/MHProxyTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7196190
+ * @summary Improve method of handling MethodHandles
+ *
+ * @run main/othervm MHProxyTest
+ */
+
+import java.lang.invoke.*;
+import java.security.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class MHProxyTest {
+ private static final Class<?> C_Unsafe;
+ private static final MethodHandle MH_getUnsafe;
+ static {
+ // Do these before there is a SM installed.
+ C_Unsafe = sun.misc.Unsafe.class; // EXPECT A WARNING ON THIS LINE
+ Lookup lookup = lookup();
+ MethodHandle gumh = null;
+ try {
+ gumh = lookup.findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ MH_getUnsafe = gumh;
+ // Try some different lookups:
+ try {
+ lookup.in(Object.class).findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ lookup = lookup().in(C_Unsafe);
+ try {
+ lookup.in(C_Unsafe).findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ } catch (ReflectiveOperationException ex) {
+ throw new InternalError(ex.toString());
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ System.setSecurityManager(new SecurityManager());
+ Lookup lookup = lookup();
+ testBasic(lookup);
+ testDoPriv(lookup);
+ testSetVar();
+ Lookup l2 = lookup.in(Object.class);
+ System.out.println("=== "+l2);
+ testBasic(l2);
+ testDoPriv(l2);
+ Lookup l3 = lookup.in(C_Unsafe);
+ System.out.println("=== "+l3);
+ testBasic(l3);
+ testDoPriv(l3);
+ if (failure != null)
+ throw failure;
+ }
+
+ private static Throwable failure;
+ private static void fail(Throwable ex) {
+ if (failure == null)
+ failure = ex;
+ StackTraceElement frame = new Exception().getStackTrace()[1];
+ System.out.printf("Failed at %s:%d: %s\n", frame.getFileName(), frame.getLineNumber(), ex);
+ }
+ private static void ok(Throwable ex) {
+ StackTraceElement frame = new Exception().getStackTrace()[1];
+ System.out.printf("OK at %s:%d: %s\n", frame.getFileName(), frame.getLineNumber(), ex);
+ }
+
+ private static void testBasic(Lookup lookup) throws Throwable {
+ // Verify that we can't get to this guy under the SM:
+ try {
+ MethodHandle badmh = lookup.findStatic(C_Unsafe, "getUnsafe", methodType(C_Unsafe));
+ assert(badmh.type() == methodType(C_Unsafe));
+ badmh = badmh.asType(badmh.type().generic());
+ Object u = C_Unsafe.cast(badmh.invokeExact());
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got mh to getUnsafe!"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ try {
+ Object u = MH_getUnsafe.invokeWithArguments();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH invoke)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ try {
+ MethodHandle mh = MH_getUnsafe;
+ mh = mh.asType(mh.type().generic());
+ mh = foldArguments(identity(Object.class), mh);
+ mh = filterReturnValue(mh, identity(Object.class));
+ Object u = mh.invokeExact();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH invokeWithArguments)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+
+ private static void testDoPriv(Lookup lookup) throws Throwable {
+ PrivilegedAction privAct = MethodHandleProxies.asInterfaceInstance(PrivilegedAction.class, MH_getUnsafe);
+ try {
+ Object u = AccessController.doPrivileged(privAct);
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (static doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ MethodHandle MH_doPriv = lookup.findStatic(AccessController.class, "doPrivileged",
+ methodType(Object.class, PrivilegedAction.class));
+ MH_doPriv = MH_doPriv.bindTo(privAct);
+ try {
+ Object u = MH_doPriv.invoke();
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH + doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ // try one more layer of indirection:
+ Runnable rbl = MethodHandleProxies.asInterfaceInstance(Runnable.class, MH_doPriv);
+ try {
+ rbl.run();
+ fail(new AssertionError("got the Unsafe object! (Runnable + MH + doPriv)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+
+ private static void testSetVar() throws Throwable {
+ {
+ // Test the box pattern:
+ Object[] box = new Object[1];
+ MethodHandle MH_getFoo = identity(Object.class).bindTo("foo");
+ MethodHandle MH_storeToBox = insertArguments(arrayElementSetter(Object[].class), 0, box, 0);
+ MethodHandle mh = filterReturnValue(MH_getFoo, MH_storeToBox);
+ mh.invokeExact();
+ assert(box[0] == "foo");
+ }
+ {
+ Object[] box = new Object[1];
+ MethodHandle MH_storeToBox = insertArguments(arrayElementSetter(Object[].class), 0, box, 0);
+ MethodHandle mh = filterReturnValue(MH_getUnsafe.asType(MH_getUnsafe.type().generic()), MH_storeToBox);
+ try {
+ mh.invokeExact();
+ Object u = box[0];
+ assert(C_Unsafe.isInstance(u));
+ fail(new AssertionError("got the Unsafe object! (MH + setElement)"));
+ } catch (SecurityException ex) {
+ ok(ex);
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/lang/invoke/7196190/jtreg.security.policy b/jdk/test/java/lang/invoke/7196190/jtreg.security.policy
new file mode 100644
index 0000000..d32c7af
--- /dev/null
+++ b/jdk/test/java/lang/invoke/7196190/jtreg.security.policy
@@ -0,0 +1,9 @@
+/*
+ * security policy used by the test process
+ * must allow file reads so that jtreg itself can run
+ */
+
+grant {
+ // standard test activation permissions
+ permission java.io.FilePermission "*", "read";
+};
diff --git a/jdk/test/java/lang/ref/Basic.java b/jdk/test/java/lang/ref/Basic.java
index 4a885d8..10313a4 100644
--- a/jdk/test/java/lang/ref/Basic.java
+++ b/jdk/test/java/lang/ref/Basic.java
@@ -105,6 +105,7 @@
System.err.println("GC " + i);
Thread.sleep(10);
System.gc();
+ System.runFinalization();
showReferences();
while ((r = q2.poll()) != null) {
diff --git a/jdk/test/java/net/Socket/SocketGrowth.java b/jdk/test/java/net/Socket/SocketGrowth.java
new file mode 100644
index 0000000..0290f81
--- /dev/null
+++ b/jdk/test/java/net/Socket/SocketGrowth.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7181793
+ * @summary getOutputStream create streams that cannot be GC'ed until Socket is closed
+ * @run main/othervm -Xmx32m SocketGrowth
+ */
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class SocketGrowth {
+
+ public static void main(String[] args) throws IOException {
+
+ try (ServerSocket ss = new ServerSocket(0)) {
+ try (Socket s = new Socket("localhost", ss.getLocalPort());
+ Socket peer = ss.accept()) {
+ for (int i=0; i<1000000; i++) {
+ // buggy JDK will run out of memory in this loop
+ s.getOutputStream();
+ // test InputStream also while we're here
+ s.getInputStream();
+ if (i % 100000 == 0) System.out.println(i);
+ }
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/net/URL/Test.java b/jdk/test/java/net/URL/Test.java
index 58c8818..5a0909e 100644
--- a/jdk/test/java/net/URL/Test.java
+++ b/jdk/test/java/net/URL/Test.java
@@ -322,10 +322,6 @@
test("ftp://ftp.is.co.za/rfc/rfc1808.txt")
.s("ftp").h("ftp.is.co.za").p("/rfc/rfc1808.txt").z();
- test("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles")
- .s("gopher").h("spinaltap.micro.umn.edu")
- .p("/00/Weather/California/Los%20Angeles").z();
-
test("http://www.math.uio.no/faq/compression-faq/part1.html")
.s("http").h("www.math.uio.no").p("/faq/compression-faq/part1.html").z();
diff --git a/jdk/test/java/util/Locale/LocaleProviders.java b/jdk/test/java/util/Locale/LocaleProviders.java
index 98a999b..6bc499d 100644
--- a/jdk/test/java/util/Locale/LocaleProviders.java
+++ b/jdk/test/java/util/Locale/LocaleProviders.java
@@ -47,6 +47,10 @@
bug7198834Test();
break;
+ case "tzNameTest":
+ tzNameTest(args[1]);
+ break;
+
default:
throw new RuntimeException("Test method '"+methodName+"' not found.");
}
@@ -81,4 +85,12 @@
System.out.println("Windows HOST locale adapter not found. Ignoring this test.");
}
}
+
+ static void tzNameTest(String id) {
+ TimeZone tz = TimeZone.getTimeZone(id);
+ String tzName = tz.getDisplayName(false, TimeZone.SHORT, Locale.US);
+ if (tzName.startsWith("GMT")) {
+ throw new RuntimeException("JRE's localized time zone name for "+id+" could not be retrieved. Returned name was: "+tzName);
+ }
+ }
}
diff --git a/jdk/test/java/util/Locale/LocaleProviders.sh b/jdk/test/java/util/Locale/LocaleProviders.sh
index 703d1f0..ab85ee7 100644
--- a/jdk/test/java/util/Locale/LocaleProviders.sh
+++ b/jdk/test/java/util/Locale/LocaleProviders.sh
@@ -23,7 +23,7 @@
#!/bin/sh
#
# @test
-# @bug 6336885 7196799 7197573 7198834
+# @bug 6336885 7196799 7197573 7198834 8000245 8000615
# @summary tests for "java.locale.providers" system property
# @compile -XDignore.symbol.file LocaleProviders.java
# @run shell/timeout=600 LocaleProviders.sh
@@ -65,6 +65,36 @@
;;
esac
+# create an SPI implementation
+mk() {
+ d=`dirname $1`
+ if [ ! -d $d ]; then mkdir -p $d; fi
+ cat - >$1
+}
+
+SPIDIR=${TESTCLASSES}${FS}spi
+rm -rf ${SPIDIR}
+mk ${SPIDIR}${FS}src${FS}tznp.java << EOF
+import java.util.spi.TimeZoneNameProvider;
+import java.util.Locale;
+
+public class tznp extends TimeZoneNameProvider {
+ public String getDisplayName(String ID, boolean daylight, int style, Locale locale) {
+ return "tznp";
+ }
+
+ public Locale[] getAvailableLocales() {
+ Locale[] locales = {Locale.GERMAN, Locale.US, Locale.JAPANESE, Locale.CHINESE};
+ return locales;
+ }
+}
+EOF
+mk ${SPIDIR}${FS}dest${FS}META-INF${FS}services${FS}java.util.spi.TimeZoneNameProvider << EOF
+tznp
+EOF
+${TESTJAVA}${FS}bin${FS}javac -d ${SPIDIR}${FS}dest ${SPIDIR}${FS}src${FS}tznp.java
+${TESTJAVA}${FS}bin${FS}jar cvf ${SPIDIR}${FS}tznp.jar -C ${SPIDIR}${FS}dest .
+
# get the platform default locales
PLATDEF=`${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
DEFLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
@@ -199,4 +229,20 @@
PARAM3=
runTest
+# testing 8000245 fix.
+METHODNAME=tzNameTest
+PREFLIST="JRE -Djava.ext.dirs=${SPIDIR}"
+PARAM1=Europe/Moscow
+PARAM2=
+PARAM3=
+runTest
+
+# testing 8000615 fix.
+METHODNAME=tzNameTest
+PREFLIST="JRE -Djava.ext.dirs=${SPIDIR}"
+PARAM1=America/Los_Angeles
+PARAM2=
+PARAM3=
+runTest
+
exit $result
diff --git a/jdk/test/java/util/Map/EntryHashCode.java b/jdk/test/java/util/Map/EntryHashCode.java
new file mode 100644
index 0000000..98ef365
--- /dev/null
+++ b/jdk/test/java/util/Map/EntryHashCode.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/*
+ * @test
+ * @bug 8000955
+ * @summary Map.Entry implementations need to comply with Map.Entry.hashCode() defined behaviour.
+ * @author ngmr
+ */
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+public class EntryHashCode {
+ private static final int TEST_SIZE = 100;
+
+ static final Object[][] entryData = {
+ new Object[TEST_SIZE],
+ new Object[TEST_SIZE]
+ };
+
+ @SuppressWarnings("unchecked")
+ static final Map<Object,Object>[] maps = (Map<Object,Object>[])new Map[] {
+ new HashMap<>(),
+ new Hashtable<>(),
+ new IdentityHashMap<>(),
+ new LinkedHashMap<>(),
+ new TreeMap<>(),
+ new WeakHashMap<>(),
+ new ConcurrentHashMap<>(),
+ new ConcurrentSkipListMap<>()
+ };
+
+ static {
+ for (int i = 0; i < entryData[0].length; i++) {
+ // key objects need to be Comparable for use in TreeMap
+ entryData[0][i] = new Comparable<Object>() {
+ public int compareTo(Object o) {
+ return (hashCode() - o.hashCode());
+ }
+ };
+ entryData[1][i] = new Object();
+ }
+ }
+
+ private static void addTestData(Map<Object,Object> map) {
+ for (int i = 0; i < entryData[0].length; i++) {
+ map.put(entryData[0][i], entryData[1][i]);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ Exception failure = null;
+ for (Map<Object,Object> map: maps) {
+ addTestData(map);
+
+ try {
+ for (Map.Entry<Object,Object> e: map.entrySet()) {
+ Object key = e.getKey();
+ Object value = e.getValue();
+ int expectedEntryHashCode =
+ (Objects.hashCode(key) ^ Objects.hashCode(value));
+
+ if (e.hashCode() != expectedEntryHashCode) {
+ throw new Exception("FAILURE: " +
+ e.getClass().getName() +
+ ".hashCode() does not conform to defined" +
+ " behaviour of java.util.Map.Entry.hashCode()");
+ }
+ }
+ } catch (Exception e) {
+ if (failure == null) {
+ failure = e;
+ } else {
+ failure.addSuppressed(e);
+ }
+ } finally {
+ map.clear();
+ }
+ }
+ if (failure != null) {
+ throw failure;
+ }
+ }
+}
diff --git a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java b/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java
index 29f0eee..7c9f631 100644
--- a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.java
@@ -50,12 +50,13 @@
com.bar.CurrencyNameProviderImpl cnp = new com.bar.CurrencyNameProviderImpl();
Locale[] availloc = Locale.getAvailableLocales();
Locale[] testloc = availloc.clone();
+ List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getCurrencyNameProvider().getAvailableLocales());
List<Locale> providerloc = Arrays.asList(cnp.getAvailableLocales());
for (Locale target: availloc) {
// pure JRE implementation
OpenListResourceBundle rb = (OpenListResourceBundle)LocaleProviderAdapter.forJRE().getLocaleData().getCurrencyNames(target);
- boolean jreHasBundle = rb.getLocale().equals(target);
+ boolean jreSupportsTarget = jreimplloc.contains(target);
for (Locale test: testloc) {
// get a Currency instance
@@ -82,27 +83,24 @@
providersname = cnp.getDisplayName(c.getCurrencyCode(), target);
}
- // JRE's name (if any)
+ // JRE's name
String jrescurrency = null;
String jresname = null;
String key = c.getCurrencyCode();
String nameKey = key.toLowerCase(Locale.ROOT);
- if (jreHasBundle) {
+ if (jreSupportsTarget) {
try {
jrescurrency = rb.getString(key);
- } catch (MissingResourceException mre) {
- // JRE does not have any resource, "jrescurrency" should remain null
- }
+ } catch (MissingResourceException mre) {}
try {
jresname = rb.getString(nameKey);
- } catch (MissingResourceException mre) {
- // JRE does not have any resource, "jresname" should remain null
- }
+ } catch (MissingResourceException mre) {}
}
- checkValidity(target, jrescurrency, providerscurrency, currencyresult, jrescurrency!=null);
+ checkValidity(target, jrescurrency, providerscurrency, currencyresult,
+ jreSupportsTarget && jrescurrency != null);
checkValidity(target, jresname, providersname, nameresult,
- jreHasBundle && rb.handleGetKeys().contains(nameKey));
+ jreSupportsTarget && jresname != null);
}
}
}
diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
index 2054721..44d537b 100644
--- a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
@@ -44,6 +44,7 @@
DateFormatSymbolsProviderTest() {
availableLocalesTest();
objectValidityTest();
+ hashCodeTest();
}
void availableLocalesTest() {
@@ -124,4 +125,17 @@
}
}
}
+
+ // Bug 7200341.
+ void hashCodeTest() {
+ for (Locale target: availloc) {
+ // look for provider's object
+ DateFormatSymbols dfs = DateFormatSymbols.getInstance(target);
+ if (dfs.getClass().getSimpleName().equals("FooDateFormatSymbols")) {
+ // call its hashCode(). success if no ArrayIndexOutOfBoundsException is thrown.
+ dfs.hashCode();
+ break;
+ }
+ }
+ }
}
diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
index 22c97d0..24129cd 100644
--- a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
+++ b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
@@ -23,6 +23,6 @@
#!/bin/sh
#
# @test
-# @bug 4052440
+# @bug 4052440 7200341
# @summary DateFormatSymbolsProvider tests
# @run shell ExecTest.sh foo DateFormatSymbolsProviderTest true
diff --git a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java
index e8cc6c9..c82fab0 100644
--- a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java
@@ -36,15 +36,21 @@
}
LocaleNameProviderTest() {
+ checkAvailLocValidityTest();
+ variantFallbackTest();
+ }
+
+ void checkAvailLocValidityTest() {
com.bar.LocaleNameProviderImpl lnp = new com.bar.LocaleNameProviderImpl();
Locale[] availloc = Locale.getAvailableLocales();
Locale[] testloc = availloc.clone();
+ List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getLocaleNameProvider().getAvailableLocales());
List<Locale> providerloc = Arrays.asList(lnp.getAvailableLocales());
for (Locale target: availloc) {
// pure JRE implementation
OpenListResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getLocaleNames(target);
- boolean jreHasBundle = rb.getLocale().equals(target);
+ boolean jreSupportsTarget = jreimplloc.contains(target);
for (Locale test: testloc) {
// codes
@@ -67,7 +73,7 @@
providersvrnt = lnp.getDisplayVariant(vrnt, target);
}
- // JRE's name (if any)
+ // JRE's name
String jreslang = null;
String jresctry = null;
String jresvrnt = null;
@@ -84,18 +90,41 @@
if (!vrnt.equals("")) {
try {
jresvrnt = rb.getString("%%"+vrnt);
- } catch (MissingResourceException mre) {
- jresvrnt = vrnt;
- }
+ } catch (MissingResourceException mre) {}
}
+ System.out.print("For key: "+lang+" ");
checkValidity(target, jreslang, providerslang, langresult,
- jreHasBundle && rb.handleGetKeys().contains(lang));
+ jreSupportsTarget && jreslang != null);
+ System.out.print("For key: "+ctry+" ");
checkValidity(target, jresctry, providersctry, ctryresult,
- jreHasBundle && rb.handleGetKeys().contains(ctry));
+ jreSupportsTarget && jresctry != null);
+ System.out.print("For key: "+vrnt+" ");
checkValidity(target, jresvrnt, providersvrnt, vrntresult,
- jreHasBundle && rb.handleGetKeys().contains("%%"+vrnt));
+ jreSupportsTarget && jresvrnt != null);
}
}
}
+
+ void variantFallbackTest() {
+ Locale YY = new Locale("yy", "YY", "YYYY");
+ Locale YY_suffix = new Locale("yy", "YY", "YYYY_suffix");
+ String retVrnt = null;
+ String message = "variantFallbackTest() succeeded.";
+
+
+ try {
+ YY.getDisplayVariant(YY_suffix);
+ message = "variantFallbackTest() failed. Either provider wasn't invoked, or invoked without suffix.";
+ } catch (RuntimeException re) {
+ retVrnt = re.getMessage();
+ if (YY_suffix.getVariant().equals(retVrnt)) {
+ System.out.println(message);
+ return;
+}
+ message = "variantFallbackTest() failed. Returned variant: "+retVrnt;
+ }
+
+ throw new RuntimeException(message);
+ }
}
diff --git a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh
index 4e7e85b..9575b81 100644
--- a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh
+++ b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh
@@ -23,6 +23,6 @@
#!/bin/sh
#
# @test
-# @bug 4052440
+# @bug 4052440 8000273
# @summary LocaleNameProvider tests
# @run shell ExecTest.sh bar LocaleNameProviderTest true
diff --git a/jdk/test/java/util/PluggableLocale/ProviderTest.java b/jdk/test/java/util/PluggableLocale/ProviderTest.java
index 57c8b43..41e88aa 100644
--- a/jdk/test/java/util/PluggableLocale/ProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/ProviderTest.java
@@ -42,5 +42,7 @@
"result do not match with provider's result. target: "+target+" result: "+result+" providers: "+providers);
}
}
+
+ System.out.println("checkValidity succeeded. target: "+target+" result: "+result+" jre's: "+jres+" providers: "+providers+" jre-preferred: "+jresPreferred);
}
}
diff --git a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java b/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java
index 4795ce8..cc71e6c 100644
--- a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java
@@ -45,13 +45,14 @@
void test1() {
Locale[] available = Locale.getAvailableLocales();
+ List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getTimeZoneNameProvider().getAvailableLocales());
List<Locale> providerLocales = Arrays.asList(tznp.getAvailableLocales());
String[] ids = TimeZone.getAvailableIDs();
for (Locale target: available) {
// pure JRE implementation
OpenListResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getTimeZoneNames(target);
- boolean jreHasBundle = rb.getLocale().equals(target);
+ boolean jreSupportsTarget = jreimplloc.contains(target);
for (String id: ids) {
// the time zone
@@ -59,7 +60,7 @@
// JRE string array for the id
String[] jrearray = null;
- if (jreHasBundle) {
+ if (jreSupportsTarget) {
try {
jrearray = rb.getStringArray(id);
} catch (MissingResourceException mre) {}
@@ -75,14 +76,14 @@
providersname = tznp.getDisplayName(id, i>=3, i%2, target);
}
- // JRE's name (if any)
+ // JRE's name
String jresname = null;
if (jrearray != null) {
jresname = jrearray[i];
}
checkValidity(target, jresname, providersname, name,
- jreHasBundle && rb.handleGetKeys().contains(id));
+ jreSupportsTarget && jresname != null);
}
}
}
diff --git a/jdk/test/java/util/PluggableLocale/barprovider.jar b/jdk/test/java/util/PluggableLocale/barprovider.jar
index dd8b4d0..b5247a0 100644
--- a/jdk/test/java/util/PluggableLocale/barprovider.jar
+++ b/jdk/test/java/util/PluggableLocale/barprovider.jar
Binary files differ
diff --git a/jdk/test/java/util/PluggableLocale/fooprovider.jar b/jdk/test/java/util/PluggableLocale/fooprovider.jar
index c1b5723..125dbe1 100644
--- a/jdk/test/java/util/PluggableLocale/fooprovider.jar
+++ b/jdk/test/java/util/PluggableLocale/fooprovider.jar
Binary files differ
diff --git a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java b/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
index 34a201a..5c96fb2 100644
--- a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
+++ b/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
@@ -221,5 +221,10 @@
public void setAmPmStrings(String[] newAmpms) {
ampms = newAmpms;
}
+
+ @Override
+ public String[][] getZoneStrings() {
+ return new String[0][0];
+ }
}
}
diff --git a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java b/jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java
index fc3beb8..2f06ea6 100644
--- a/jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java
+++ b/jdk/test/java/util/PluggableLocale/providersrc/LocaleNameProviderImpl.java
@@ -37,57 +37,64 @@
Locale.JAPAN,
new Locale("ja", "JP", "osaka"),
new Locale("ja", "JP", "kyoto"),
- new Locale("xx")};
+ new Locale("xx"),
+ new Locale("yy", "YY", "YYYY")};
static List<Locale> availList = Arrays.asList(avail);
public Locale[] getAvailableLocales() {
return avail;
}
+ @Override
public String getDisplayLanguage(String lang, Locale target) {
+ return getDisplayString(lang, target);
+ }
+
+ @Override
+ public String getDisplayCountry(String ctry, Locale target) {
+ return getDisplayString(ctry, target);
+ }
+
+ @Override
+ public String getDisplayVariant(String vrnt, Locale target) {
+ return getDisplayString(vrnt, target);
+ }
+
+ private String getDisplayString(String key, Locale target) {
if (!Utils.supportsLocale(availList, target)) {
throw new IllegalArgumentException("locale is not supported: "+target);
}
String ret = null;
+ if (target.getLanguage().equals("yy") &&
+ target.getCountry().equals("YY")) {
+ String vrnt = target.getVariant();
+ if (vrnt.startsWith("YYYY")) {
+ switch (key) {
+ case "yy":
+ case "YY":
+ ret = "waiwai";
+ break;
+
+ case "YYYY":
+ if (vrnt.equals("YYYY_suffix")) {
+ // for LocaleNameProviderTest.variantFallbackTest()
+ throw new RuntimeException(vrnt);
+ } else {
+ ret = "waiwai";
+ }
+ break;
+ }
+ }
+ } else {
+ // resource bundle based (allows fallback)
try {
ResourceBundle rb = ResourceBundle.getBundle("com.bar.LocaleNames", target);
- ret = rb.getString(lang);
+ ret = rb.getString(key);
} catch (MissingResourceException mre) {
}
+ }
return ret;
}
-
- public String getDisplayCountry(String ctry, Locale target) {
- if (!Utils.supportsLocale(availList, target)) {
- throw new IllegalArgumentException("locale is not supported: "+target);
}
-
- String ret = null;
-
- try {
- ResourceBundle rb = ResourceBundle.getBundle("LocaleNames", target);
- ret = rb.getString(ctry);
- } catch (MissingResourceException mre) {
- }
-
- return ret;
- }
-
- public String getDisplayVariant(String vrnt, Locale target) {
- if (!Utils.supportsLocale(availList, target)) {
- throw new IllegalArgumentException("locale is not supported: "+target);
- }
-
- String ret = null;
-
- try {
- ResourceBundle rb = ResourceBundle.getBundle("LocaleNames", target);
- ret = rb.getString(vrnt);
- } catch (MissingResourceException mre) {
- }
-
- return ret;
- }
-}
diff --git a/jdk/test/java/util/Properties/LoadAndStoreXML.java b/jdk/test/java/util/Properties/LoadAndStoreXML.java
index 8fc5e73..fd1d81f 100644
--- a/jdk/test/java/util/Properties/LoadAndStoreXML.java
+++ b/jdk/test/java/util/Properties/LoadAndStoreXML.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8000354
+ * @bug 8000354 8000685
* @summary Basic test of storeToXML and loadToXML
*/
@@ -66,13 +66,13 @@
* Sanity test that properties saved with Properties#storeToXML can be
* read with Properties#loadFromXML.
*/
- static void test() throws IOException {
+ static void testLoadAndStore(String encoding) throws IOException {
Properties props = new Properties();
props.put("k1", "foo");
props.put("k2", "bar");
ByteArrayOutputStream out = new ByteArrayOutputStream();
- props.storeToXML(out, "no comment");
+ props.storeToXML(out, null, encoding);
Properties p = new Properties();
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
@@ -85,19 +85,74 @@
}
}
+ /**
+ * Test loadFromXML with a document that does not have an encoding declaration
+ */
+ static void testLoadWithoutEncoding() throws IOException {
+ Properties expected = new Properties();
+ expected.put("foo", "bar");
+
+ String s = "<?xml version=\"1.0\"?>" +
+ "<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">" +
+ "<properties>" +
+ "<entry key=\"foo\">bar</entry>" +
+ "</properties>";
+ ByteArrayInputStream in = new ByteArrayInputStream(s.getBytes("UTF-8"));
+ Properties props = new Properties();
+ props.loadFromXML(in);
+
+ if (!props.equals(expected)) {
+ System.err.println("loaded: " + props + ", expected: " + expected);
+ throw new RuntimeException("Test failed");
+ }
+ }
+
+ /**
+ * Test loadFromXML with unsupported encoding
+ */
+ static void testLoadWithBadEncoding() throws IOException {
+ String s = "<?xml version=\"1.0\" encoding=\"BAD\"?>" +
+ "<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">" +
+ "<properties>" +
+ "<entry key=\"foo\">bar</entry>" +
+ "</properties>";
+ ByteArrayInputStream in = new ByteArrayInputStream(s.getBytes("UTF-8"));
+ Properties props = new Properties();
+ try {
+ props.loadFromXML(in);
+ throw new RuntimeException("UnsupportedEncodingException expected");
+ } catch (UnsupportedEncodingException expected) { }
+ }
+
+ /**
+ * Test storeToXML with unsupported encoding
+ */
+ static void testStoreWithBadEncoding() throws IOException {
+ Properties props = new Properties();
+ props.put("foo", "bar");
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ try {
+ props.storeToXML(out, null, "BAD");
+ throw new RuntimeException("UnsupportedEncodingException expected");
+ } catch (UnsupportedEncodingException expected) { }
+ }
+
public static void main(String[] args) throws IOException {
- // run test without security manager
- test();
+ testLoadAndStore("UTF-8");
+ testLoadAndStore("UTF-16");
+ testLoadWithoutEncoding();
+ testLoadWithBadEncoding();
+ testStoreWithBadEncoding();
- // re-run test with security manager
+ // re-run sanity test with security manager
Policy orig = Policy.getPolicy();
Policy p = new SimplePolicy(new RuntimePermission("setSecurityManager"),
new PropertyPermission("line.separator", "read"));
Policy.setPolicy(p);
System.setSecurityManager(new SecurityManager());
try {
- test();
+ testLoadAndStore("UTF-8");
} finally {
// turn off security manager and restore policy
System.setSecurityManager(null);
diff --git a/jdk/test/java/util/ServiceLoader/Basic.java b/jdk/test/java/util/ServiceLoader/Basic.java
index 9912d68..9677db7 100644
--- a/jdk/test/java/util/ServiceLoader/Basic.java
+++ b/jdk/test/java/util/ServiceLoader/Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -44,10 +44,41 @@
eq, s1, s2));
}
- public static void main(String[] args) {
+ static abstract class TestLoader {
+ String name;
- ServiceLoader<FooService> sl = ServiceLoader.load(FooService.class);
- out.format("%s%n", sl);
+ TestLoader(String name) { this.name = name; }
+
+ abstract ServiceLoader<FooService> load();
+ }
+
+ static TestLoader tcclLoader = new TestLoader("Thread context class loader") {
+ ServiceLoader<FooService> load() {
+ return ServiceLoader.load(FooService.class);
+ }
+ };
+
+ static TestLoader systemClLoader = new TestLoader("System class loader") {
+ ServiceLoader<FooService> load() {
+ return ServiceLoader.load(FooService.class, ClassLoader.getSystemClassLoader());
+ }
+ };
+
+ static TestLoader nullClLoader = new TestLoader("null (defer to system class loader)") {
+ ServiceLoader<FooService> load() {
+ return ServiceLoader.load(FooService.class, null);
+ }
+ };
+
+ public static void main(String[] args) {
+ for (TestLoader tl : Arrays.asList(tcclLoader, systemClLoader, nullClLoader)) {
+ test(tl);
+ }
+ }
+
+ static void test(TestLoader tl) {
+ ServiceLoader<FooService> sl = tl.load();
+ out.format("%s: %s%n", tl.name, sl);
// Providers are cached
Set<FooService> ps = setOf(sl);
@@ -58,5 +89,4 @@
checkEquals(ps, setOf(sl), false);
}
-
}
diff --git a/jdk/test/java/util/ServiceLoader/basic.sh b/jdk/test/java/util/ServiceLoader/basic.sh
index dc93051..af8f6e8 100644
--- a/jdk/test/java/util/ServiceLoader/basic.sh
+++ b/jdk/test/java/util/ServiceLoader/basic.sh
@@ -22,7 +22,7 @@
#
# @test
-# @bug 4640520 6354623
+# @bug 4640520 6354623 7198496
# @summary Unit test for java.util.ServiceLoader
#
# @build Basic Load FooService FooProvider1 FooProvider2 FooProvider3
diff --git a/jdk/test/java/util/logging/LoggingMXBeanTest.java b/jdk/test/java/util/logging/LoggingMXBeanTest.java
index e6c694d..a01e57c 100644
--- a/jdk/test/java/util/logging/LoggingMXBeanTest.java
+++ b/jdk/test/java/util/logging/LoggingMXBeanTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -43,6 +43,8 @@
ObjectName objectName = null;
static String LOGGER_NAME_1 = "com.sun.management.Logger1";
static String LOGGER_NAME_2 = "com.sun.management.Logger2";
+ static Logger logger1;
+ static Logger logger2;
public LoggingMXBeanTest() throws Exception {
@@ -131,8 +133,8 @@
System.out.println( "*********** Phase 3 ***********" );
System.out.println( "*******************************" );
System.out.println( " Create and test new Loggers" );
- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
// check that Level object are returned properly
try {
diff --git a/jdk/test/java/util/logging/LoggingMXBeanTest2.java b/jdk/test/java/util/logging/LoggingMXBeanTest2.java
index 37b6ace..005ed72 100644
--- a/jdk/test/java/util/logging/LoggingMXBeanTest2.java
+++ b/jdk/test/java/util/logging/LoggingMXBeanTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -42,12 +42,14 @@
static String LOGGER_NAME_1 = "com.sun.management.Logger";
static String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
static String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
+ static Logger logger1;
+ static Logger logger2;
public LoggingMXBeanTest2() throws Exception {
- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
logger1.setLevel(Level.FINE);
- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
logger2.setLevel(null);
/*
diff --git a/jdk/test/java/util/prefs/CheckUserPrefFirst.java b/jdk/test/java/util/prefs/CheckUserPrefFirst.java
new file mode 100644
index 0000000..d0ee277
--- /dev/null
+++ b/jdk/test/java/util/prefs/CheckUserPrefFirst.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import java.util.prefs.Preferences;
+
+/**
+ *
+ * @author khazra
+ * First class called by CheckUserPrefsStorage.sh to create and
+ * store a user preference
+ */
+
+public class CheckUserPrefFirst {
+
+ public static void main(String[] args) throws Exception {
+ Preferences prefs = Preferences.userNodeForPackage(CheckUserPrefFirst.class);
+ prefs.put("Check", "Success");
+ prefs.flush();
+ }
+}
+
diff --git a/jdk/test/java/util/prefs/CheckUserPrefLater.java b/jdk/test/java/util/prefs/CheckUserPrefLater.java
new file mode 100644
index 0000000..555a9ad
--- /dev/null
+++ b/jdk/test/java/util/prefs/CheckUserPrefLater.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import java.util.prefs.Preferences;
+
+/**
+ * CheckUserPrefsStorage.sh uses this to check that preferences stored
+ * by CheckUserPrefFirst.java can be retrieved
+ * @author khazra
+ */
+
+public class CheckUserPrefLater {
+
+ public static void main(String[] args) throws Exception {
+ Preferences prefs = Preferences.userNodeForPackage(CheckUserPrefFirst.class);
+ String result = prefs.get("Check", null);
+ if ((result == null) || !(result.equals("Success")))
+ throw new RuntimeException("User pref not stored!");
+ prefs.remove("Check");
+ prefs.flush();
+ }
+
+}
+
diff --git a/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh b/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh
new file mode 100644
index 0000000..71ded59
--- /dev/null
+++ b/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 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.
+#
+# 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 7198073
+# @build CheckUserPrefFirst CheckUserPrefLater
+# @run shell CheckUserPrefsStorage.sh
+# @summary Tests that user preferences are stored in the
+# permanent storage
+#
+
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+ CYGWIN* )
+ PS=";"
+ FS="/"
+ ;;
+ Windows* )
+ PS=";"
+ FS="\\"
+ ;;
+ * )
+ echo "Unrecognized system!"
+ exit 1;
+ ;;
+esac
+
+# run CheckUserPrefFirst - creates and stores a user pref
+${TESTJAVA}${FS}bin${FS}java -cp ${TESTCLASSES} CheckUserPrefFirst
+result=$?
+if [ "$result" -ne "0" ]; then
+ exit 1
+fi
+
+# run CheckUserPrefLater - Looks for the stored pref
+${TESTJAVA}${FS}bin${FS}java -cp ${TESTCLASSES} CheckUserPrefLater
+result=$?
+if [ "$result" -ne "0" ]; then
+ exit 1
+fi
+
+# no failures, exit.
+exit 0
+
diff --git a/jdk/test/javax/management/timer/MissingNotificationTest.java b/jdk/test/javax/management/timer/MissingNotificationTest.java
new file mode 100644
index 0000000..39da6cb
--- /dev/null
+++ b/jdk/test/javax/management/timer/MissingNotificationTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2008, 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.
+ *
+ * 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 6809322
+ * @summary Test for missing notifications in a high concurrency environment
+ * @author Jaroslav Bachorik
+ * @run clean MissingNotificationTest
+ * @run build MissingNotificationTest
+ * @run main MissingNotificationTest
+ */
+
+import java.util.Date;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import javax.management.timer.Timer;
+import javax.management.Notification;
+import javax.management.NotificationListener;
+
+public class MissingNotificationTest {
+ private static int TASK_COUNT = 10000;
+ private static long fixedDelay = 0;// anything bigger than 100 and no alarms remain unfired
+
+ private static class NotifListener implements NotificationListener {
+
+ int count;
+
+ public synchronized void handleNotification(Notification notification, Object handback) {
+ count++;
+ }
+
+ synchronized int getCount() {
+ return count;
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println(
+ ">>> Test for missing notifications.");
+
+ System.out.println(">>> Create a Timer object.");
+ final Timer timer = new Timer();
+
+ timer.start();
+
+ NotifListener listener = new NotifListener();
+ timer.addNotificationListener(listener, null, null);
+
+ ExecutorService executor = Executors.newFixedThreadPool(100);
+ final Random rand = new Random();
+
+
+ for (int i = 0; i < TASK_COUNT; i++) {
+ executor.execute(new Runnable() {
+ public void run() {
+ long dateMillis = System.currentTimeMillis() + fixedDelay + rand.nextInt(2000);
+ Date date = new Date(dateMillis);
+ timer.addNotification("type", "msg", "userData", date);
+ }
+ });
+
+ }
+
+ executor.shutdown();
+ executor.awaitTermination(20, TimeUnit.SECONDS);
+
+ waitForNotificationsToEnd(listener);
+
+ timer.stop();
+
+ if (listener.count < TASK_COUNT) {
+ throw new RuntimeException("Not fired: " + (TASK_COUNT - listener.count));
+ } else {
+ System.out.println(">>> All notifications handled OK");
+ }
+
+ System.out.println(">>> Bye bye!");
+ }
+
+ /**
+ * Will return when all notifications are handled or after 10sec. of no new
+ * notifications
+ *
+ * @param listener
+ * @throws InterruptedException
+ */
+ private static void waitForNotificationsToEnd(NotifListener listener)
+ throws InterruptedException {
+ int oldCout = listener.getCount();
+ int noChangeCounter = 1;
+ while (listener.getCount() < TASK_COUNT) {
+ Thread.sleep(1000);
+ System.out.print('.');
+ if (oldCout == listener.getCount())//no change
+ {
+ if (++noChangeCounter > 10) {
+ break;
+ }
+ } else {
+ noChangeCounter = 1;
+ }
+
+ oldCout = listener.getCount();
+ }
+ System.out.println();
+ }
+}
diff --git a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java
new file mode 100644
index 0000000..cac3386
--- /dev/null
+++ b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 4654927
+ * @summary Clicking on Greyed Menuitems closes the Menubar Dropdown
+ * @author Alexander Potochkin
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main bug4654927
+ */
+
+import javax.swing.*;
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.util.concurrent.Callable;
+import sun.awt.SunToolkit;
+
+public class bug4654927 {
+
+ private static volatile JMenu menu;
+ private static volatile JMenuItem menuItem;
+
+ public static void main(String[] args) throws Exception {
+ String systemLAF = UIManager.getSystemLookAndFeelClassName();
+ // the test is not applicable to Motif L&F
+ if(systemLAF.endsWith("MotifLookAndFeel")){
+ return;
+ }
+
+ UIManager.setLookAndFeel(systemLAF);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+
+ public void run() {
+ createAndShowUI();
+ }
+ });
+ toolkit.realSync();
+
+ // test mouse press
+ Point point = Util.getCenterPoint(menu);
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ point = Util.getCenterPoint(menuItem);
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ if (!isMenuItemShowing()) {
+ throw new RuntimeException("Popup is unexpectedly closed");
+ }
+
+ // test mouse drag
+ point = Util.getCenterPoint(menu);
+ robot.mouseMove(point.x, point.y);
+ Point menuLocation = Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ return menu.getLocationOnScreen();
+ }
+ });
+
+ Point itemLocation = Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ return menuItem.getLocationOnScreen();
+ }
+ });
+
+ int x0 = menuLocation.x + 10;
+ int y0 = menuLocation.y + 10;
+ int x1 = itemLocation.x + 10;
+ int y1 = itemLocation.y + 10;
+
+ // close menu
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ Util.glide(robot, x0, y0, x1, y1);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ if (!isMenuItemShowing()) {
+ throw new RuntimeException("Popup is unexpectedly closed");
+ }
+ }
+
+ private static boolean isMenuItemShowing() throws Exception {
+ return Util.invokeOnEDT(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ return menuItem.isShowing();
+ }
+ });
+ }
+
+ private static void createAndShowUI() {
+ JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ menu = new JMenu("Menu");
+ menu.add(new JMenuItem("menuItem"));
+ menuItem = new JMenuItem("menuItem");
+ menuItem.setEnabled(false);
+ menu.add(menuItem);
+ menu.add(new JMenuItem("menuItem"));
+
+ JMenuBar bar = new JMenuBar();
+ bar.add(menu);
+ frame.setJMenuBar(bar);
+
+ frame.setSize(200, 200);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+
+ }
+}
diff --git a/jdk/test/javax/swing/regtesthelpers/Util.java b/jdk/test/javax/swing/regtesthelpers/Util.java
index 68bc0f8..a9df493 100644
--- a/jdk/test/javax/swing/regtesthelpers/Util.java
+++ b/jdk/test/javax/swing/regtesthelpers/Util.java
@@ -157,6 +157,36 @@
}
/**
+ * Moves mouse smoothly from (x0, y0) to (x1, y1).
+ */
+ public static void glide(Robot robot, int x0, int y0, int x1, int y1) throws AWTException {
+ float dmax = (float) Math.max(Math.abs(x1 - x0), Math.abs(y1 - y0));
+ float dx = (x1 - x0) / dmax;
+ float dy = (y1 - y0) / dmax;
+
+ for (int i = 0; i <= dmax; i += 10) {
+ robot.mouseMove((int) (x0 + dx * i), (int) (y0 + dy * i));
+ }
+ }
+
+ /**
+ * Gets component center point
+ *
+ * @return center point of the <code>component</code>
+ */
+ public static Point getCenterPoint(final Component component) throws Exception {
+ return Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ Point p = component.getLocationOnScreen();
+ Dimension size = component.getSize();
+ return new Point(p.x + size.width / 2, p.y + size.height / 2);
+ }
+ });
+ }
+
+ /**
* Invokes the <code>task</code> on the EDT thread.
*
* @return result of the <code>task</code>
diff --git a/jdk/test/jdk/asm/AsmSanity.java b/jdk/test/jdk/asm/AsmSanity.java
new file mode 100644
index 0000000..0ae1cad
--- /dev/null
+++ b/jdk/test/jdk/asm/AsmSanity.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7197401
+ * @summary Add a subset of the org.objectweb.asm packages to jdk8
+ * This test doesn't test asm functionality, it just tests the presence of
+ * asm in the jdk.
+ * These compile/run commands do the following:
+ * - Verify that asm is not in ct.sym so user code that refs it won't compile.
+ * - Verify that asm really is in rt.jar and can be accessed when ct.sym is not used.
+ * - Verify that if user code is compiled without ct.sym, it can't access asm classes
+ * at runtime when a security manager is in use.
+ *
+ * @compile/fail AsmSanity.java
+ *
+ * @compile -XDignore.symbol.file=true AsmSanity.java
+ * @run main/othervm AsmSanity
+ *
+ * @run main/othervm/fail AsmSanity secure
+ *
+ */
+
+
+// Verify that the expected asm pkgs are present
+import jdk.internal.org.objectweb.asm.*;
+import jdk.internal.org.objectweb.asm.commons.*;
+import jdk.internal.org.objectweb.asm.signature.*;
+import jdk.internal.org.objectweb.asm.tree.*;
+import jdk.internal.org.objectweb.asm.tree.analysis.*;
+import jdk.internal.org.objectweb.asm.util.*;
+
+// Verify that we can actually run some of the asm code.
+public class AsmSanity {
+
+ static public void main(String[] args) {
+ if (args.length == 0) {
+ System.out.println("-- Running without SecurityManager");
+ new Label();
+ System.out.println("-- Passed");
+ return;
+ }
+
+ if (args[0].equals("secure")) {
+ System.out.println("-- Running with SecurityManager");
+ java.lang.SecurityManager sm = new SecurityManager();
+ System.setSecurityManager(sm);
+ // This should cause an accessClassInPackage exception
+ new Label();
+ return;
+ }
+ throw new Error("-- Failed: Unknown argument to main: " + args[0]);
+ }
+}
diff --git a/jdk/test/sun/security/krb5/ccache/EmptyCC.java b/jdk/test/sun/security/krb5/ccache/EmptyCC.java
index d5bfc00..a0cd759 100644
--- a/jdk/test/sun/security/krb5/ccache/EmptyCC.java
+++ b/jdk/test/sun/security/krb5/ccache/EmptyCC.java
@@ -24,9 +24,11 @@
/*
* @test
* @bug 7158329
+ * @bug 8001208
* @summary NPE in sun.security.krb5.Credentials.acquireDefaultCreds()
* @compile -XDignore.symbol.file EmptyCC.java
- * @run main EmptyCC
+ * @run main EmptyCC tmpcc
+ * @run main EmptyCC FILE:tmpcc
*/
import java.io.File;
import java.io.InputStream;
@@ -40,9 +42,9 @@
public class EmptyCC {
public static void main(String[] args) throws Exception {
final PrincipalName pn = new PrincipalName("dummy@FOO.COM");
- final String ccache = "tmpcc";
+ final String ccache = args[0];
- if (args.length == 0) {
+ if (args.length == 1) {
// Main process, write the ccache and launch sub process
CredentialsCache cache = CredentialsCache.create(pn, ccache);
cache.save();
@@ -54,6 +56,7 @@
"-cp",
System.getProperty("test.classes"),
"EmptyCC",
+ ccache,
"readcc"
);
@@ -77,6 +80,14 @@
if (!cc.equals(ccache)) {
throw new Exception("env not set correctly");
}
+ // 8001208: Fix for KRB5CCNAME not complete
+ // Make sure the ccache is created with bare file name
+ if (CredentialsCache.getInstance() == null) {
+ throw new Exception("Cache not instantiated");
+ }
+ if (!new File("tmpcc").exists()) {
+ throw new Exception("File not found");
+ }
Credentials.acquireTGTFromCache(pn, null);
}
}
diff --git a/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java b/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java
index 0d06d73..962b1bc 100644
--- a/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java
+++ b/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java
@@ -25,6 +25,8 @@
* @test
* @bug 6958026
* @summary Problem with PKCS12 keystore
+ * @compile -XDignore.symbol.file PKCS12SameKeyId.java
+ * @run main PKCS12SameKeyId
*/
import java.io.File;
@@ -40,7 +42,6 @@
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import sun.security.pkcs.EncryptedPrivateKeyInfo;
-import sun.security.tools.KeyTool;
import sun.security.util.ObjectIdentifier;
import sun.security.x509.AlgorithmId;
import sun.security.x509.X500Name;
@@ -61,7 +62,7 @@
String cmd = "-keystore " + JKSFILE
+ " -storepass changeit -keypass changeit "
+ "-genkeypair -alias p" + i + " -dname CN=" + i;
- KeyTool.main(cmd.split(" "));
+ sun.security.tools.keytool.Main.main(cmd.split(" "));
}
// Prepare EncryptedPrivateKeyInfo parameters, copied from various
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
index 498df71..c95ebfd 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -21,13 +21,18 @@
* questions.
*/
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
/*
* @test
*
* @bug 6388456
* @summary Need adjustable TLS max record size for interoperability
* with non-compliant
- * @run main/othervm -Djsse.enableCBCProtection=false LargePacket
+ * @run main/othervm LargePacket
*
* @author Xuelei Fan
*/
@@ -83,12 +88,12 @@
SocketChannel sc = ssc.accept();
// Complete connection.
- while (!sc.finishConnect() ) {
+ while (!sc.finishConnect()) {
// waiting for the connection completed.
}
// handshaking
- handshaking(ssle, sc);
+ handshaking(ssle, sc, null);
// receive application data
receive(ssle, sc);
@@ -131,7 +136,7 @@
}
// handshaking
- handshaking(ssle, sc);
+ handshaking(ssle, sc, null);
// send out application data
deliver(ssle, sc);
@@ -169,6 +174,8 @@
* Fork off the other side, then do your work.
*/
LargePacket() throws Exception {
+ super("../../../../../etc");
+
if (separateServerThread) {
startServer(true);
startClient(false);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java
index b00780e..bc4c6f7 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -22,8 +22,6 @@
*/
/*
- *
- *
* @bug 6388456
* @summary Need adjustable TLS max record size for interoperability
* with non-compliant stacks
@@ -42,17 +40,31 @@
public class SSLEngineService {
- private static String pathToStores = "../../../../../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static char[] passphrase = "passphrase".toCharArray();
- private static String keyFilename =
+ private String pathToStores;
+ private String keyFilename;
+ private String trustFilename;
+
+ protected SSLEngineService() {
+ init("../../../../../etc");
+ }
+
+ protected SSLEngineService(String pathToStores) {
+ init(pathToStores);
+ }
+
+ private void init(String pathToStores) {
+ this.pathToStores = pathToStores;
+ this.keyFilename =
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + keyStoreFile;
- private static String trustFilename =
+ this.trustFilename =
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;
+ }
// deliver local application data.
protected static void deliver(SSLEngine ssle, SocketChannel sc)
@@ -143,9 +155,12 @@
ByteBuffer peerNetData = ByteBuffer.allocate(netBufferMax/2);
int received = -1;
+ boolean needToReadMore = true;
while (received != 0) {
- if (ssle.isInboundDone() || sc.read(peerNetData) < 0) {
- break;
+ if (needToReadMore) {
+ if (ssle.isInboundDone() || sc.read(peerNetData) < 0) {
+ break;
+ }
}
peerNetData.flip();
@@ -186,6 +201,8 @@
" bytes large packet ");
}
+ needToReadMore = (peerNetData.position() > 0) ? false : true;
+
break;
case BUFFER_OVERFLOW :
@@ -206,6 +223,8 @@
" bytes for BUFFER_UNDERFLOW");
peerNetData = enlargeBuffer(peerNetData, size);
}
+
+ needToReadMore = true;
break;
default : // CLOSED :
@@ -215,8 +234,8 @@
}
}
- protected static void handshaking(SSLEngine ssle, SocketChannel sc)
- throws Exception {
+ protected static void handshaking(SSLEngine ssle, SocketChannel sc,
+ ByteBuffer additional) throws Exception {
int appBufferMax = ssle.getSession().getApplicationBufferSize();
int netBufferMax = ssle.getSession().getPacketBufferSize();
@@ -232,15 +251,39 @@
SSLEngineResult.HandshakeStatus hs = ssle.getHandshakeStatus();
// start handshaking from unwrap
+ byte[] buffer = new byte[0xFF];
+ boolean underflow = false;
do {
switch (hs) {
case NEED_UNWRAP :
if (peerNetData.position() == 0) {
+ if (additional != null && additional.hasRemaining()) {
+ do {
+ int len = Math.min(buffer.length,
+ peerNetData.remaining());
+ len = Math.min(len, additional.remaining());
+ if (len != 0) {
+ additional.get(buffer, 0, len);
+ peerNetData.put(buffer, 0, len);
+ }
+ } while (peerNetData.remaining() > 0 &&
+ additional.hasRemaining());
+ } else {
+ if (sc.read(peerNetData) < 0) {
+ ssle.closeInbound();
+ return;
+ }
+ }
+ }
+
+ if (underflow) {
if (sc.read(peerNetData) < 0) {
ssle.closeInbound();
return;
}
+
+ underflow = false;
}
peerNetData.flip();
@@ -259,6 +302,8 @@
size + " bytes for BUFFER_UNDERFLOW");
peerNetData = enlargeBuffer(peerNetData, size);
}
+
+ underflow = true;
break;
case BUFFER_OVERFLOW :
// maybe need to enlarge the peer application data buffer.
@@ -339,7 +384,7 @@
/*
* Create an initialized SSLContext to use for this test.
*/
- protected static SSLEngine createSSLEngine(boolean mode) throws Exception {
+ protected SSLEngine createSSLEngine(boolean mode) throws Exception {
SSLEngine ssle;
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java
new file mode 100644
index 0000000..2cd4635
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @build SSLEngineService SSLCapabilities SSLExplorer
+ * @run main/othervm SSLEngineExplorer SSLv2Hello,SSLv3
+ * @run main/othervm SSLEngineExplorer SSLv3
+ * @run main/othervm SSLEngineExplorer TLSv1
+ * @run main/othervm SSLEngineExplorer TLSv1.1
+ * @run main/othervm SSLEngineExplorer TLSv1.2
+ */
+
+import javax.net.ssl.*;
+import java.nio.*;
+import java.net.*;
+import java.util.*;
+import java.nio.channels.*;
+
+public class SSLEngineExplorer extends SSLEngineService {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ // Is the server ready to serve?
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(false);
+
+ // Create a server socket channel.
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ ServerSocketChannel ssc = ServerSocketChannel.open();
+ ssc.socket().bind(isa);
+ serverPort = ssc.socket().getLocalPort();
+
+ // Signal Client, we're ready for his connect.
+ serverReady = true;
+
+ // Accept a socket channel.
+ SocketChannel sc = ssc.accept();
+ sc.configureBlocking(false);
+
+ // Complete connection.
+ while (!sc.finishConnect()) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ ByteBuffer buffer = ByteBuffer.allocate(0xFF);
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ buffer.limit(SSLExplorer.RECORD_HEADER_SIZE);
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer);
+ if (buffer.capacity() < recordLength) {
+ ByteBuffer oldBuffer = buffer;
+ buffer = ByteBuffer.allocate(recordLength);
+ buffer.put(oldBuffer);
+ }
+
+ buffer.position(SSLExplorer.RECORD_HEADER_SIZE);
+ buffer.limit(buffer.capacity());
+ while (position < recordLength) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ capabilities = SSLExplorer.explore(buffer);
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // handshaking
+ handshaking(ssle, sc, buffer);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkCapabilities(capabilities, session);
+
+ // close the socket channel.
+ sc.close();
+ ssc.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(true);
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ // Create a non-blocking socket channel.
+ SocketChannel sc = SocketChannel.open();
+ sc.configureBlocking(false);
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ sc.connect(isa);
+
+ // Complete connection.
+ while (!sc.finishConnect() ) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ // enable the specified TLS protocol
+ ssle.setEnabledProtocols(supportedProtocols);
+
+ // handshaking
+ handshaking(ssle, sc, null);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // close the socket channel.
+ sc.close();
+ }
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+ }
+
+ private static String[] supportedProtocols; // supported protocols
+
+ private static void parseArguments(String[] args) {
+ supportedProtocols = args[0].split(",");
+ }
+
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ public static void main(String args[]) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ new SSLEngineExplorer();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLEngineExplorer() throws Exception {
+ super("../../../../etc");
+
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ *
+ * If the main thread excepted, that propagates back
+ * immediately. If the other thread threw an exception, we
+ * should report back.
+ */
+ if (serverException != null) {
+ System.out.print("Server Exception:");
+ throw serverException;
+ }
+ if (clientException != null) {
+ System.out.print("Client Exception:");
+ throw clientException;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ System.err.println(e);
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ doServerSide();
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ doClientSide();
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
new file mode 100644
index 0000000..c201bee
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @build SSLEngineService SSLCapabilities SSLExplorer
+ * @run main/othervm SSLEngineExplorerMatchedSNI www.example.com
+ * www\.example\.com
+ * @run main/othervm SSLEngineExplorerMatchedSNI www.example.com
+ * www\.example\.(com|org)
+ * @run main/othervm SSLEngineExplorerMatchedSNI example.com
+ * (.*\.)*example\.(com|org)
+ * @run main/othervm SSLEngineExplorerMatchedSNI www.example.com
+ * (.*\.)*example\.(com|org)
+ * @run main/othervm SSLEngineExplorerMatchedSNI www.us.example.com
+ * (.*\.)*example\.(com|org)
+ */
+
+import javax.net.ssl.*;
+import java.nio.*;
+import java.net.*;
+import java.util.*;
+import java.nio.channels.*;
+
+public class SSLEngineExplorerMatchedSNI extends SSLEngineService {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ // Is the server ready to serve?
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(false);
+
+ // Create a server socket channel.
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ ServerSocketChannel ssc = ServerSocketChannel.open();
+ ssc.socket().bind(isa);
+ serverPort = ssc.socket().getLocalPort();
+
+ // Signal Client, we're ready for his connect.
+ serverReady = true;
+
+ // Accept a socket channel.
+ SocketChannel sc = ssc.accept();
+
+ // Complete connection.
+ while (!sc.finishConnect()) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ ByteBuffer buffer = ByteBuffer.allocate(0xFF);
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ buffer.limit(SSLExplorer.RECORD_HEADER_SIZE);
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer);
+ if (buffer.capacity() < recordLength) {
+ ByteBuffer oldBuffer = buffer;
+ buffer = ByteBuffer.allocate(recordLength);
+ buffer.put(oldBuffer);
+ }
+
+ buffer.position(SSLExplorer.RECORD_HEADER_SIZE);
+ buffer.limit(buffer.capacity());
+ while (position < recordLength) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ capabilities = SSLExplorer.explore(buffer);
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // enable server name indication checking
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ ssle.setSSLParameters(params);
+
+ // handshaking
+ handshaking(ssle, sc, buffer);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkCapabilities(capabilities, session);
+
+ // close the socket channel.
+ sc.close();
+ ssc.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(true);
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ // Create a non-blocking socket channel.
+ SocketChannel sc = SocketChannel.open();
+ sc.configureBlocking(false);
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ sc.connect(isa);
+
+ // Complete connection.
+ while (!sc.finishConnect() ) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setServerNames(serverNames);
+ ssle.setSSLParameters(params);
+
+ // handshaking
+ handshaking(ssle, sc, null);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkSNIInSession(session);
+
+ // close the socket channel.
+ sc.close();
+ }
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+ private static String clientRequestedHostname;
+ private static String serverAcceptableHostname;
+
+ private static void parseArguments(String[] args) {
+ clientRequestedHostname = args[0];
+ serverAcceptableHostname = args[1];
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ public static void main(String args[]) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ new SSLEngineExplorerMatchedSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLEngineExplorerMatchedSNI() throws Exception {
+ super("../../../../etc");
+
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ *
+ * If the main thread excepted, that propagates back
+ * immediately. If the other thread threw an exception, we
+ * should report back.
+ */
+ if (serverException != null) {
+ System.out.print("Server Exception:");
+ throw serverException;
+ }
+ if (clientException != null) {
+ System.out.print("Client Exception:");
+ throw clientException;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ System.err.println(e);
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ doServerSide();
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ doClientSide();
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
new file mode 100644
index 0000000..2a9647b
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @build SSLEngineService SSLCapabilities SSLExplorer
+ * @run main/othervm SSLEngineExplorerUnmatchedSNI www.example.com
+ * www\.example\.org
+ */
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.nio.*;
+import java.net.*;
+import java.util.*;
+import java.nio.channels.*;
+
+public class SSLEngineExplorerUnmatchedSNI extends SSLEngineService {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ // Is the server ready to serve?
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(false);
+
+ // Create a server socket channel.
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ ServerSocketChannel ssc = ServerSocketChannel.open();
+ ssc.socket().bind(isa);
+ serverPort = ssc.socket().getLocalPort();
+
+ // Signal Client, we're ready for his connect.
+ serverReady = true;
+
+ // Accept a socket channel.
+ SocketChannel sc = ssc.accept();
+
+ // Complete connection.
+ while (!sc.finishConnect()) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ ByteBuffer buffer = ByteBuffer.allocate(0xFF);
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ buffer.limit(SSLExplorer.RECORD_HEADER_SIZE);
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer);
+ if (buffer.capacity() < recordLength) {
+ ByteBuffer oldBuffer = buffer;
+ buffer = ByteBuffer.allocate(recordLength);
+ buffer.put(oldBuffer);
+ }
+
+ buffer.position(SSLExplorer.RECORD_HEADER_SIZE);
+ buffer.limit(buffer.capacity());
+ while (position < recordLength) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ capabilities = SSLExplorer.explore(buffer);
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // enable server name indication checking
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ ssle.setSSLParameters(params);
+
+ try {
+ // handshaking
+ handshaking(ssle, sc, buffer);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkCapabilities(capabilities, session);
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ // close the socket channel.
+ sc.close();
+ ssc.close();
+ }
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(true);
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ // Create a non-blocking socket channel.
+ SocketChannel sc = SocketChannel.open();
+ sc.configureBlocking(false);
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ sc.connect(isa);
+
+ // Complete connection.
+ while (!sc.finishConnect() ) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setServerNames(serverNames);
+ ssle.setSSLParameters(params);
+
+ try {
+ // handshaking
+ handshaking(ssle, sc, null);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkSNIInSession(session);
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ // close the socket channel.
+ sc.close();
+ }
+ }
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+ private static String clientRequestedHostname;
+ private static String serverAcceptableHostname;
+
+ private static void parseArguments(String[] args) {
+ clientRequestedHostname = args[0];
+ serverAcceptableHostname = args[1];
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ public static void main(String args[]) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ new SSLEngineExplorerUnmatchedSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLEngineExplorerUnmatchedSNI() throws Exception {
+ super("../../../../etc");
+
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ *
+ * If the main thread excepted, that propagates back
+ * immediately. If the other thread threw an exception, we
+ * should report back.
+ */
+ if (serverException != null) {
+ System.out.print("Server Exception:");
+ throw serverException;
+ }
+ if (clientException != null) {
+ System.out.print("Client Exception:");
+ throw clientException;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ System.err.println(e);
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ doServerSide();
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ doClientSide();
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
new file mode 100644
index 0000000..bfa23cb
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @build SSLEngineService SSLCapabilities SSLExplorer
+ * @run main/othervm SSLEngineExplorerWithCli
+ */
+
+import javax.net.ssl.*;
+import java.nio.*;
+import java.net.*;
+import java.util.*;
+import java.nio.channels.*;
+
+public class SSLEngineExplorerWithCli extends SSLEngineService {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ // Is the server ready to serve?
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(false);
+
+ // Create a server socket channel.
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ ServerSocketChannel ssc = ServerSocketChannel.open();
+ ssc.socket().bind(isa);
+ serverPort = ssc.socket().getLocalPort();
+
+ // Signal Client, we're ready for his connect.
+ serverReady = true;
+
+ // Accept a socket channel.
+ SocketChannel sc = ssc.accept();
+
+ // Complete connection.
+ while (!sc.finishConnect()) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ ByteBuffer buffer = ByteBuffer.allocate(0xFF);
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ buffer.limit(SSLExplorer.RECORD_HEADER_SIZE);
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer);
+ if (buffer.capacity() < recordLength) {
+ ByteBuffer oldBuffer = buffer;
+ buffer = ByteBuffer.allocate(recordLength);
+ buffer.put(oldBuffer);
+ }
+
+ buffer.position(SSLExplorer.RECORD_HEADER_SIZE);
+ buffer.limit(buffer.capacity());
+ while (position < recordLength) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ capabilities = SSLExplorer.explore(buffer);
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // handshaking
+ handshaking(ssle, sc, buffer);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkCapabilities(capabilities, session);
+
+ // close the socket channel.
+ sc.close();
+ ssc.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(true);
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ // Create a non-blocking socket channel.
+ SocketChannel sc = SocketChannel.open();
+ sc.configureBlocking(false);
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ sc.connect(isa);
+
+ // Complete connection.
+ while (!sc.finishConnect() ) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setServerNames(serverNames);
+ ssle.setSSLParameters(params);
+
+ // handshaking
+ handshaking(ssle, sc, null);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkSNIInSession(session);
+
+ // close the socket channel.
+ sc.close();
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname =
+ "www\\.example\\.(com|org)";
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ public static void main(String args[]) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ new SSLEngineExplorerWithCli();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLEngineExplorerWithCli() throws Exception {
+ super("../../../../etc");
+
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ *
+ * If the main thread excepted, that propagates back
+ * immediately. If the other thread threw an exception, we
+ * should report back.
+ */
+ if (serverException != null) {
+ System.out.print("Server Exception:");
+ throw serverException;
+ }
+ if (clientException != null) {
+ System.out.print("Client Exception:");
+ throw clientException;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ System.err.println(e);
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ doServerSide();
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ doClientSide();
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
new file mode 100644
index 0000000..e8fd270
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @build SSLEngineService SSLCapabilities SSLExplorer
+ * @run main/othervm SSLEngineExplorerWithSrv
+ */
+
+import javax.net.ssl.*;
+import java.nio.*;
+import java.net.*;
+import java.util.*;
+import java.nio.channels.*;
+
+public class SSLEngineExplorerWithSrv extends SSLEngineService {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ // Is the server ready to serve?
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(false);
+
+ // Create a server socket channel.
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ ServerSocketChannel ssc = ServerSocketChannel.open();
+ ssc.socket().bind(isa);
+ serverPort = ssc.socket().getLocalPort();
+
+ // Signal Client, we're ready for his connect.
+ serverReady = true;
+
+ // Accept a socket channel.
+ SocketChannel sc = ssc.accept();
+
+ // Complete connection.
+ while (!sc.finishConnect()) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ ByteBuffer buffer = ByteBuffer.allocate(0xFF);
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ buffer.limit(SSLExplorer.RECORD_HEADER_SIZE);
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer);
+ if (buffer.capacity() < recordLength) {
+ ByteBuffer oldBuffer = buffer;
+ buffer = ByteBuffer.allocate(recordLength);
+ buffer.put(oldBuffer);
+ }
+
+ buffer.position(SSLExplorer.RECORD_HEADER_SIZE);
+ buffer.limit(buffer.capacity());
+ while (position < recordLength) {
+ int n = sc.read(buffer);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+ buffer.flip();
+
+ capabilities = SSLExplorer.explore(buffer);
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // enable server name indication checking
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = ssle.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ ssle.setSSLParameters(params);
+
+ // handshaking
+ handshaking(ssle, sc, buffer);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkCapabilities(capabilities, session);
+
+ // close the socket channel.
+ sc.close();
+ ssc.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+ // create SSLEngine.
+ SSLEngine ssle = createSSLEngine(true);
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ // Create a non-blocking socket channel.
+ SocketChannel sc = SocketChannel.open();
+ sc.configureBlocking(false);
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), serverPort);
+ sc.connect(isa);
+
+ // Complete connection.
+ while (!sc.finishConnect() ) {
+ Thread.sleep(50);
+ // waiting for the connection completed.
+ }
+
+ // handshaking
+ handshaking(ssle, sc, null);
+
+ // send out application data
+ deliver(ssle, sc);
+
+ // receive application data
+ receive(ssle, sc);
+
+ // check server name indication
+ ExtendedSSLSession session = (ExtendedSSLSession)ssle.getSession();
+ checkSNIInSession(session);
+
+ // close the socket channel.
+ sc.close();
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname =
+ "www\\.example\\.(com|org)";
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.isEmpty()) {
+ throw new Exception(
+ "should be empty request server name indication");
+ }
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ public static void main(String args[]) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ new SSLEngineExplorerWithSrv();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLEngineExplorerWithSrv() throws Exception {
+ super("../../../../etc");
+
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ *
+ * If the main thread excepted, that propagates back
+ * immediately. If the other thread threw an exception, we
+ * should report back.
+ */
+ if (serverException != null) {
+ System.out.print("Server Exception:");
+ throw serverException;
+ }
+ if (clientException != null) {
+ System.out.print("Client Exception:");
+ throw clientException;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ System.err.println(e);
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ doServerSide();
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ doClientSide();
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
new file mode 100644
index 0000000..d9ff691
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @run main/othervm SSLSocketConsistentSNI
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketConsistentSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+ SSLServerSocketFactory sslssf =
+ (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
+ SSLServerSocket sslServerSocket =
+ (SSLServerSocket) sslssf.createServerSocket(serverPort);
+
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = sslServerSocket.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ sslServerSocket.setSSLParameters(params);
+
+ serverPort = sslServerSocket.getLocalPort();
+
+ /*
+ * Signal Client, we're ready for his connect.
+ */
+ serverReady = true;
+
+ SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ ExtendedSSLSession session =
+ (ExtendedSSLSession)sslSocket.getSession();
+ checkSNIInSession(session);
+ } finally {
+ sslSocket.close();
+ sslServerSocket.close();
+ }
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ ExtendedSSLSession session =
+ (ExtendedSSLSession)sslSocket.getSession();
+ checkSNIInSession(session);
+ } finally {
+ sslSocket.close();
+ }
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname = "www\\.example\\.com";
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketConsistentSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketConsistentSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java
new file mode 100644
index 0000000..27e2b6a
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorer SSLv2Hello,SSLv3
+ * @run main/othervm SSLSocketExplorer SSLv3
+ * @run main/othervm SSLSocketExplorer TLSv1
+ * @run main/othervm SSLSocketExplorer TLSv1.1
+ * @run main/othervm SSLSocketExplorer TLSv1.2
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorer {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkCapabilities(capabilities, session);
+
+ sslSocket.close();
+ serverSocket.close();
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ // enable the specified TLS protocol
+ sslSocket.setEnabledProtocols(supportedProtocols);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ sslSocket.close();
+ }
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+ }
+
+ private static String[] supportedProtocols; // supported protocols
+
+ private static void parseArguments(String[] args) {
+ supportedProtocols = args[0].split(",");
+ }
+
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorer();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorer() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
new file mode 100644
index 0000000..44a3715
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorerFailure SSLv2Hello,SSLv3
+ * @run main/othervm SSLSocketExplorerFailure SSLv3
+ * @run main/othervm SSLSocketExplorerFailure TLSv1
+ * @run main/othervm SSLSocketExplorerFailure TLSv1.1
+ * @run main/othervm SSLSocketExplorerFailure TLSv1.2
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorerFailure {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+ boolean failed = false;
+ try {
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ // want an I/O exception
+ throw new IOException("We just want a I/O exception");
+ } catch (Exception e) {
+ failed = true;
+ }
+
+ // off course, the above explore failed. Faile to failure handler
+ SSLContext context = SSLContext.getInstance("TLS");
+ context.init(null, null, null);
+ SSLSocketFactory sslsf = context.getSocketFactory();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ if (!failed) {
+ sslOS.write(85);
+ sslOS.flush();
+ } else {
+ sslSocket.close();
+ }
+ } catch (Exception e) {
+ System.out.println("server exception " + e);
+ } finally {
+ sslSocket.close();
+ serverSocket.close();
+ }
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ // enable the specified TLS protocol
+ sslSocket.setEnabledProtocols(supportedProtocols);
+
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+ } catch (Exception e) {
+ System.out.println("client exception " + e);
+ } finally {
+ sslSocket.close();
+ }
+ }
+
+ private static String[] supportedProtocols; // supported protocols
+
+ private static void parseArguments(String[] args) {
+ supportedProtocols = args[0].split(",");
+ }
+
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorerFailure();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorerFailure() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
new file mode 100644
index 0000000..c9ae26c
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
@@ -0,0 +1,435 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorerMatchedSNI www.example.com
+ * www\.example\.com
+ * @run main/othervm SSLSocketExplorerMatchedSNI www.example.com
+ * www\.example\.(com|org)
+ * @run main/othervm SSLSocketExplorerMatchedSNI example.com
+ * (.*\.)*example\.(com|org)
+ * @run main/othervm SSLSocketExplorerMatchedSNI www.example.com
+ * (.*\.)*example\.(com|org)
+ * @run main/othervm SSLSocketExplorerMatchedSNI www.us.example.com
+ * (.*\.)*example\.(com|org)
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorerMatchedSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkCapabilities(capabilities, session);
+
+ sslSocket.close();
+ serverSocket.close();
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkSNIInSession(session);
+
+ sslSocket.close();
+ }
+
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+ private static String clientRequestedHostname;
+ private static String serverAcceptableHostname;
+
+ private static void parseArguments(String[] args) {
+ clientRequestedHostname = args[0];
+ serverAcceptableHostname = args[1];
+ }
+
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorerMatchedSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorerMatchedSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
new file mode 100644
index 0000000..eab4800
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
@@ -0,0 +1,392 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorerUnmatchedSNI www.example.com
+ * www\.example\.org
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorerUnmatchedSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ try {
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ sslSocket.close();
+ serverSocket.close();
+ }
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ try {
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ sslSocket.close();
+ }
+ }
+
+ private static String clientRequestedHostname;
+ private static String serverAcceptableHostname;
+
+ private static void parseArguments(String[] args) {
+ clientRequestedHostname = args[0];
+ serverAcceptableHostname = args[1];
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorerUnmatchedSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorerUnmatchedSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
new file mode 100644
index 0000000..6933c9a
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorerWithCliSNI
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorerWithCliSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkCapabilities(capabilities, session);
+
+ sslSocket.close();
+ serverSocket.close();
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkSNIInSession(session);
+
+ sslSocket.close();
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname =
+ "www\\.example\\.(com|org)";
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (sessionSNI.isEmpty()) {
+ throw new Exception(
+ "unexpected empty request server name indication");
+ }
+
+ if (sessionSNI.size() != 1) {
+ throw new Exception(
+ "unexpected request server name indication");
+ }
+
+ SNIServerName serverName = sessionSNI.get(0);
+ if (!(serverName instanceof SNIHostName)) {
+ throw new Exception(
+ "unexpected instance of request server name indication");
+ }
+
+ String hostname = ((SNIHostName)serverName).getAsciiName();
+ if (!clientRequestedHostname.equalsIgnoreCase(hostname)) {
+ throw new Exception(
+ "unexpected request server name indication value");
+ }
+ }
+
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorerWithCliSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorerWithCliSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
new file mode 100644
index 0000000..64b1ae9a
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @library ../../../../templates
+ * @build SSLCapabilities SSLExplorer
+ * @run main/othervm SSLSocketExplorerWithSrvSNI
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketExplorerWithSrvSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+
+ ServerSocket serverSocket = new ServerSocket(serverPort);
+
+ // Signal Client, we're ready for his connect.
+ serverPort = serverSocket.getLocalPort();
+ serverReady = true;
+
+ Socket socket = serverSocket.accept();
+ InputStream ins = socket.getInputStream();
+
+ byte[] buffer = new byte[0xFF];
+ int position = 0;
+ SSLCapabilities capabilities = null;
+
+ // Read the header of TLS record
+ while (position < SSLExplorer.RECORD_HEADER_SIZE) {
+ int count = SSLExplorer.RECORD_HEADER_SIZE - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ int recordLength = SSLExplorer.getRequiredSize(buffer, 0, position);
+ if (buffer.length < recordLength) {
+ buffer = Arrays.copyOf(buffer, recordLength);
+ }
+
+ while (position < recordLength) {
+ int count = recordLength - position;
+ int n = ins.read(buffer, position, count);
+ if (n < 0) {
+ throw new Exception("unexpected end of stream!");
+ }
+ position += n;
+ }
+
+ capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+ if (capabilities != null) {
+ System.out.println("Record version: " +
+ capabilities.getRecordVersion());
+ System.out.println("Hello version: " +
+ capabilities.getHelloVersion());
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buffer, 0, position);
+ SSLSocket sslSocket = (SSLSocket)sslsf.createSocket(socket, bais, true);
+
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ sslSocket.setSSLParameters(params);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkCapabilities(capabilities, session);
+
+ sslSocket.close();
+ serverSocket.close();
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ ExtendedSSLSession session = (ExtendedSSLSession)sslSocket.getSession();
+ checkSNIInSession(session);
+
+ sslSocket.close();
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname =
+ "www\\.example\\.(com|org)";
+
+ void checkCapabilities(SSLCapabilities capabilities,
+ ExtendedSSLSession session) throws Exception {
+
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.equals(capabilities.getServerNames())) {
+ for (SNIServerName sni : sessionSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ List<SNIServerName> capaSNI = capabilities.getServerNames();
+ for (SNIServerName sni : capaSNI) {
+ System.out.println("SNI in session is " + sni);
+ }
+
+ throw new Exception(
+ "server name indication does not match capabilities");
+ }
+
+ checkSNIInSession(session);
+ }
+
+ void checkSNIInSession(ExtendedSSLSession session) throws Exception {
+ List<SNIServerName> sessionSNI = session.getRequestedServerNames();
+ if (!sessionSNI.isEmpty()) {
+ throw new Exception(
+ "should be empty request server name indication");
+ }
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketExplorerWithSrvSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketExplorerWithSrvSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
new file mode 100644
index 0000000..6ba1dfd
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/**
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @run main/othervm SSLSocketInconsistentSNI
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.util.*;
+import java.net.*;
+import javax.net.ssl.*;
+
+public class SSLSocketInconsistentSNI {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = true;
+
+ /*
+ * Where do we find the keystores?
+ */
+ static String pathToStores = "../../../../etc";
+ static String keyStoreFile = "keystore";
+ static String trustStoreFile = "truststore";
+ static String passwd = "passphrase";
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * If the client or server is doing some kind of object creation
+ * that the other side depends on, and that thread prematurely
+ * exits, you may experience a hang. The test harness will
+ * terminate all hung threads after its timeout has expired,
+ * currently 3 minutes by default, but you might try to be
+ * smart about it....
+ */
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+ SSLServerSocketFactory sslssf =
+ (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
+ SSLServerSocket sslServerSocket =
+ (SSLServerSocket) sslssf.createServerSocket(serverPort);
+
+ SNIMatcher matcher = SNIHostName.createSNIMatcher(
+ serverAcceptableHostname);
+ Collection<SNIMatcher> matchers = new ArrayList<>(1);
+ matchers.add(matcher);
+ SSLParameters params = sslServerSocket.getSSLParameters();
+ params.setSNIMatchers(matchers);
+ sslServerSocket.setSSLParameters(params);
+
+ serverPort = sslServerSocket.getLocalPort();
+
+ /*
+ * Signal Client, we're ready for his connect.
+ */
+ serverReady = true;
+
+ SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write(85);
+ sslOS.flush();
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ sslSocket.close();
+ sslServerSocket.close();
+ }
+ }
+
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLSocketFactory sslsf =
+ (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLSocket sslSocket = (SSLSocket)
+ sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write(280);
+ sslOS.flush();
+ sslIS.read();
+
+ throw new Exception(
+ "Mismatched server name indication was accepted");
+ } catch (SSLHandshakeException sslhe) {
+ // the expected unrecognized server name indication exception
+ } catch (IOException ioe) {
+ // the peer may have closed the socket because of the unmatched
+ // server name indication.
+ } finally {
+ sslSocket.close();
+ }
+ }
+
+ private static String clientRequestedHostname = "www.example.com";
+ private static String serverAcceptableHostname = "www\\.example\\.org";
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + keyStoreFile;
+ String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores +
+ "/" + trustStoreFile;
+
+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketInconsistentSNI();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketInconsistentSNI() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
new file mode 100644
index 0000000..4c50c30
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
@@ -0,0 +1,564 @@
+/*
+ * Copyright (c) 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.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7068321
+ * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
+ * @run main/othervm SSLSocketSNISensitive PKIX www.example.com
+ * @run main/othervm SSLSocketSNISensitive SunX509 www.example.com
+ * @run main/othervm SSLSocketSNISensitive PKIX www.example.net
+ * @run main/othervm SSLSocketSNISensitive SunX509 www.example.net
+ * @run main/othervm SSLSocketSNISensitive PKIX www.invalid.com
+ * @run main/othervm SSLSocketSNISensitive SunX509 www.invalid.com
+ */
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import javax.net.ssl.*;
+import java.security.KeyStore;
+import java.security.KeyFactory;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.*;
+import java.security.interfaces.*;
+import sun.misc.BASE64Decoder;
+
+
+public class SSLSocketSNISensitive {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ /*
+ * Where do we find the keystores?
+ */
+ // Certificates and key used in the test.
+ static String trustedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICkjCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTIwNDE3MTIwNjA3WhcNMzMwMzI4MTIwNjA3WjA7MQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwgZ8wDQYJ\n" +
+ "KoZIhvcNAQEBBQADgY0AMIGJAoGBANY+7Enp+1S566kLcKk+qe4Ki6BxaHGZ+v7r\n" +
+ "vLksx9IQZCbAEf4YLbrZhKzKD3SPIJXyxPFwknAknIh3Knk8mViOZks7T8L3GnJr\n" +
+ "TBaVvDyTzDJum/QYiahfO2qpfN/Oya2UILmqsBAeLyWpzbQsAyWBXfoUtkOUgnzK\n" +
+ "fk6QAKYrAgMBAAGjgaUwgaIwHQYDVR0OBBYEFEtmQi7jT1ijXOafPsfkrLwSVu9e\n" +
+ "MGMGA1UdIwRcMFqAFEtmQi7jT1ijXOafPsfkrLwSVu9eoT+kPTA7MQswCQYDVQQG\n" +
+ "EwJVUzENMAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2\n" +
+ "Y2WCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEE\n" +
+ "BQADgYEAkKWxMc4+ODk5WwLXXweB8/IKfVfrizNn0KLEgsZ6xNXFIXDpiPGAFcgl\n" +
+ "MzFO424JgyvUulsUc/X16Cnuwwntkk6KUG7vEV7h4o9sAV7Cax3gfQE/EZFb4ybn\n" +
+ "aBm1UsujMKd/ovqbbbxJbmOWzCeo0QfIGleDEyh3NBBZ0i11Kiw=\n" +
+ "-----END CERTIFICATE-----";
+
+ // web server certificate, www.example.com
+ static String targetCertStr_A =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICVTCCAb6gAwIBAgIBAjANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTIwNDE3MTIwNjA4WhcNMzIwMTAzMTIwNjA4WjBVMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxGDAWBgNV\n" +
+ "BAMTD3d3dy5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA\n" +
+ "4zFp3PZNzsd3ZwG6FNNWO9eSN+UBymlf8oCwpKJM2tIinmMWvWIXnlx/2UXIfSAq\n" +
+ "QEG3aXkAFyEiGGpQlBbqcfrESsHsiz2pnnm5dG2v/eS0Bwz1jmcuNmwnh3UQw2Vl\n" +
+ "+BLk8ukdrLjiCT8jARiHExYf1Xg+wUqQ9y8NV26hdaUCAwEAAaNPME0wCwYDVR0P\n" +
+ "BAQDAgPoMB0GA1UdDgQWBBQwtx+gqzn2w4y82brXlp7tqBYEZDAfBgNVHSMEGDAW\n" +
+ "gBRLZkIu409Yo1zmnz7H5Ky8ElbvXjANBgkqhkiG9w0BAQQFAAOBgQAJWo8B6Ud+\n" +
+ "/OU+UcZLihlfMX02OSlK2ZB7mfqpj2G3JT9yb0A+VbY3uuajmaYYIIxl3kXGz/n8\n" +
+ "M2Q/Ux/MDxG+IFKHC26Kuj4dAQgzjq2pILVPTE2QnaQTNCsgVZtTaC47SG9FRSoC\n" +
+ "qvnIvn/oTpKSqus76I1cR4joDtiV2OEuVw==\n" +
+ "-----END CERTIFICATE-----";
+
+ // Private key in the format of PKCS#8
+ static String targetPrivateKey_A =
+ "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOMxadz2Tc7Hd2cB\n" +
+ "uhTTVjvXkjflAcppX/KAsKSiTNrSIp5jFr1iF55cf9lFyH0gKkBBt2l5ABchIhhq\n" +
+ "UJQW6nH6xErB7Is9qZ55uXRtr/3ktAcM9Y5nLjZsJ4d1EMNlZfgS5PLpHay44gk/\n" +
+ "IwEYhxMWH9V4PsFKkPcvDVduoXWlAgMBAAECgYAqX2nuIyXp3fvgA0twXOYlbRRB\n" +
+ "Rn3qAXM6qFPJsNeCrFR2k+aG1cev6nKR1FkLNTeMGnWZv06MAcr5IML8i7WXyG4C\n" +
+ "LY/C0gedn94FDKFlln+bTENwQTGjn4lKysDA+IuNpasTeMCajbic+dPByhIdTOjZ\n" +
+ "iMCyxbLfpk40zQopVQJBAPyfGmkeHB3GjdbdgujWCGKb2UxBa4O8dy3O4l2yizTn\n" +
+ "uUqMGcwGY4ciNSVvZQ7jKo4vDmkSuYib4/woPChaNfMCQQDmO0BQuSWYGNtSwV35\n" +
+ "lafZfX1dNCLKm1iNA6A12evXgvQiE9WT4mqionig0VZW16HtiY4/BkHOcos/K9Um\n" +
+ "ARQHAkA8mkaRtSF1my5nv1gqVz5Hua+VdZQ/VDUbDiiL5cszc+ulkJqXsWirAG/T\n" +
+ "fTe3LJQG7A7+8fkEZrF4yoY0AAA1AkEAotokezULj5N9iAL5SzL9wIzQYV4ggfny\n" +
+ "YATBjXXxKccakwQ+ndWZIiMUeoS4ssLialhTgucVI0fIkU2a/r/ifwJAc6e+5Pvh\n" +
+ "MghQj/U788Od/v6rgqz/NGsduZ7uilCMcWiwA73OR2MHMH/OIuoofuEPrfuV9isV\n" +
+ "xVXhgpKfP/pdOA==";
+
+ // web server certificate, www.example.net
+ static String targetCertStr_B =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICVTCCAb6gAwIBAgIBBDANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTIwNDE3MTIwNjA5WhcNMzIwMTAzMTIwNjA5WjBVMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxGDAWBgNV\n" +
+ "BAMTD3d3dy5leGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA\n" +
+ "2VlzF1fvWYczDChrUeJiLJ1M/dIShCaOTfYGiXfQGEZCAWTacUclwr+rVMnZ75/c\n" +
+ "wwg5pNdXRijxMil8DBTS1gFcIFQhosLHvzIAe6ULlg/xB+/L6KBz+NTWfo/2KF6t\n" +
+ "xatmcToNrCcwi7eUOfbzQje65Tizs56jJYem2m7Rk0ECAwEAAaNPME0wCwYDVR0P\n" +
+ "BAQDAgPoMB0GA1UdDgQWBBQT/FR0cAWcZQ7h0X79KGki34OSQjAfBgNVHSMEGDAW\n" +
+ "gBRLZkIu409Yo1zmnz7H5Ky8ElbvXjANBgkqhkiG9w0BAQQFAAOBgQB67cPIT6fz\n" +
+ "6Ws8fBpYgW2ad4ci66i1WduBD9CpGFE+jRK2feRj6hvYBXocKj0AMWUFIEB2E3hA\n" +
+ "oIjxcf1GxIpHVl9DjlhxqXbA0Ktl7/NGNRlDSLTizOTl3FB1mMTlOGvXDVmpcFhl\n" +
+ "HuoP1hYvhTsBwPx5igGNchuPtDIUzL2mXw==\n" +
+ "-----END CERTIFICATE-----";
+
+ static String targetPrivateKey_B =
+ "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANlZcxdX71mHMwwo\n" +
+ "a1HiYiydTP3SEoQmjk32Bol30BhGQgFk2nFHJcK/q1TJ2e+f3MMIOaTXV0Yo8TIp\n" +
+ "fAwU0tYBXCBUIaLCx78yAHulC5YP8Qfvy+igc/jU1n6P9ihercWrZnE6DawnMIu3\n" +
+ "lDn280I3uuU4s7OeoyWHptpu0ZNBAgMBAAECgYEAl19H26sfhD+32rDPxZCgBShs\n" +
+ "dZ33zVe45i0Bcn4iTLWpxKTDyf7eGps4rO2DvfKdYqt40ggzvSZIjUH9JcDe8GmG\n" +
+ "d3m0ILB7pg4jsFlpyeHpTO8grPLxA1G9s3o0DoFpz/rooqgFfe/DrRDmRoOSkgfV\n" +
+ "/gseIbgJHRO/Ctyvdh0CQQD6uFd0HxhH1jl/JzvPzIH4LSnPcdEh9zsMEb6uzh75\n" +
+ "9qL+IHD5N2I/pYZTKqDFIwhJf701+LKag55AX/zrDt7rAkEA3e00AbnwanDMa6Wj\n" +
+ "+gFekUQveSVra38LiihzCkyVvQpFjbiF1rUhSNQ0dpU5/hmrYF0C6H9VXAesfkUY\n" +
+ "WhpDgwJAYjgZOop77piDycZK7isFt32p5XSHIzFBVocVFlH1XKM8UyXOXDNQL/Le\n" +
+ "XnJSrSf+NRzvuNcG0PVC56Ey6brXpQJAY4M4vcltt5zq3R5CQBmbGRJ1IyKXX3Vx\n" +
+ "bDslEqoyvri7ZYgnY5aG3UxiVgYmIf3KrgQnCLAIS6MZQumiuMxsFwJAK5pEG063\n" +
+ "9ngUof4fDMvZphqZjZR1zMKz/V/9ge0DWBINaqFgsgebNu+MyImsC8C6WKjGmV/2\n" +
+ "f1MY0D7sC2vU/Q==";
+
+ // web server certificate, www.invalid.com
+ static String targetCertStr_C =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICVTCCAb6gAwIBAgIBAzANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTIwNDE3MTIwNjA5WhcNMzIwMTAzMTIwNjA5WjBVMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxGDAWBgNV\n" +
+ "BAMTD3d3dy5pbnZhbGlkLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA\n" +
+ "q6MyQwzCr2nJ41l0frmHL0qULSyW51MhevBC+1W28i0LE/efrmpwV3LdnlQEGFak\n" +
+ "DLDwtnff3iru8dSMcA7KdWVkivsE7ZTP+qFDaWBAy7XXiSsv6yZ2Nh4jJb0YcD28\n" +
+ "45zk2nAl5Az1/PuoTi1vpQxzFZKuBm1HGgz3MEZvBvMCAwEAAaNPME0wCwYDVR0P\n" +
+ "BAQDAgPoMB0GA1UdDgQWBBRRMifrND015Nm8N6gV5X7cg1YjjjAfBgNVHSMEGDAW\n" +
+ "gBRLZkIu409Yo1zmnz7H5Ky8ElbvXjANBgkqhkiG9w0BAQQFAAOBgQBjkUO6Ri/B\n" +
+ "uDC2gDMIyL5+NTe/1dPPQYM4HhCNa/KQYvU5lzCKO9Vpa+i+nyrUNNXUu8Tkyq4Y\n" +
+ "A+aGSm6+FT/i9rFwkYUdorBtD3KfQiwTIWrVERXBkWI5iZNaVZhx0TFy4vUpf65d\n" +
+ "QtwkbHpC66fdKc2EdLXkuY9KkmtZZJJ7YA==\n" +
+ "-----END CERTIFICATE-----";
+
+ static String targetPrivateKey_C =
+ "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKujMkMMwq9pyeNZ\n" +
+ "dH65hy9KlC0sludTIXrwQvtVtvItCxP3n65qcFdy3Z5UBBhWpAyw8LZ3394q7vHU\n" +
+ "jHAOynVlZIr7BO2Uz/qhQ2lgQMu114krL+smdjYeIyW9GHA9vOOc5NpwJeQM9fz7\n" +
+ "qE4tb6UMcxWSrgZtRxoM9zBGbwbzAgMBAAECgYASJDK40Y12Wvki1Z6xkkyOnBRj\n" +
+ "XfYpRykfxGtgA2RN3qLwHlk7Zzaul46DIKA6LlYynTUkJDF+Ww1cdDnP0lBlwcmM\n" +
+ "iD0ck3zYyYBLhQHuVbkK3SYE+ANRhM0icvvqANP2at/U4awQcPNEae/KCiecLNu3\n" +
+ "CJGqyhPDdrEAqPuJGQJBAN46pQC6l3yrcSYE2s53jSmsm2HVVOFlFXjU6k/RMTxG\n" +
+ "FfDJtGUAOQ37rPQ06ugr/gjLAmmPp+FXozaBdA32D80CQQDFuGRgv3WYqbglIcRL\n" +
+ "JRs6xlj9w1F97s/aiUenuwhIPNiUoRbV7mnNuZ/sGF0svOVE7SazRjuFX6UqL9Y9\n" +
+ "HzG/AkEA170pCI8cl4w8eUNHRB9trGKEKjMXhwVCFh7lJf2ZBcGodSzr8w2HVhrZ\n" +
+ "Ke7hiemDYffrbJ1oxmv05+o+x3r0lQJBAL6adVm2+FyFMFnLZXmzeb59O4jWY5bt\n" +
+ "Qz6/HG6bpO5OidMuP99YCHMkQQDOs/PO3Y5GuAoW6IY4n/Y9S2B80+0CQBl1/H9/\n" +
+ "0n/vrb6vW6Azds49tuS82RFAnOhtwTyBEajs08WF8rZQ3WD2RHJnH0+jjfL0anIp\n" +
+ "dQBSeNN7s7b6rRk=";
+
+ // This is a certificate for client
+ static String targetCertStr_D=
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICVDCCAb2gAwIBAgIBBTANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTIwNDE3MTIwNjEwWhcNMzIwMTAzMTIwNjEwWjBUMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxFzAVBgNV\n" +
+ "BAMTDkludGVyT3AgVGVzdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDo\n" +
+ "Q/KoAIAC2ljFfW2KwjnxTzi4NQJeUuk2seqKpsAY8x4O5dvixzUl6142zmljapqi\n" +
+ "bJloQVpfB+CEc5/l4h5gzGRVzkuqP1oPzDrpZ5GsvmvuHenV/TzCIgX1cLETzQVt\n" +
+ "6Rk06okoBPnw3hDJEJiEc1Rv7HCE8p/p+SaiHrskwwIDAQABo08wTTALBgNVHQ8E\n" +
+ "BAMCA+gwHQYDVR0OBBYEFPr91O33RIGfFSqza2AwQIgE4QswMB8GA1UdIwQYMBaA\n" +
+ "FEtmQi7jT1ijXOafPsfkrLwSVu9eMA0GCSqGSIb3DQEBBAUAA4GBANIDFYgAhoj3\n" +
+ "B8u1YpqeoEp2Lt9TwrYBshaIrbmBPCwCGio0JIsoov3n8BCSg5F+8MnOtPl+TjeO\n" +
+ "0Ug+7guPdCk/wg8YNxLHgSsQlpcNJDjWiErqmUPVrg5BPPQb65qMund6KTmMN0y6\n" +
+ "4EbSmxRpZO/N0/5oK4umTk0EeXKNekBj\n" +
+ "-----END CERTIFICATE-----";
+
+ static String targetPrivateKey_D =
+ "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAOhD8qgAgALaWMV9\n" +
+ "bYrCOfFPOLg1Al5S6Tax6oqmwBjzHg7l2+LHNSXrXjbOaWNqmqJsmWhBWl8H4IRz\n" +
+ "n+XiHmDMZFXOS6o/Wg/MOulnkay+a+4d6dX9PMIiBfVwsRPNBW3pGTTqiSgE+fDe\n" +
+ "EMkQmIRzVG/scITyn+n5JqIeuyTDAgMBAAECgYBw37yIKp4LRONJLnhSq6sO+0n8\n" +
+ "Mz6waiiN/Q6XTQwj09pysQAYCGlqwSRrDAqpVsBJWO+Ae+oYLrLMi4hUZnwN75v3\n" +
+ "pe1nXlrD11RmPLXwBxqFxNSvAs2FgLHZEtwHI7Bn8KybT/8bGkQ8csLceInYtMDD\n" +
+ "MuTyy2KRk/pj60zIKQJBAPgebQiAH6viFQ88AwHaNvQhlUfwmSC1i6f8LVoeqaHC\n" +
+ "lnP0LJBwlyDeeEInhHrCR2ibnCB6I/Pig+49XQgabK8CQQDvpJwuGEbsOO+3rkJJ\n" +
+ "OpOw4toG0QJZdRnT6l8I6BlboQRZSfFh+lGGahvFXkxc4KdUpJ7QPtXU7HHk6Huk\n" +
+ "8RYtAkA9CW8VGj+wTuuTVdX/jKjcIa7RhbSFwWNbrcOSWdys+Gt+luCnn6rt4QyA\n" +
+ "aaxDbquWZkFgE+voQR7nap0KM0XtAkAznd0WAJymHM1lXt9gLoHJQ9N6TGKZKiPa\n" +
+ "BU1a+cMcfV4WbVrUo7oTnZ9Fr73681iXXq3mZOJh7lvJ1llreZIxAkBEnbiTgEf4\n" +
+ "tvku68jHcRbRPmdS7CBSWNEBaHLOm4pUSTcxVTKKMHw7vmM5/UYUxJ8QNKCYxn6O\n" +
+ "+vtiBwBawwzN";
+
+ static String[] serverCerts = {targetCertStr_A,
+ targetCertStr_B, targetCertStr_C};
+ static String[] serverKeys = {targetPrivateKey_A,
+ targetPrivateKey_B, targetPrivateKey_C};
+ static String[] clientCerts = {targetCertStr_D};
+ static String[] clientKeys = {targetPrivateKey_D};
+
+ static char passphrase[] = "passphrase".toCharArray();
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+ SSLContext context = generateSSLContext(false);
+ SSLServerSocketFactory sslssf = context.getServerSocketFactory();
+ SSLServerSocket sslServerSocket =
+ (SSLServerSocket)sslssf.createServerSocket(serverPort);
+ serverPort = sslServerSocket.getLocalPort();
+
+ /*
+ * Signal Client, we're ready for his connect.
+ */
+ serverReady = true;
+
+ SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept();
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write('A');
+ sslOS.flush();
+
+ SSLSession session = sslSocket.getSession();
+ checkCertificate(session.getLocalCertificates(),
+ clientRequestedHostname);
+ } finally {
+ sslSocket.close();
+ sslServerSocket.close();
+ }
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLContext context = generateSSLContext(true);
+ SSLSocketFactory sslsf = context.getSocketFactory();
+
+ SSLSocket sslSocket =
+ (SSLSocket)sslsf.createSocket("localhost", serverPort);
+
+ SNIHostName serverName = new SNIHostName(clientRequestedHostname);
+ List<SNIServerName> serverNames = new ArrayList<>(1);
+ serverNames.add(serverName);
+ SSLParameters params = sslSocket.getSSLParameters();
+ params.setServerNames(serverNames);
+ sslSocket.setSSLParameters(params);
+
+ try {
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write('B');
+ sslOS.flush();
+ sslIS.read();
+
+ SSLSession session = sslSocket.getSession();
+ checkCertificate(session.getPeerCertificates(),
+ clientRequestedHostname);
+ } finally {
+ sslSocket.close();
+ }
+ }
+
+ private static void checkCertificate(Certificate[] certs,
+ String hostname) throws Exception {
+ if (certs != null && certs.length != 0) {
+ X509Certificate x509Cert = (X509Certificate)certs[0];
+
+ String subject = x509Cert.getSubjectX500Principal().getName();
+
+ if (!subject.contains(hostname)) {
+ throw new Exception(
+ "Not the expected certificate: " + subject);
+ }
+ }
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ private static String tmAlgorithm; // trust manager
+ private static String clientRequestedHostname; // server name indication
+
+ private static void parseArguments(String[] args) {
+ tmAlgorithm = args[0];
+ clientRequestedHostname = args[1];
+ }
+
+ private static SSLContext generateSSLContext(boolean isClient)
+ throws Exception {
+
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ // create a key store
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(null, null);
+
+ // import the trused cert
+ ByteArrayInputStream is =
+ new ByteArrayInputStream(trustedCertStr.getBytes());
+ Certificate trusedCert = cf.generateCertificate(is);
+ is.close();
+
+ ks.setCertificateEntry("RSA Export Signer", trusedCert);
+
+ String[] certStrs = null;
+ String[] keyStrs = null;
+ if (isClient) {
+ certStrs = clientCerts;
+ keyStrs = clientKeys;
+ } else {
+ certStrs = serverCerts;
+ keyStrs = serverKeys;
+ }
+
+ for (int i = 0; i < certStrs.length; i++) {
+ // generate the private key.
+ String keySpecStr = keyStrs[i];
+ PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
+ new BASE64Decoder().decodeBuffer(keySpecStr));
+ KeyFactory kf = KeyFactory.getInstance("RSA");
+ RSAPrivateKey priKey =
+ (RSAPrivateKey)kf.generatePrivate(priKeySpec);
+
+ // generate certificate chain
+ String keyCertStr = certStrs[i];
+ is = new ByteArrayInputStream(keyCertStr.getBytes());
+ Certificate keyCert = cf.generateCertificate(is);
+ is.close();
+
+ Certificate[] chain = new Certificate[2];
+ chain[0] = keyCert;
+ chain[1] = trusedCert;
+
+ // import the key entry.
+ ks.setKeyEntry("key-entry-" + i, priKey, passphrase, chain);
+ }
+
+ // create SSL context
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm);
+ tmf.init(ks);
+
+ SSLContext ctx = SSLContext.getInstance("TLS");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509");
+ kmf.init(ks, passphrase);
+
+ ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+ ks = null;
+
+ return ctx;
+ }
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new SSLSocketSNISensitive();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ SSLSocketSNISensitive() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/templates/SSLCapabilities.java b/jdk/test/sun/security/ssl/templates/SSLCapabilities.java
new file mode 100644
index 0000000..22ea360
--- /dev/null
+++ b/jdk/test/sun/security/ssl/templates/SSLCapabilities.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import java.util.List;
+import javax.net.ssl.SNIServerName;
+
+/**
+ * Encapsulates the security capabilities of an SSL/TLS connection.
+ * <P>
+ * The security capabilities are the list of ciphersuites to be accepted in
+ * an SSL/TLS handshake, the record version, the hello version, and server
+ * name indication, etc., of an SSL/TLS connection.
+ * <P>
+ * <code>SSLCapabilities</code> can be retrieved by exploring the network
+ * data of an SSL/TLS connection via {@link SSLExplorer#explore(ByteBuffer)}
+ * or {@link SSLExplorer#explore(byte[], int, int)}.
+ *
+ * @see SSLExplorer
+ */
+public abstract class SSLCapabilities {
+
+ /**
+ * Returns the record version of an SSL/TLS connection
+ *
+ * @return a non-null record version
+ */
+ public abstract String getRecordVersion();
+
+ /**
+ * Returns the hello version of an SSL/TLS connection
+ *
+ * @return a non-null hello version
+ */
+ public abstract String getHelloVersion();
+
+ /**
+ * Returns a <code>List</code> containing all {@link SNIServerName}s
+ * of the server name indication.
+ *
+ * @return a non-null immutable list of {@link SNIServerName}s
+ * of the server name indication parameter, may be empty
+ * if no server name indication.
+ *
+ * @see SNIServerName
+ */
+ public abstract List<SNIServerName> getServerNames();
+}
+
diff --git a/jdk/test/sun/security/ssl/templates/SSLExplorer.java b/jdk/test/sun/security/ssl/templates/SSLExplorer.java
new file mode 100644
index 0000000..9b912c8
--- /dev/null
+++ b/jdk/test/sun/security/ssl/templates/SSLExplorer.java
@@ -0,0 +1,615 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.BufferUnderflowException;
+import java.io.IOException;
+import javax.net.ssl.*;
+import java.util.*;
+
+import sun.misc.HexDumpEncoder;
+
+/**
+ * Instances of this class acts as an explorer of the network data of an
+ * SSL/TLS connection.
+ */
+public final class SSLExplorer {
+
+ // Private constructor prevents construction outside this class.
+ private SSLExplorer() {
+ }
+
+ /**
+ * The header size of TLS/SSL records.
+ * <P>
+ * The value of this constant is {@value}.
+ */
+ public final static int RECORD_HEADER_SIZE = 0x05;
+
+ /**
+ * Returns the required number of bytes in the {@code source}
+ * {@link ByteBuffer} necessary to explore SSL/TLS connection.
+ * <P>
+ * This method tries to parse as few bytes as possible from
+ * {@code source} byte buffer to get the length of an
+ * SSL/TLS record.
+ * <P>
+ * This method accesses the {@code source} parameter in read-only
+ * mode, and does not update the buffer's properties such as capacity,
+ * limit, position, and mark values.
+ *
+ * @param source
+ * a {@link ByteBuffer} containing
+ * inbound or outbound network data for an SSL/TLS connection.
+ * @throws BufferUnderflowException if less than {@code RECORD_HEADER_SIZE}
+ * bytes remaining in {@code source}
+ * @return the required size in byte to explore an SSL/TLS connection
+ */
+ public final static int getRequiredSize(ByteBuffer source) {
+
+ ByteBuffer input = source.duplicate();
+
+ // Do we have a complete header?
+ if (input.remaining() < RECORD_HEADER_SIZE) {
+ throw new BufferUnderflowException();
+ }
+
+ // Is it a handshake message?
+ byte firstByte = input.get();
+ byte secondByte = input.get();
+ byte thirdByte = input.get();
+ if ((firstByte & 0x80) != 0 && thirdByte == 0x01) {
+ // looks like a V2ClientHello
+ // return (((firstByte & 0x7F) << 8) | (secondByte & 0xFF)) + 2;
+ return RECORD_HEADER_SIZE; // Only need the header fields
+ } else {
+ return (((input.get() & 0xFF) << 8) | (input.get() & 0xFF)) + 5;
+ }
+ }
+
+ /**
+ * Returns the required number of bytes in the {@code source} byte array
+ * necessary to explore SSL/TLS connection.
+ * <P>
+ * This method tries to parse as few bytes as possible from
+ * {@code source} byte array to get the length of an
+ * SSL/TLS record.
+ *
+ * @param source
+ * a byte array containing inbound or outbound network data for
+ * an SSL/TLS connection.
+ * @param offset
+ * the start offset in array {@code source} at which the
+ * network data is read from.
+ * @param length
+ * the maximum number of bytes to read.
+ *
+ * @throws BufferUnderflowException if less than {@code RECORD_HEADER_SIZE}
+ * bytes remaining in {@code source}
+ * @return the required size in byte to explore an SSL/TLS connection
+ */
+ public final static int getRequiredSize(byte[] source,
+ int offset, int length) throws IOException {
+
+ ByteBuffer byteBuffer =
+ ByteBuffer.wrap(source, offset, length).asReadOnlyBuffer();
+ return getRequiredSize(byteBuffer);
+ }
+
+ /**
+ * Launch and explore the security capabilities from byte buffer.
+ * <P>
+ * This method tries to parse as few records as possible from
+ * {@code source} byte buffer to get the {@link SSLCapabilities}
+ * of an SSL/TLS connection.
+ * <P>
+ * Please NOTE that this method must be called before any handshaking
+ * occurs. The behavior of this method is not defined in this release
+ * if the handshake has begun, or has completed.
+ * <P>
+ * This method accesses the {@code source} parameter in read-only
+ * mode, and does not update the buffer's properties such as capacity,
+ * limit, position, and mark values.
+ *
+ * @param source
+ * a {@link ByteBuffer} containing
+ * inbound or outbound network data for an SSL/TLS connection.
+ *
+ * @throws IOException on network data error
+ * @throws BufferUnderflowException if not enough source bytes available
+ * to make a complete exploration.
+ *
+ * @return the explored {@link SSLCapabilities} of the SSL/TLS
+ * connection
+ */
+ public final static SSLCapabilities explore(ByteBuffer source)
+ throws IOException {
+
+ ByteBuffer input = source.duplicate();
+
+ // Do we have a complete header?
+ if (input.remaining() < RECORD_HEADER_SIZE) {
+ throw new BufferUnderflowException();
+ }
+
+ // Is it a handshake message?
+ byte firstByte = input.get();
+ byte secondByte = input.get();
+ byte thirdByte = input.get();
+ if ((firstByte & 0x80) != 0 && thirdByte == 0x01) {
+ // looks like a V2ClientHello
+ return exploreV2HelloRecord(input,
+ firstByte, secondByte, thirdByte);
+ } else if (firstByte == 22) { // 22: handshake record
+ return exploreTLSRecord(input,
+ firstByte, secondByte, thirdByte);
+ } else {
+ throw new SSLException("Not handshake record");
+ }
+ }
+
+ /**
+ * Launch and explore the security capabilities from byte array.
+ * <P>
+ * Please NOTE that this method must be called before any handshaking
+ * occurs. The behavior of this method is not defined in this release
+ * if the handshake has begun, or has completed. Once handshake has
+ * begun, or has completed, the security capabilities can not and
+ * should not be launched with this method.
+ *
+ * @param source
+ * a byte array containing inbound or outbound network data for
+ * an SSL/TLS connection.
+ * @param offset
+ * the start offset in array {@code source} at which the
+ * network data is read from.
+ * @param length
+ * the maximum number of bytes to read.
+ *
+ * @throws IOException on network data error
+ * @throws BufferUnderflowException if not enough source bytes available
+ * to make a complete exploration.
+ * @return the explored {@link SSLCapabilities} of the SSL/TLS
+ * connection
+ *
+ * @see #explore(ByteBuffer)
+ */
+ public final static SSLCapabilities explore(byte[] source,
+ int offset, int length) throws IOException {
+ ByteBuffer byteBuffer =
+ ByteBuffer.wrap(source, offset, length).asReadOnlyBuffer();
+ return explore(byteBuffer);
+ }
+
+ /*
+ * uint8 V2CipherSpec[3];
+ * struct {
+ * uint16 msg_length; // The highest bit MUST be 1;
+ * // the remaining bits contain the length
+ * // of the following data in bytes.
+ * uint8 msg_type; // MUST be 1
+ * Version version;
+ * uint16 cipher_spec_length; // It cannot be zero and MUST be a
+ * // multiple of the V2CipherSpec length.
+ * uint16 session_id_length; // This field MUST be empty.
+ * uint16 challenge_length; // SHOULD use a 32-byte challenge
+ * V2CipherSpec cipher_specs[V2ClientHello.cipher_spec_length];
+ * opaque session_id[V2ClientHello.session_id_length];
+ * opaque challenge[V2ClientHello.challenge_length;
+ * } V2ClientHello;
+ */
+ private static SSLCapabilities exploreV2HelloRecord(
+ ByteBuffer input, byte firstByte, byte secondByte,
+ byte thirdByte) throws IOException {
+
+ // We only need the header. We have already had enough source bytes.
+ // int recordLength = (firstByte & 0x7F) << 8) | (secondByte & 0xFF);
+ try {
+ // Is it a V2ClientHello?
+ if (thirdByte != 0x01) {
+ throw new SSLException(
+ "Unsupported or Unrecognized SSL record");
+ }
+
+ // What's the hello version?
+ byte helloVersionMajor = input.get();
+ byte helloVersionMinor = input.get();
+
+ // 0x00: major version of SSLv20
+ // 0x02: minor version of SSLv20
+ //
+ // SNIServerName is an extension, SSLv20 doesn't support extension.
+ return new SSLCapabilitiesImpl((byte)0x00, (byte)0x02,
+ helloVersionMajor, helloVersionMinor,
+ Collections.<SNIServerName>emptyList());
+ } catch (BufferUnderflowException bufe) {
+ throw new SSLProtocolException(
+ "Invalid handshake record");
+ }
+ }
+
+ /*
+ * struct {
+ * uint8 major;
+ * uint8 minor;
+ * } ProtocolVersion;
+ *
+ * enum {
+ * change_cipher_spec(20), alert(21), handshake(22),
+ * application_data(23), (255)
+ * } ContentType;
+ *
+ * struct {
+ * ContentType type;
+ * ProtocolVersion version;
+ * uint16 length;
+ * opaque fragment[TLSPlaintext.length];
+ * } TLSPlaintext;
+ */
+ private static SSLCapabilities exploreTLSRecord(
+ ByteBuffer input, byte firstByte, byte secondByte,
+ byte thirdByte) throws IOException {
+
+ // Is it a handshake message?
+ if (firstByte != 22) { // 22: handshake record
+ throw new SSLException("Not handshake record");
+ }
+
+ // We need the record version to construct SSLCapabilities.
+ byte recordMajorVersion = secondByte;
+ byte recordMinorVersion = thirdByte;
+
+ // Is there enough data for a full record?
+ int recordLength = getInt16(input);
+ if (recordLength > input.remaining()) {
+ throw new BufferUnderflowException();
+ }
+
+ // We have already had enough source bytes.
+ try {
+ return exploreHandshake(input,
+ recordMajorVersion, recordMinorVersion, recordLength);
+ } catch (BufferUnderflowException bufe) {
+ throw new SSLProtocolException(
+ "Invalid handshake record");
+ }
+ }
+
+ /*
+ * enum {
+ * hello_request(0), client_hello(1), server_hello(2),
+ * certificate(11), server_key_exchange (12),
+ * certificate_request(13), server_hello_done(14),
+ * certificate_verify(15), client_key_exchange(16),
+ * finished(20)
+ * (255)
+ * } HandshakeType;
+ *
+ * struct {
+ * HandshakeType msg_type;
+ * uint24 length;
+ * select (HandshakeType) {
+ * case hello_request: HelloRequest;
+ * case client_hello: ClientHello;
+ * case server_hello: ServerHello;
+ * case certificate: Certificate;
+ * case server_key_exchange: ServerKeyExchange;
+ * case certificate_request: CertificateRequest;
+ * case server_hello_done: ServerHelloDone;
+ * case certificate_verify: CertificateVerify;
+ * case client_key_exchange: ClientKeyExchange;
+ * case finished: Finished;
+ * } body;
+ * } Handshake;
+ */
+ private static SSLCapabilities exploreHandshake(
+ ByteBuffer input, byte recordMajorVersion,
+ byte recordMinorVersion, int recordLength) throws IOException {
+
+ // What is the handshake type?
+ byte handshakeType = input.get();
+ if (handshakeType != 0x01) { // 0x01: client_hello message
+ throw new IllegalStateException("Not initial handshaking");
+ }
+
+ // What is the handshake body length?
+ int handshakeLength = getInt24(input);
+
+ // Theoretically, a single handshake message might span multiple
+ // records, but in practice this does not occur.
+ if (handshakeLength > (recordLength - 4)) { // 4: handshake header size
+ throw new SSLException("Handshake message spans multiple records");
+ }
+
+ input = input.duplicate();
+ input.limit(handshakeLength + input.position());
+ return exploreClientHello(input,
+ recordMajorVersion, recordMinorVersion);
+ }
+
+ /*
+ * struct {
+ * uint32 gmt_unix_time;
+ * opaque random_bytes[28];
+ * } Random;
+ *
+ * opaque SessionID<0..32>;
+ *
+ * uint8 CipherSuite[2];
+ *
+ * enum { null(0), (255) } CompressionMethod;
+ *
+ * struct {
+ * ProtocolVersion client_version;
+ * Random random;
+ * SessionID session_id;
+ * CipherSuite cipher_suites<2..2^16-2>;
+ * CompressionMethod compression_methods<1..2^8-1>;
+ * select (extensions_present) {
+ * case false:
+ * struct {};
+ * case true:
+ * Extension extensions<0..2^16-1>;
+ * };
+ * } ClientHello;
+ */
+ private static SSLCapabilities exploreClientHello(
+ ByteBuffer input,
+ byte recordMajorVersion,
+ byte recordMinorVersion) throws IOException {
+
+ List<SNIServerName> snList = Collections.<SNIServerName>emptyList();
+
+ // client version
+ byte helloMajorVersion = input.get();
+ byte helloMinorVersion = input.get();
+
+ // ignore random
+ int position = input.position();
+ input.position(position + 32); // 32: the length of Random
+
+ // ignore session id
+ ignoreByteVector8(input);
+
+ // ignore cipher_suites
+ ignoreByteVector16(input);
+
+ // ignore compression methods
+ ignoreByteVector8(input);
+
+ if (input.remaining() > 0) {
+ snList = exploreExtensions(input);
+ }
+
+ return new SSLCapabilitiesImpl(
+ recordMajorVersion, recordMinorVersion,
+ helloMajorVersion, helloMinorVersion, snList);
+ }
+
+ /*
+ * struct {
+ * ExtensionType extension_type;
+ * opaque extension_data<0..2^16-1>;
+ * } Extension;
+ *
+ * enum {
+ * server_name(0), max_fragment_length(1),
+ * client_certificate_url(2), trusted_ca_keys(3),
+ * truncated_hmac(4), status_request(5), (65535)
+ * } ExtensionType;
+ */
+ private static List<SNIServerName> exploreExtensions(ByteBuffer input)
+ throws IOException {
+
+ int length = getInt16(input); // length of extensions
+ while (length > 0) {
+ int extType = getInt16(input); // extenson type
+ int extLen = getInt16(input); // length of extension data
+
+ if (extType == 0x00) { // 0x00: type of server name indication
+ return exploreSNIExt(input, extLen);
+ } else { // ignore other extensions
+ ignoreByteVector(input, extLen);
+ }
+
+ length -= extLen + 4;
+ }
+
+ return Collections.<SNIServerName>emptyList();
+ }
+
+ /*
+ * struct {
+ * NameType name_type;
+ * select (name_type) {
+ * case host_name: HostName;
+ * } name;
+ * } ServerName;
+ *
+ * enum {
+ * host_name(0), (255)
+ * } NameType;
+ *
+ * opaque HostName<1..2^16-1>;
+ *
+ * struct {
+ * ServerName server_name_list<1..2^16-1>
+ * } ServerNameList;
+ */
+ private static List<SNIServerName> exploreSNIExt(ByteBuffer input,
+ int extLen) throws IOException {
+
+ Map<Integer, SNIServerName> sniMap = new LinkedHashMap<>();
+
+ int remains = extLen;
+ if (extLen >= 2) { // "server_name" extension in ClientHello
+ int listLen = getInt16(input); // length of server_name_list
+ if (listLen == 0 || listLen + 2 != extLen) {
+ throw new SSLProtocolException(
+ "Invalid server name indication extension");
+ }
+
+ remains -= 2; // 0x02: the length field of server_name_list
+ while (remains > 0) {
+ int code = getInt8(input); // name_type
+ int snLen = getInt16(input); // length field of server name
+ if (snLen > remains) {
+ throw new SSLProtocolException(
+ "Not enough data to fill declared vector size");
+ }
+ byte[] encoded = new byte[snLen];
+ input.get(encoded);
+
+ SNIServerName serverName;
+ switch (code) {
+ case StandardConstants.SNI_HOST_NAME:
+ if (encoded.length == 0) {
+ throw new SSLProtocolException(
+ "Empty HostName in server name indication");
+ }
+ serverName = new SNIHostName(encoded);
+ break;
+ default:
+ serverName = new UnknownServerName(code, encoded);
+ }
+ // check for duplicated server name type
+ if (sniMap.put(serverName.getType(), serverName) != null) {
+ throw new SSLProtocolException(
+ "Duplicated server name of type " +
+ serverName.getType());
+ }
+
+ remains -= encoded.length + 3; // NameType: 1 byte
+ // HostName length: 2 bytes
+ }
+ } else if (extLen == 0) { // "server_name" extension in ServerHello
+ throw new SSLProtocolException(
+ "Not server name indication extension in client");
+ }
+
+ if (remains != 0) {
+ throw new SSLProtocolException(
+ "Invalid server name indication extension");
+ }
+
+ return Collections.<SNIServerName>unmodifiableList(
+ new ArrayList<>(sniMap.values()));
+ }
+
+ private static int getInt8(ByteBuffer input) {
+ return input.get();
+ }
+
+ private static int getInt16(ByteBuffer input) {
+ return ((input.get() & 0xFF) << 8) | (input.get() & 0xFF);
+ }
+
+ private static int getInt24(ByteBuffer input) {
+ return ((input.get() & 0xFF) << 16) | ((input.get() & 0xFF) << 8) |
+ (input.get() & 0xFF);
+ }
+
+ private static void ignoreByteVector8(ByteBuffer input) {
+ ignoreByteVector(input, getInt8(input));
+ }
+
+ private static void ignoreByteVector16(ByteBuffer input) {
+ ignoreByteVector(input, getInt16(input));
+ }
+
+ private static void ignoreByteVector24(ByteBuffer input) {
+ ignoreByteVector(input, getInt24(input));
+ }
+
+ private static void ignoreByteVector(ByteBuffer input, int length) {
+ if (length != 0) {
+ int position = input.position();
+ input.position(position + length);
+ }
+ }
+
+ private static class UnknownServerName extends SNIServerName {
+ UnknownServerName(int code, byte[] encoded) {
+ super(code, encoded);
+ }
+ }
+
+ private static final class SSLCapabilitiesImpl extends SSLCapabilities {
+ private final static Map<Integer, String> versionMap = new HashMap<>(5);
+
+ private final String recordVersion;
+ private final String helloVersion;
+ List<SNIServerName> sniNames;
+
+ static {
+ versionMap.put(0x0002, "SSLv2Hello");
+ versionMap.put(0x0300, "SSLv3");
+ versionMap.put(0x0301, "TLSv1");
+ versionMap.put(0x0302, "TLSv1.1");
+ versionMap.put(0x0303, "TLSv1.2");
+ }
+
+ SSLCapabilitiesImpl(byte recordMajorVersion, byte recordMinorVersion,
+ byte helloMajorVersion, byte helloMinorVersion,
+ List<SNIServerName> sniNames) {
+
+ int version = (recordMajorVersion << 8) | recordMinorVersion;
+ this.recordVersion = versionMap.get(version) != null ?
+ versionMap.get(version) :
+ unknownVersion(recordMajorVersion, recordMinorVersion);
+
+ version = (helloMajorVersion << 8) | helloMinorVersion;
+ this.helloVersion = versionMap.get(version) != null ?
+ versionMap.get(version) :
+ unknownVersion(helloMajorVersion, helloMinorVersion);
+
+ this.sniNames = sniNames;
+ }
+
+ @Override
+ public String getRecordVersion() {
+ return recordVersion;
+ }
+
+ @Override
+ public String getHelloVersion() {
+ return helloVersion;
+ }
+
+ @Override
+ public List<SNIServerName> getServerNames() {
+ if (!sniNames.isEmpty()) {
+ return Collections.<SNIServerName>unmodifiableList(sniNames);
+ }
+
+ return sniNames;
+ }
+
+ private static String unknownVersion(byte major, byte minor) {
+ return "Unknown-" + ((int)major) + "." + ((int)minor);
+ }
+ }
+}
+
diff --git a/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java b/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java
index c0cae08..5b211d1 100644
--- a/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java
+++ b/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java
@@ -62,7 +62,7 @@
"-signedJar", signedJar,
unsignedJar, "b"
};
- JarSigner.main(jsArgs);
+ sun.security.tools.jarsigner.Main.main(jsArgs);
// verify the signed jar file
diff --git a/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java b/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java
index 280160b2..364d544 100644
--- a/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java
+++ b/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java
@@ -35,7 +35,6 @@
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.zip.CRC32;
-import sun.security.tools.JarSigner;
public class LargeJarEntry {
@@ -73,7 +72,7 @@
jarName, "b" };
// now, try to sign it
try {
- JarSigner.main(jsArgs);
+ sun.security.tools.jarsigner.Main.main(jsArgs);
} catch (OutOfMemoryError err) {
throw new Exception("Test failed with OutOfMemoryError", err);
} finally {
diff --git a/jdk/test/sun/security/tools/keytool/CloseFile.java b/jdk/test/sun/security/tools/keytool/CloseFile.java
index b1b83a4..82c3e44 100644
--- a/jdk/test/sun/security/tools/keytool/CloseFile.java
+++ b/jdk/test/sun/security/tools/keytool/CloseFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,12 +26,13 @@
* @bug 6489721
* @summary keytool has not closed several file streams
* @author weijun.wang
+ * @compile -XDignore.symbol.file CloseFile.java
+ * @run main CloseFile
*
* This test is only useful on Windows, which fails before the fix and succeeds
* after it. On other platforms, it always passes.
*/
-import sun.security.tools.KeyTool;
import java.io.*;
public class CloseFile {
@@ -58,7 +59,7 @@
}
static void run(String s) throws Exception {
- KeyTool.main((s+" -debug").split(" "));
+ sun.security.tools.keytool.Main.main((s+" -debug").split(" "));
}
static void remove(String filename, boolean check) {
new File(filename).delete();
diff --git a/jdk/test/sun/security/tools/keytool/KeyToolTest.java b/jdk/test/sun/security/tools/keytool/KeyToolTest.java
index 573f9be..e86af93 100644
--- a/jdk/test/sun/security/tools/keytool/KeyToolTest.java
+++ b/jdk/test/sun/security/tools/keytool/KeyToolTest.java
@@ -56,7 +56,6 @@
*/
import java.security.KeyStore;
-import sun.security.tools.KeyTool;
import sun.security.x509.*;
import java.io.*;
import java.security.KeyPairGenerator;
@@ -149,12 +148,13 @@
System.setOut(new PrintStream(b1));
System.setErr(new PrintStream(b2));
- // since System.in is overrided, the KeyTool.main() method will
+ // since System.in is overrided, the
+ // sun.security.tools.keytool.Main.main() method will
// never block at user input
- // use -debug so that KeyTool.main() will throw an Exception
+ // use -debug so that main() will throw an Exception
// instead of calling System.exit()
- KeyTool.main(("-debug "+cmd).split("\\s+"));
+ sun.security.tools.keytool.Main.main(("-debug "+cmd).split("\\s+"));
} finally {
out = b1.toString();
err = b2.toString();
diff --git a/jdk/test/sun/security/tools/keytool/NewSize7.java b/jdk/test/sun/security/tools/keytool/NewSize7.java
index ab8ef5cb..2e5ee6e 100644
--- a/jdk/test/sun/security/tools/keytool/NewSize7.java
+++ b/jdk/test/sun/security/tools/keytool/NewSize7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -25,6 +25,8 @@
* @test
* @bug 6561126
* @summary keytool should use larger default keysize for keypairs
+ * @compile -XDignore.symbol.file NewSize7.java
+ * @run main NewSize7
*/
import java.io.File;
@@ -34,13 +36,13 @@
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.security.interfaces.RSAPublicKey;
-import sun.security.tools.KeyTool;
public class NewSize7 {
public static void main(String[] args) throws Exception {
String FILE = "newsize7-ks";
new File(FILE).delete();
- KeyTool.main(("-debug -genkeypair -keystore " + FILE +
+ sun.security.tools.keytool.Main.main(("-debug -genkeypair -keystore " +
+ FILE +
" -alias a -dname cn=c -storepass changeit" +
" -keypass changeit -keyalg rsa").split(" "));
KeyStore ks = KeyStore.getInstance("JKS");
diff --git a/jdk/test/sun/security/tools/keytool/StartDateTest.java b/jdk/test/sun/security/tools/keytool/StartDateTest.java
index bb64480..597c745 100644
--- a/jdk/test/sun/security/tools/keytool/StartDateTest.java
+++ b/jdk/test/sun/security/tools/keytool/StartDateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,8 @@
* @test
* @bug 6468285
* @summary keytool ability to backdate self-signed certificates to compensate for clock skew
+ * @compile -XDignore.symbol.file StartDateTest.java
+ * @run main StartDateTest
*/
import java.io.File;
@@ -35,7 +37,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import sun.security.tools.KeyTool;
public class StartDateTest {
public static void main(String[] args) throws Exception {
@@ -66,7 +67,8 @@
new File("jks").delete();
// Part 2: Test format
- Method m = KeyTool.class.getDeclaredMethod("getStartDate", String.class);
+ Method m = sun.security.tools.keytool.Main.class.getDeclaredMethod(
+ "getStartDate", String.class);
m.setAccessible(true);
for (String s: new String[] {
null, //NOW!
@@ -127,7 +129,7 @@
}
static void run(String s) throws Exception {
- KeyTool.main((s+" -debug").split(" "));
+ sun.security.tools.keytool.Main.main((s+" -debug").split(" "));
}
static Date getIssueDate() throws Exception {
diff --git a/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java b/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java
index 5c587ac..cb8cbad 100644
--- a/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java
+++ b/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java
@@ -25,12 +25,13 @@
* @test
* @bug 7192202
* @summary Make sure keytool prints both unknown and unparseable extensions
+ * @compile -XDignore.symbol.file UnknownAndUnparseable.java
+ * @run main UnknownAndUnparseable
*/
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
-import sun.security.tools.KeyTool;
import sun.security.x509.PKIXExtensions;
public class UnknownAndUnparseable {
@@ -44,14 +45,14 @@
String genkey = s
+ "-genkeypair -alias a -dname CN=A -ext 1.2.3.4=1234 "
+ "-ext " + PKIXExtensions.KeyUsage_Id.toString() + "=5678";
- KeyTool.main(genkey.split(" "));
+ sun.security.tools.keytool.Main.main(genkey.split(" "));
// Get the list output to a string
String list = s + "-list -v";
ByteArrayOutputStream bout = new ByteArrayOutputStream();
PrintStream oldOut = System.out;
System.setOut(new PrintStream(bout));
- KeyTool.main(list.split(" "));
+ sun.security.tools.keytool.Main.main(list.split(" "));
System.setOut(oldOut);
String out = bout.toString();
System.out.println(out);
diff --git a/jdk/test/sun/security/tools/keytool/autotest.sh b/jdk/test/sun/security/tools/keytool/autotest.sh
index ea4c3f2..56836d1 100644
--- a/jdk/test/sun/security/tools/keytool/autotest.sh
+++ b/jdk/test/sun/security/tools/keytool/autotest.sh
@@ -78,7 +78,7 @@
esac
if [ "$LIBNAME" = "" ]; then
- echo "Cannot find LIBNAME"
+ echo "Cannot find libsoftokn3.so"
exit 1
fi
diff --git a/jdk/test/sun/security/tools/keytool/standard.sh b/jdk/test/sun/security/tools/keytool/standard.sh
index 98e3b03..6dd2a35 100644
--- a/jdk/test/sun/security/tools/keytool/standard.sh
+++ b/jdk/test/sun/security/tools/keytool/standard.sh
@@ -56,7 +56,7 @@
;;
esac
-${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}KeyToolTest.java || exit 10
+${TESTJAVA}${FS}bin${FS}javac -d . -XDignore.symbol.file ${TESTSRC}${FS}KeyToolTest.java || exit 10
echo | ${TESTJAVA}${FS}bin${FS}java -Dfile KeyToolTest
status=$?
diff --git a/jdk/test/sun/security/util/Resources/Format.java b/jdk/test/sun/security/util/Resources/Format.java
index 5241d28..3cc8cd0 100644
--- a/jdk/test/sun/security/util/Resources/Format.java
+++ b/jdk/test/sun/security/util/Resources/Format.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -150,7 +150,7 @@
s.getPrivateCredentials().add(new Format());
System.out.println("Test 12, s.toString() = " + s.toString());
} catch (Exception e) {
- throw new SecurityException("test 12 failed: e.toString()");
+ throw new SecurityException("test 12 failed: e.toString()", e);
}
try {
diff --git a/jdk/test/sun/security/util/Resources/NewNamesFormat.java b/jdk/test/sun/security/util/Resources/NewNamesFormat.java
index 9c3b452..f97747e 100644
--- a/jdk/test/sun/security/util/Resources/NewNamesFormat.java
+++ b/jdk/test/sun/security/util/Resources/NewNamesFormat.java
@@ -40,7 +40,9 @@
public static void main(String[] args) throws Exception {
checkRes("sun.security.util.Resources");
checkRes("sun.security.util.AuthResources");
- checkRes("sun.security.tools.JarSignerResources");
+ checkRes("sun.security.tools.jarsigner.Resources");
+ checkRes("sun.security.tools.keytool.Resources");
+ checkRes("sun.security.tools.policytool.Resources");
}
private static void checkRes(String resName) throws Exception {
diff --git a/jdk/test/sun/security/util/Resources/NewResourcesNames.java b/jdk/test/sun/security/util/Resources/NewResourcesNames.java
index 72078b5..c0db954 100644
--- a/jdk/test/sun/security/util/Resources/NewResourcesNames.java
+++ b/jdk/test/sun/security/util/Resources/NewResourcesNames.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -59,7 +59,9 @@
static int MAXLEN = 127;
static String[] resources = {
- "sun/security/tools/JarSignerResources.java",
+ "sun/security/tools/jarsigner/Resources.java",
+ "sun/security/tools/keytool/Resources.java",
+ "sun/security/tools/policytool/Resources.java",
"sun/security/util/Resources.java",
"sun/security/util/AuthResources.java",
};
@@ -94,7 +96,7 @@
//
// This means a " exists right after getString(. Sometimes you see
//
- // Working on sun/security/tools/KeyTool.java
+ // Working on sun/security/tools/keytool/Main.java
// BAD!! pmatch != match: 212 != 209
// Working on sun/security/provider/PolicyFile.java
// BAD!! pmatch != match: 14 != 10
@@ -165,7 +167,7 @@
Set<String> names = new HashSet<String>();
- String file = "sun/security/tools/KeyTool.java";
+ String file = "sun/security/tools/keytool/Main.java";
System.err.println("Working on " + file);
File origFile = new File(file);
File tmpFile = new File(file + ".tmp");
diff --git a/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java b/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java
index 9870db3..c6ca55c 100644
--- a/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java
+++ b/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java
@@ -25,6 +25,8 @@
* @test
* @bug 7180907
* @summary Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
+ * @compile -XDignore.symbol.file NonStandardNames.java
+ * @run main NonStandardNames
*/
import java.security.MessageDigest;
@@ -35,7 +37,7 @@
import sun.security.pkcs.PKCS9Attribute;
import sun.security.pkcs.PKCS9Attributes;
import sun.security.pkcs.SignerInfo;
-import sun.security.tools.CertAndKeyGen;
+import sun.security.tools.keytool.CertAndKeyGen;
import sun.security.x509.AlgorithmId;
import sun.security.x509.X500Name;
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 080bdc4..387f4d6 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -183,3 +183,4 @@
f299927fc31689385f67ab7322c18eb41d8bd71e jdk8-b59
3d2b98ffcb534b0e5be87bb1f9f68d1518ad7729 jdk8-b60
26020b247ad3806dbca33e029ee12e1b191f59f9 jdk8-b61
+b47bb81ba962ef80bb6f0b863c33a0afcfb0b49e jdk8-b62
diff --git a/langtools/makefiles/BuildLangtools.gmk b/langtools/makefiles/BuildLangtools.gmk
new file mode 100644
index 0000000..c587070
--- /dev/null
+++ b/langtools/makefiles/BuildLangtools.gmk
@@ -0,0 +1,205 @@
+#
+# Copyright (c) 2011, 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.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
+# and the bootstrap javac, to be run by the bootdir jvm.
+$(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
+ JAVAC:=$(JAVAC),\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
+ FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
+
+# Now setup the compilation of the properties compilation tool. You can depend
+# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
+# add src/share/classes to the sourcepath. This is necessary since the GenStubs
+# program needs to be linked and run towards the new javac sources.
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
+ SETUP:=BOOT_JAVAC,\
+ DISABLE_SJAVAC:=true,\
+ ADD_JAVAC_FLAGS:=-Xprefer:source,\
+ SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\
+ INCLUDES:=compileproperties genstubs,\
+ BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses))
+
+# The compileprops tools compiles a properties file into a resource bundle.
+TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
+# Lookup the properties that need to be compiled into resource bundles.
+PROPSOURCES:=$(shell find $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
+# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
+PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES))
+# Generate the list of java files to be created.
+PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS))
+# Generate the package dirs for the tobe generated java files.
+PROPDIRS:=$(dir $(PROPJAVAS))
+# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
+# suitable to be fed into the CompileProperties command.
+PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \
+ $(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS))))))
+
+# Now setup the rule for the generation of the resource bundles.
+$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS)
+ rm -rf $(@D)/*
+ mkdir -p $(@D) $(PROPDIRS)
+ printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
+ printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
+ printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
+ echo Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
+ $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
+ java.util.ListResourceBundle
+ echo PROPS_ARE_CREATED=yes > $@
+
+# Trigger the generation of the resource bundles. After the resource bundles have
+# been compiled, then the makefile will restart and the newly created java files
+# will become part of the build further along in the makefile.
+-include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+
+ifeq ($(PROPS_ARE_CREATED),yes)
+ # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
+ # that can be compiled with an old javac. The intermediate javac is then used
+ # to compile javac again and to build the complete new jdk.
+ $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\
+ SETUP:=BOOT_JAVAC,\
+ DISABLE_SJAVAC:=true,\
+ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
+ EXCLUDES:=com/sun/tools/javac/nio,\
+ BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
+
+ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
+ SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
+ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
+ JARMAIN:=com.sun.tools.javac.Main))
+
+ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
+ SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
+ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
+ JARMAIN:=com.sun.tools.javah.Main))
+
+ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
+ SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
+ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
+ JARMAIN:=com.sun.tools.javap.Main))
+
+ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
+ SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
+ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
+ JARMAIN:=com.sun.tools.javadoc.Main))
+
+ # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
+ # yet built. It is currently not needed but might be again in the future. The following
+ # exercises the functionality to verify that it works.
+ TOOL_GENSTUBS_CMD=$(JAVA) \
+ "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
+ genstubs.GenStubs
+ # We fetch source from the JDK...
+ JDKS=$(JDK_TOPDIR)/src/share/classes
+ # Build the list of classes to generate stubs from. java/util/Objects.java isn't
+ # currently needed, but is used as a demo for now.
+ STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
+ -e "$(JDKS)/java/util/Objects.java")
+ # Rewrite the file names into class names because the GenStubs tool require this.
+ STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES)))
+
+ # Now setup the build recipe for genstubs.
+ $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+ mkdir -p $(@D)
+ mkdir -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
+ echo $(LOG_INFO) Generating stubs from JDK sources.
+ ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && echo STUBS_ARE_CREATED=yes > $@)
+ if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
+ echo $(LOG_INFO) No changes in the stubs!; \
+ rm -rf $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
+ else \
+ echo $(LOG_INFO) Changes in stubs detected!; \
+ rm -rf $(@D); \
+ mv $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
+ fi
+ echo STUBS_ARE_CREATED=yes > $@
+
+ # Trigger a generation of the genstubs java source code and a restart
+ # of the makefile to make sure that the following build setup use the
+ # newly created java files.
+ -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
+
+ ifeq ($(STUBS_ARE_CREATED),yes)
+ # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
+ # that generates code for the new jdk that is being built.
+ # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
+ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
+ JVM:=$(JAVA),\
+ JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
+ FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
+ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+ # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
+ RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool
+
+ $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
+ SETUP:=GENERATE_NEWBYTECODE,\
+ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
+ $(LANGTOOLS_OUTPUTDIR)/genstubs,\
+ EXCLUDES:=java/util java/io java/nio,\
+ COPY:=$(RESOURCE_SUFFIXES),\
+ BIN:=$(LANGTOOLS_OUTPUTDIR)/classes))
+
+ $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\
+ SETUP:=GENERATE_NEWBYTECODE,\
+ SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
+ SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
+ JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
+
+ $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
+ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
+ ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
+
+ all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
+ $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
+
+
+ endif
+endif
diff --git a/langtools/makefiles/Makefile b/langtools/makefiles/Makefile
index 2f8b4e0..9539fe0 100644
--- a/langtools/makefiles/Makefile
+++ b/langtools/makefiles/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,183 +23,27 @@
# questions.
#
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
-# and the bootstrap javac, to be run by the bootdir jvm.
-$(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
- JAVAC:=$(JAVAC),\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
- FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
-
-# Now setup the compilation of the properties compilation tool. You can depend
-# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
-# add src/share/classes to the sourcepath. This is necessary since the GenStubs
-# program needs to be linked and run towards the new javac sources.
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
- SETUP:=BOOT_JAVAC,\
- DISABLE_SJAVAC:=true,\
- ADD_JAVAC_FLAGS:=-Xprefer:source,\
- SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\
- INCLUDES:=compileproperties genstubs,\
- BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses))
-
-# The compileprops tools compiles a properties file into a resource bundle.
-TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
-# Lookup the properties that need to be compiled into resource bundles.
-PROPSOURCES:=$(shell find $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
-# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
-PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES))
-# Generate the list of java files to be created.
-PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS))
-# Generate the package dirs for the tobe generated java files.
-PROPDIRS:=$(dir $(PROPJAVAS))
-# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
-# suitable to be fed into the CompileProperties command.
-PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \
- $(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS))))))
-
-# Now setup the rule for the generation of the resource bundles.
-$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS)
- rm -rf $(@D)/*
- mkdir -p $(@D) $(PROPDIRS)
- printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
- printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
- printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
- echo Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
- $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
- java.util.ListResourceBundle \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
- java.util.ListResourceBundle \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
- java.util.ListResourceBundle
- echo PROPS_ARE_CREATED=yes > $@
-
-# Trigger the generation of the resource bundles. After the resource bundles have
-# been compiled, then the makefile will restart and the newly created java files
-# will become part of the build further along in the makefile.
--include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
-
-ifeq ($(PROPS_ARE_CREATED),yes)
- # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
- # that can be compiled with an old javac. The intermediate javac is then used
- # to compile javac again and to build the complete new jdk.
- $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\
- SETUP:=BOOT_JAVAC,\
- DISABLE_SJAVAC:=true,\
- SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
- EXCLUDES:=com/sun/tools/javac/nio,\
- BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
- JARMAIN:=com.sun.tools.javac.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
- JARMAIN:=com.sun.tools.javah.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
- JARMAIN:=com.sun.tools.javap.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
- JARMAIN:=com.sun.tools.javadoc.Main))
-
- # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
- # yet built. It is currently not needed but might be again in the future. The following
- # exercises the functionality to verify that it works.
- TOOL_GENSTUBS_CMD=$(JAVA) \
- "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
- genstubs.GenStubs
- # We fetch source from the JDK...
- JDKS=$(JDK_TOPDIR)/src/share/classes
- # Build the list of classes to generate stubs from. java/util/Objects.java isn't
- # currently needed, but is used as a demo for now.
- STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
- -e "$(JDKS)/java/util/Objects.java")
- # Rewrite the file names into class names because the GenStubs tool require this.
- STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES)))
-
- # Now setup the build recipe for genstubs.
- $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
- mkdir -p $(@D)
- mkdir -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
- echo Generating stubs from JDK sources.
- ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && echo STUBS_ARE_CREATED=yes > $@)
- if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
- echo No changes in the stubs!; \
- rm -rf $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
- else \
- echo Changes in stubs detected!; \
- rm -rf $(@D); \
- mv $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
- fi
- echo STUBS_ARE_CREATED=yes > $@
-
- # Trigger a generation of the genstubs java source code and a restart
- # of the makefile to make sure that the following build setup use the
- # newly created java files.
- -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
-
- ifeq ($(STUBS_ARE_CREATED),yes)
- # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
- # that generates code for the new jdk that is being built.
- # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
- $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
- JVM:=$(JAVA),\
- JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
- FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
- SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
- SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
-
- # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
- RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool
-
- $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
- SETUP:=GENERATE_NEWBYTECODE,\
- SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
- $(LANGTOOLS_OUTPUTDIR)/genstubs,\
- EXCLUDES:=java/util java/io java/nio,\
- COPY:=$(RESOURCE_SUFFIXES),\
- BIN:=$(LANGTOOLS_OUTPUTDIR)/classes))
-
- $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\
- SETUP:=GENERATE_NEWBYTECODE,\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
- SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
-
- $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
- SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
- ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
-
- all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
-
-
- endif
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
+
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+ $(info Will run $(subsystem_name) target on top-level Makefile)
+ $(info WARNING: This is a non-recommended way of building!)
+ $(info ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
+endif
+
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/langtools/src/share/classes/com/sun/javadoc/Tag.java b/langtools/src/share/classes/com/sun/javadoc/Tag.java
index 96faac5..2e129f5 100644
--- a/langtools/src/share/classes/com/sun/javadoc/Tag.java
+++ b/langtools/src/share/classes/com/sun/javadoc/Tag.java
@@ -70,14 +70,14 @@
* than one tag of a given kind:
* <p>
* <table border="1" cellpadding="4" cellspacing="0">
- * <tr><th><tt> kind() </th> <th><tt> name() </th></tr>
- * <tr><td><tt> @throws </td> <td><tt> @throws </td></tr>
- * <tr><td><tt> @throws </td> <td><tt> @exception </td></tr>
- * <tr><td><tt> @see </td> <td><tt> @see </td></tr>
- * <tr><td><tt> @see </td> <td><tt> @link </td></tr>
- * <tr><td><tt> @see </td> <td><tt> @linkplain </td></tr>
- * <tr><td><tt> @serial </td> <td><tt> @serial </td></tr>
- * <tr><td><tt> @serial </td> <td><tt> @serialData </td></tr>
+ * <tr><th><tt> kind() </tt></th> <th><tt> name() </tt></th></tr>
+ * <tr><td><tt> @throws </tt></td> <td><tt> @throws </tt></td></tr>
+ * <tr><td><tt> @throws </tt></td> <td><tt> @exception </tt></td></tr>
+ * <tr><td><tt> @see </tt></td> <td><tt> @see </tt></td></tr>
+ * <tr><td><tt> @see </tt></td> <td><tt> @link </tt></td></tr>
+ * <tr><td><tt> @see </tt></td> <td><tt> @linkplain </tt></td></tr>
+ * <tr><td><tt> @serial </tt></td> <td><tt> @serial </tt></td></tr>
+ * <tr><td><tt> @serial </tt></td> <td><tt> @serialData </tt></td></tr>
* </table>
*/
String kind();
diff --git a/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java b/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
index 66b585c..e6ff1aa 100644
--- a/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,7 +27,6 @@
import java.util.List;
import javax.tools.JavaFileObject;
-import com.sun.source.tree.LineMap;
/**
* Represents the abstract syntax tree for compilation units (source
diff --git a/langtools/src/share/classes/com/sun/source/tree/Scope.java b/langtools/src/share/classes/com/sun/source/tree/Scope.java
index 441f337..5d86fc8 100644
--- a/langtools/src/share/classes/com/sun/source/tree/Scope.java
+++ b/langtools/src/share/classes/com/sun/source/tree/Scope.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -25,11 +25,9 @@
package com.sun.source.tree;
-import com.sun.source.tree.Tree;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
/**
* Interface for determining locally available program elements, such as
diff --git a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java
index 7f45149..9ade21f 100644
--- a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java
+++ b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,10 +25,11 @@
package com.sun.source.util;
-import com.sun.source.tree.CompilationUnitTree;
import javax.lang.model.element.TypeElement;
import javax.tools.JavaFileObject;
+import com.sun.source.tree.CompilationUnitTree;
+
/**
* Provides details about work that has been done by the JDK Java Compiler, javac.
*
diff --git a/langtools/src/share/classes/com/sun/source/util/TreePath.java b/langtools/src/share/classes/com/sun/source/util/TreePath.java
index 103f624..eef400a 100644
--- a/langtools/src/share/classes/com/sun/source/util/TreePath.java
+++ b/langtools/src/share/classes/com/sun/source/util/TreePath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -25,9 +25,10 @@
package com.sun.source.util;
-import com.sun.source.tree.*;
import java.util.Iterator;
+import com.sun.source.tree.*;
+
/**
* A path of tree nodes, typically used to represent the sequence of ancestor
* nodes of a tree node up to the top level CompilationUnitTree node.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
index 3804333..69d0347 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -28,8 +28,8 @@
import java.io.IOException;
/**
- * See JVMS <TBD>
- * http://cr.openjdk.java.net/~jrose/pres/indy-javadoc-mlvm/
+ * See JVMS 4.7.21
+ * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java b/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
index f40a8d5..6a5bd8c 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,8 @@
package com.sun.tools.classfile;
+import java.util.Map;
+
import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info;
import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info;
@@ -40,7 +42,6 @@
import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info;
import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info;
import com.sun.tools.classfile.ConstantPool.CPInfo;
-import java.util.Map;
/**
* Rewrites a class file using a map of translations.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java b/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java
index cffa778..a339643 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -33,8 +33,8 @@
import java.util.Set;
import java.util.regex.Pattern;
-import com.sun.tools.classfile.Dependency.Finder;
import com.sun.tools.classfile.Dependency.Filter;
+import com.sun.tools.classfile.Dependency.Finder;
import com.sun.tools.classfile.Dependency.Location;
import com.sun.tools.classfile.Type.ArrayType;
import com.sun.tools.classfile.Type.ClassSigType;
@@ -43,7 +43,6 @@
import com.sun.tools.classfile.Type.SimpleType;
import com.sun.tools.classfile.Type.TypeParamType;
import com.sun.tools.classfile.Type.WildcardType;
-
import static com.sun.tools.classfile.ConstantPool.*;
/**
@@ -99,7 +98,7 @@
* Get the ClassFile object for a specified class.
* @param className the name of the class to be returned.
* @return the ClassFile for the given class
- * @throws Dependencies#ClassFileNotFoundException if the classfile cannot be
+ * @throws Dependencies.ClassFileNotFoundException if the classfile cannot be
* found
*/
public ClassFile getClassFile(String className)
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java b/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
index 28db331..7cbc348 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -114,7 +114,7 @@
private String parse(String desc, int start, int end)
throws InvalidDescriptor {
int p = start;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int dims = 0;
count = 0;
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
index a2d36f5..aafb986 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -103,7 +103,7 @@
R visitConstantPoolRefAndValue(Instruction instr, int index, int value, P p);
/** See {@link Kind#LOCAL}. */
R visitLocal(Instruction instr, int index, P p);
- /** See {@link Kind#LOCAL_UBYTE}. */
+ /** See {@link Kind#LOCAL_BYTE}. */
R visitLocalAndValue(Instruction instr, int index, int value, P p);
/** See {@link Kind#DYNAMIC}. */
R visitLookupSwitch(Instruction instr, int default_, int npairs, int[] matches, int[] offsets, P p);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
index 191b392..6633b78 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -33,6 +33,11 @@
/**
* Print method and constructor info.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
@@ -81,7 +86,7 @@
* Add the summary link for the member.
*
* @param context the id of the context where the link will be printed
- * @param classDoc the classDoc that we should link to
+ * @param cd the classDoc that we should link to
* @param member the member being linked to
* @param tdSummary the content tree to which the link will be added
*/
@@ -101,7 +106,7 @@
/**
* Add the inherited summary link for the member.
*
- * @param classDoc the classDoc that we should link to
+ * @param cd the classDoc that we should link to
* @param member the member being linked to
* @param linksTree the content tree to which the link will be added
*/
@@ -138,7 +143,7 @@
* Add all the parameters for the executable member.
*
* @param member the member to write parameters for.
- * @param tree the content tree to which the parameters information will be added.
+ * @param htmltree the content tree to which the parameters information will be added.
*/
protected void addParameters(ExecutableMemberDoc member, Content htmltree) {
addParameters(member, true, htmltree);
@@ -149,7 +154,7 @@
*
* @param member the member to write parameters for.
* @param includeAnnotations true if annotation information needs to be added.
- * @param tree the content tree to which the parameters information will be added.
+ * @param htmltree the content tree to which the parameters information will be added.
*/
protected void addParameters(ExecutableMemberDoc member,
boolean includeAnnotations, Content htmltree) {
@@ -276,7 +281,7 @@
* @return the 1.4.x style anchor for the ExecutableMemberDoc.
*/
protected String getErasureAnchor(ExecutableMemberDoc emd) {
- StringBuffer buf = new StringBuffer(emd.name() + "(");
+ StringBuilder buf = new StringBuilder(emd.name() + "(");
Parameter[] params = emd.parameters();
boolean foundTypeVariable = false;
for (int i = 0; i < params.length; i++) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
index 0284f8a..2e902b3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -29,9 +29,9 @@
import java.util.*;
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate Index for all the Member Names with Indexing in
@@ -39,6 +39,11 @@
* {@link SplitIndexWriter}. It uses the functionality from
* {@link HtmlDocletWriter} to generate the Index Contents.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see IndexBuilder
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
index 27ca14f..df2e8af 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,17 +25,23 @@
package com.sun.tools.doclets.formats.html;
-import java.util.*;
import java.lang.reflect.Modifier;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* The base class for member writers.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Jamie Ho (Re-write)
@@ -181,23 +187,6 @@
*/
protected abstract void addNavDetailLink(boolean link, Content liNav);
- /*** ***/
-
- protected void print(String str) {
- writer.print(str);
- writer.displayLength += str.length();
- }
-
- protected void print(char ch) {
- writer.print(ch);
- writer.displayLength++;
- }
-
- protected void strong(String str) {
- writer.strong(str);
- writer.displayLength += str.length();
- }
-
/**
* Add the member name to the content tree and modifies the display length.
*
@@ -257,7 +246,7 @@
if (len <= 0) {
return "";
}
- StringBuffer sb = new StringBuffer(len);
+ StringBuilder sb = new StringBuilder(len);
for(int i = 0; i < len; i++) {
sb.append(' ');
}
@@ -304,23 +293,6 @@
tdSummaryType.addContent(code);
}
- private void printModifier(ProgramElementDoc member) {
- if (member.isProtected()) {
- print("protected ");
- } else if (member.isPrivate()) {
- print("private ");
- } else if (!member.isPublic()) { // Package private
- writer.printText("doclet.Package_private");
- print(" ");
- }
- if (member.isMethod() && ((MethodDoc)member).isAbstract()) {
- print("abstract ");
- }
- if (member.isStatic()) {
- print("static");
- }
- }
-
/**
* Add the modifier for the member.
*
@@ -364,7 +336,7 @@
* Add the comment for the given member.
*
* @param member the member being documented.
- * @param contentTree the content tree to which the comment will be added.
+ * @param htmltree the content tree to which the comment will be added.
*/
protected void addComment(ProgramElementDoc member, Content htmltree) {
if (member.inlineTags().length > 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
index ef407df..9667b0f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -36,6 +36,11 @@
* Frame and Non-Frame format. This will be sub-classed by to
* generate overview-frame.html as well as overview-summary.html.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
index 2b1b352..ccf82cf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,10 +27,11 @@
import java.io.*;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.formats.html.markup.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Abstract class to print the class hierarchy page for all the Classes. This
@@ -38,6 +39,11 @@
* generate the Package Tree and global Tree(for all the classes and packages)
* pages.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public abstract class AbstractTreeWriter extends HtmlDocletWriter {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
index b68af04..adef39e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -29,9 +29,9 @@
import java.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Generate the file with list of all the classes in this run. This page will be
@@ -39,6 +39,11 @@
* the left-hand top frame. The name of the generated file is
* "allclasses-frame.html".
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Doug Kramer
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
index 77f2327..66c51aa 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -34,6 +34,11 @@
/**
* Writes annotation type optional member documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
index f2418e5..baa725d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -34,6 +34,11 @@
/**
* Writes annotation type required member documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
index 83886de..bb228d2 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,14 +25,22 @@
package com.sun.tools.doclets.formats.html;
+import java.io.IOException;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.builders.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate the Class Information Page.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see com.sun.javadoc.ClassDoc
* @see java.util.Collections
* @see java.util.List
@@ -187,7 +195,7 @@
/**
* {@inheritDoc}
*/
- public void printDocument(Content contentTree) {
+ public void printDocument(Content contentTree) throws IOException {
printHtmlDocument(configuration.metakeywords.getMetaKeywords(annotationType),
true, contentTree);
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
index d0cea94..69edcde 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
@@ -27,14 +27,20 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate class usage information.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert G. Field
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
index cc8411e..5db9e65 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,17 +25,24 @@
package com.sun.tools.doclets.formats.html;
+import java.io.IOException;
import java.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.builders.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate the Class Information Page.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see com.sun.javadoc.ClassDoc
* @see java.util.Collections
* @see java.util.List
@@ -196,7 +203,7 @@
/**
* {@inheritDoc}
*/
- public void printDocument(Content contentTree) {
+ public void printDocument(Content contentTree) throws IOException {
printHtmlDocument(configuration.metakeywords.getMetaKeywords(classDoc),
true, contentTree);
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
index 7985d93..7c21442 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
@@ -25,13 +25,13 @@
package com.sun.tools.doclets.formats.html;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-import com.sun.javadoc.*;
-import java.util.*;
import java.io.*;
import java.net.*;
+import java.util.*;
+
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Configure the output based on the command line options.
@@ -188,8 +188,8 @@
// ClassWriter.
/**
- * Constructor. Initialises resource for the
- * {@link com.sun.tools.doclets.MessageRetriever}.
+ * Constructor. Initializes resource for the
+ * {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
*/
private ConfigurationImpl() {
standardmessage = new MessageRetriever(this,
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
index 4d38ad9..d690261 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -27,14 +27,20 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Write the Constants Summary Page in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
* @since 1.4
@@ -297,7 +303,7 @@
/**
* {@inheritDoc}
*/
- public void printDocument(Content contentTree) {
+ public void printDocument(Content contentTree) throws IOException {
printHtmlDocument(null, true, contentTree);
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
index 6db2b0d..22a52a4 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -36,6 +36,11 @@
/**
* Writes constructor documentation.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
index ed9805b..5d85217 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -26,15 +26,20 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.DeprecatedAPIListBuilder;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate File to list all the deprecated classes and class members with the
* appropriate links.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see java.util.List
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
@@ -208,7 +213,7 @@
*
* @param builder the deprecated list builder
* @param type the type of list being documented
- * @param contentTree the content tree to which the anchor will be added
+ * @param htmlTree the content tree to which the anchor will be added
*/
private void addAnchor(DeprecatedAPIListBuilder builder, int type, Content htmlTree) {
if (builder.hasDocumentation(type)) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
index f567aae..7e1a977 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -35,6 +35,11 @@
/**
* Writes enum constant documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
index ed442aa..3f00063 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,6 +35,11 @@
/**
* Writes field documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Jamie Ho (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
index 1d7ac27..006e8e2 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -26,9 +26,10 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate the documentation in the Html "frame" format in the browser. The
@@ -40,6 +41,11 @@
* right-hand frame will have overview or package summary or class file. Also
* take care of browsers which do not support Html frames.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public class FrameOutputWriter extends HtmlDocletWriter {
@@ -89,7 +95,7 @@
* Generate the contants in the "index.html" file. Print the frame details
* as well as warning if browser is not supporting the Html frames.
*/
- protected void generateFrameFile() {
+ protected void generateFrameFile() throws IOException {
Content frameset = getFrameDetails();
if (configuration.windowtitle.length() > 0) {
printFramesetDocument(configuration.windowtitle, configuration.notimestamp,
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
index 7f15c84..b5e6ac3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
@@ -26,14 +26,20 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate the Help File for the generated API documentation. The help file
* contents are helpful for browsing the generated documentation.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public class HelpWriter extends HtmlDocletWriter {
@@ -73,7 +79,7 @@
/**
* Generate the help file contents.
*/
- protected void generateHelpFile() {
+ protected void generateHelpFile() throws IOException {
String title = configuration.getText("doclet.Window_Help_title");
Content body = getBody(true, getWindowTitle(title));
addTop(body);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
index 89af9ab..ef5bb24 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -24,17 +24,22 @@
*/
package com.sun.tools.doclets.formats.html;
+import java.io.*;
+import java.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.builders.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
-
/**
* The class with "start" method, calls individual Writers.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Robert Field
* @author Jamie Ho
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
index 59d7761..c5bd281 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
@@ -32,14 +32,19 @@
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for the Html Format Code Generation specific to JavaDoc.
* This Class contains methods related to the Html Code Generation which
* are used extensively while generating the entire documentation.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Atul M Dambalkar
* @author Robert Field
@@ -201,33 +206,6 @@
}
/**
- * Print Html Hyper Link, with target frame. This
- * link will only appear if page is not in a frame.
- *
- * @param link String name of the file.
- * @param where Position in the file
- * @param target Name of the target frame.
- * @param label Tag for the link.
- * @param strong Whether the label should be strong or not?
- */
- public void printNoFramesTargetHyperLink(String link, String where,
- String target, String label,
- boolean strong) {
- script();
- println(" <!--");
- println(" if(window==top) {");
- println(" document.writeln('"
- + getHyperLinkString(link, where, label, strong, "", "", target) + "');");
- println(" }");
- println(" //-->");
- scriptEnd();
- noScript();
- println(" " + getHyperLinkString(link, where, label, strong, "", "", target));
- noScriptEnd();
- println(DocletConstants.NL);
- }
-
- /**
* Get the script to show or hide the All classes link.
*
* @param id id of the element to show or hide
@@ -324,14 +302,6 @@
return new TagletWriterImpl(this, isFirstSentence);
}
- protected void printTagsInfoHeader() {
- dl();
- }
-
- protected void printTagsInfoFooter() {
- dlEnd();
- }
-
/**
* Get Package link, with target frame.
*
@@ -346,66 +316,6 @@
}
/**
- * Print the html file header. Also print Html page title and stylesheet
- * default properties.
- *
- * @param title String window title to go in the <TITLE> tag
- * @param metakeywords Array of String keywords for META tag. Each element
- * of the array is assigned to a separate META tag.
- * Pass in null for no array.
- * @param includeScript boolean true if printing windowtitle script.
- * False for files that appear in the left-hand frames.
- */
- public void printHtmlHeader(String title, String[] metakeywords,
- boolean includeScript) {
- println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 " +
- "Transitional//EN\" " +
- "\"http://www.w3.org/TR/html4/loose.dtd\">");
- println("<!--NewPage-->");
- html();
- head();
- if (! configuration.notimestamp) {
- print("<!-- Generated by javadoc (build " + ConfigurationImpl.BUILD_DATE + ") on ");
- print(today());
- println(" -->");
- }
- if (configuration.charset.length() > 0) {
- println("<META http-equiv=\"Content-Type\" content=\"text/html; "
- + "charset=" + configuration.charset + "\">");
- }
- if ( configuration.windowtitle.length() > 0 ) {
- title += " (" + configuration.windowtitle + ")";
- }
- title(title);
- println(title);
- titleEnd();
- println("");
- if (! configuration.notimestamp) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- println("<META NAME=\"date\" "
- + "CONTENT=\"" + dateFormat.format(new Date()) + "\">");
- }
- if ( metakeywords != null ) {
- for ( int i=0; i < metakeywords.length; i++ ) {
- println("<META NAME=\"keywords\" "
- + "CONTENT=\"" + metakeywords[i] + "\">");
- }
- }
- println("");
- printStyleSheetProperties();
- println("");
- // Don't print windowtitle script for overview-frame, allclasses-frame
- // and package-frame
- if (includeScript) {
- printWinTitleScript(title);
- }
- println("");
- headEnd();
- println("");
- body("white", includeScript);
- }
-
- /**
* Generates the HTML document tree and prints it out.
*
* @param metakeywords Array of String keywords for META tag. Each element
@@ -416,13 +326,12 @@
* @param body the body htmltree to be included in the document
*/
public void printHtmlDocument(String[] metakeywords, boolean includeScript,
- Content body) {
+ Content body) throws IOException {
Content htmlDocType = DocType.Transitional();
Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
Content head = new HtmlTree(HtmlTag.HEAD);
if (!configuration.notimestamp) {
- Content headComment = new Comment("Generated by javadoc (version " +
- ConfigurationImpl.BUILD_DATE + ") on " + today());
+ Content headComment = new Comment(getGeneratedByString());
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
@@ -447,7 +356,7 @@
head, body);
Content htmlDocument = new HtmlDocument(htmlDocType,
htmlComment, htmlTree);
- print(htmlDocument.toString());
+ write(htmlDocument);
}
/**
@@ -464,26 +373,6 @@
}
/**
- * Print user specified header and the footer.
- *
- * @param header if true print the user provided header else print the
- * user provided footer.
- */
- public void printUserHeaderFooter(boolean header) {
- em();
- if (header) {
- print(replaceDocRootDir(configuration.header));
- } else {
- if (configuration.footer.length() != 0) {
- print(replaceDocRootDir(configuration.footer));
- } else {
- print(replaceDocRootDir(configuration.header));
- }
- }
- emEnd();
- }
-
- /**
* Get user specified header and the footer.
*
* @param header if true print the user provided header else print the
@@ -506,14 +395,6 @@
}
/**
- * Print the user specified top.
- */
- public void printTop() {
- print(replaceDocRootDir(configuration.top));
- hr();
- }
-
- /**
* Adds the user specified top.
*
* @param body the content tree to which user specified top will be added
@@ -524,14 +405,6 @@
}
/**
- * Print the user specified bottom.
- */
- public void printBottom() {
- hr();
- print(replaceDocRootDir(configuration.bottom));
- }
-
- /**
* Adds the user specified bottom.
*
* @param body the content tree to which user specified bottom will be added
@@ -544,128 +417,6 @@
}
/**
- * Print the navigation bar for the Html page at the top and and the bottom.
- *
- * @param header If true print navigation bar at the top of the page else
- * print the nevigation bar at the bottom.
- */
- protected void navLinks(boolean header) {
- println("");
- if (!configuration.nonavbar) {
- if (header) {
- println(DocletConstants.NL + "<!-- ========= START OF TOP NAVBAR ======= -->");
- anchor("navbar_top");
- println();
- print(getHyperLinkString("", "skip-navbar_top", "", false, "",
- configuration.getText("doclet.Skip_navigation_links"), ""));
- } else {
- println(DocletConstants.NL + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
- anchor("navbar_bottom");
- println();
- print(getHyperLinkString("", "skip-navbar_bottom", "", false, "",
- configuration.getText("doclet.Skip_navigation_links"), ""));
- }
- table(0, "100%", 1, 0);
- tr();
- tdColspanBgcolorStyle(2, "#EEEEFF", "NavBarCell1");
- println("");
- if (header) {
- anchor("navbar_top_firstrow");
- } else {
- anchor("navbar_bottom_firstrow");
- }
- table(0, 0, 3);
- print(" ");
- trAlignVAlign("center", "top");
-
- if (configuration.createoverview) {
- navLinkContents();
- }
-
- if (configuration.packages.length == 1) {
- navLinkPackage(configuration.packages[0]);
- } else if (configuration.packages.length > 1) {
- navLinkPackage();
- }
-
- navLinkClass();
-
- if(configuration.classuse) {
- navLinkClassUse();
- }
- if(configuration.createtree) {
- navLinkTree();
- }
- if(!(configuration.nodeprecated ||
- configuration.nodeprecatedlist)) {
- navLinkDeprecated();
- }
- if(configuration.createindex) {
- navLinkIndex();
- }
- if (!configuration.nohelp) {
- navLinkHelp();
- }
- print(" ");
- trEnd();
- tableEnd();
- tdEnd();
-
- tdAlignVAlignRowspan("right", "top", 3);
-
- printUserHeaderFooter(header);
- tdEnd();
- trEnd();
- println("");
-
- tr();
- tdBgcolorStyle("white", "NavBarCell2");
- font("-2");
- space();
- navLinkPrevious();
- space();
- println("");
- space();
- navLinkNext();
- fontEnd();
- tdEnd();
-
- tdBgcolorStyle("white", "NavBarCell2");
- font("-2");
- print(" ");
- navShowLists();
- print(" ");
- space();
- println("");
- space();
- navHideLists(filename);
- print(" ");
- space();
- println("");
- space();
- navLinkClassIndex();
- fontEnd();
- tdEnd();
-
- trEnd();
-
- printSummaryDetailLinks();
-
- tableEnd();
- if (header) {
- aName("skip-navbar_top");
- aEnd();
- println(DocletConstants.NL + "<!-- ========= END OF TOP NAVBAR ========= -->");
- } else {
- aName("skip-navbar_bottom");
- aEnd();
- println(DocletConstants.NL + "<!-- ======== END OF BOTTOM NAVBAR ======= -->");
- }
- println("");
- }
- }
-
- /**
* Adds the navigation bar for the Html page at the top and and the bottom.
*
* @param header If true print navigation bar at the top of the page else
@@ -757,14 +508,6 @@
}
/**
- * Print the word "NEXT" to indicate that no link is available. Override
- * this method to customize next link.
- */
- protected void navLinkNext() {
- navLinkNext(null);
- }
-
- /**
* Get the word "NEXT" to indicate that no link is available. Override
* this method to customize next link.
*
@@ -775,14 +518,6 @@
}
/**
- * Print the word "PREV" to indicate that no link is available. Override
- * this method to customize prev link.
- */
- protected void navLinkPrevious() {
- navLinkPrevious(null);
- }
-
- /**
* Get the word "PREV" to indicate that no link is available. Override
* this method to customize prev link.
*
@@ -795,26 +530,10 @@
/**
* Do nothing. This is the default method.
*/
- protected void printSummaryDetailLinks() {
- }
-
- /**
- * Do nothing. This is the default method.
- */
protected void addSummaryDetailLinks(Content navDiv) {
}
/**
- * Print link to the "overview-summary.html" page.
- */
- protected void navLinkContents() {
- navCellStart();
- printHyperLink(relativePath + "overview-summary.html", "",
- configuration.getText("doclet.Overview"), true, "NavBarFont1");
- navCellEnd();
- }
-
- /**
* Get link to the "overview-summary.html" page.
*
* @return a content tree for the link
@@ -827,46 +546,6 @@
}
/**
- * Description for a cell in the navigation bar.
- */
- protected void navCellStart() {
- print(" ");
- tdBgcolorStyle("#EEEEFF", "NavBarCell1");
- print(" ");
- }
-
- /**
- * Description for a cell in the navigation bar, but with reverse
- * high-light effect.
- */
- protected void navCellRevStart() {
- print(" ");
- tdBgcolorStyle("#FFFFFF", "NavBarCell1Rev");
- print(" ");
- space();
- }
-
- /**
- * Closing tag for navigation bar cell.
- */
- protected void navCellEnd() {
- space();
- tdEnd();
- }
-
- /**
- * Print link to the "package-summary.html" page for the package passed.
- *
- * @param pkg Package to which link will be generated.
- */
- protected void navLinkPackage(PackageDoc pkg) {
- navCellStart();
- printPackageLink(pkg, configuration.getText("doclet.Package"), true,
- "NavBarFont1");
- navCellEnd();
- }
-
- /**
* Get link to the "package-summary.html" page for the package passed.
*
* @param pkg Package to which link will be generated
@@ -880,18 +559,6 @@
}
/**
- * Print the word "Package" in the navigation bar cell, to indicate that
- * link is not available here.
- */
- protected void navLinkPackage() {
- navCellStart();
- fontStyle("NavBarFont1");
- printText("doclet.Package");
- fontEnd();
- navCellEnd();
- }
-
- /**
* Get the word "Package" , to indicate that link is not available here.
*
* @return a content tree for the link
@@ -902,18 +569,6 @@
}
/**
- * Print the word "Use" in the navigation bar cell, to indicate that link
- * is not available.
- */
- protected void navLinkClassUse() {
- navCellStart();
- fontStyle("NavBarFont1");
- printText("doclet.navClassUse");
- fontEnd();
- navCellEnd();
- }
-
- /**
* Get the word "Use", to indicate that link is not available.
*
* @return a content tree for the link
@@ -924,20 +579,6 @@
}
/**
- * Print link for previous file.
- *
- * @param prev File name for the prev link.
- */
- public void navLinkPrevious(String prev) {
- String tag = configuration.getText("doclet.Prev");
- if (prev != null) {
- printHyperLink(prev, "", tag, true) ;
- } else {
- print(tag);
- }
- }
-
- /**
* Get link for previous file.
*
* @param prev File name for the prev link
@@ -954,21 +595,6 @@
}
/**
- * Print link for next file. If next is null, just print the label
- * without linking it anywhere.
- *
- * @param next File name for the next link.
- */
- public void navLinkNext(String next) {
- String tag = configuration.getText("doclet.Next");
- if (next != null) {
- printHyperLink(next, "", tag, true);
- } else {
- print(tag);
- }
- }
-
- /**
* Get link for next file. If next is null, just print the label
* without linking it anywhere.
*
@@ -986,16 +612,6 @@
}
/**
- * Print "FRAMES" link, to switch to the frame version of the output.
- *
- * @param link File to be linked, "index.html".
- */
- protected void navShowLists(String link) {
- print(getHyperLinkString(link + "?" + path + filename, "",
- configuration.getText("doclet.FRAMES"), true, "", "", "_top"));
- }
-
- /**
* Get "FRAMES" link, to switch to the frame version of the output.
*
* @param link File to be linked, "index.html"
@@ -1009,13 +625,6 @@
}
/**
- * Print "FRAMES" link, to switch to the frame version of the output.
- */
- protected void navShowLists() {
- navShowLists(relativePath + "index.html");
- }
-
- /**
* Get "FRAMES" link, to switch to the frame version of the output.
*
* @return a content tree for the link
@@ -1025,16 +634,6 @@
}
/**
- * Print "NO FRAMES" link, to switch to the non-frame version of the output.
- *
- * @param link File to be linked.
- */
- protected void navHideLists(String link) {
- print(getHyperLinkString(link, "", configuration.getText("doclet.NO_FRAMES"),
- true, "", "", "_top"));
- }
-
- /**
* Get "NO FRAMES" link, to switch to the non-frame version of the output.
*
* @param link File to be linked
@@ -1047,25 +646,6 @@
}
/**
- * Print "Tree" link in the navigation bar. If there is only one package
- * specified on the command line, then the "Tree" link will be to the
- * only "package-tree.html" file otherwise it will be to the
- * "overview-tree.html" file.
- */
- protected void navLinkTree() {
- navCellStart();
- PackageDoc[] packages = configuration.root.specifiedPackages();
- if (packages.length == 1 && configuration.root.specifiedClasses().length == 0) {
- printHyperLink(pathString(packages[0], "package-tree.html"), "",
- configuration.getText("doclet.Tree"), true, "NavBarFont1");
- } else {
- printHyperLink(relativePath + "overview-tree.html", "",
- configuration.getText("doclet.Tree"), true, "NavBarFont1");
- }
- navCellEnd();
- }
-
- /**
* Get "Tree" link in the navigation bar. If there is only one package
* specified on the command line, then the "Tree" link will be to the
* only "package-tree.html" file otherwise it will be to the
@@ -1102,18 +682,6 @@
}
/**
- * Print the word "Class" in the navigation bar cell, to indicate that
- * class link is not available.
- */
- protected void navLinkClass() {
- navCellStart();
- fontStyle("NavBarFont1");
- printText("doclet.Class");
- fontEnd();
- navCellEnd();
- }
-
- /**
* Get the word "Class", to indicate that class link is not available.
*
* @return a content tree for the link
@@ -1124,16 +692,6 @@
}
/**
- * Print "Deprecated" API link in the navigation bar.
- */
- protected void navLinkDeprecated() {
- navCellStart();
- printHyperLink(relativePath + "deprecated-list.html", "",
- configuration.getText("doclet.navDeprecated"), true, "NavBarFont1");
- navCellEnd();
- }
-
- /**
* Get "Deprecated" API link in the navigation bar.
*
* @return a content tree for the link
@@ -1146,17 +704,6 @@
}
/**
- * Print link for generated index. If the user has used "-splitindex"
- * command line option, then link to file "index-files/index-1.html" is
- * generated otherwise link to file "index-all.html" is generated.
- */
- protected void navLinkClassIndex() {
- printNoFramesTargetHyperLink(relativePath +
- AllClassesFrameWriter.OUTPUT_FILE_NAME_NOFRAMES,
- "", "", configuration.getText("doclet.All_Classes"), true);
- }
-
- /**
* Get link for generated index. If the user has used "-splitindex"
* command line option, then link to file "index-files/index-1.html" is
* generated otherwise link to file "index-all.html" is generated.
@@ -1170,20 +717,6 @@
Content li = HtmlTree.LI(allClassesContent);
return li;
}
- /**
- * Print link for generated class index.
- */
- protected void navLinkIndex() {
- navCellStart();
- printHyperLink(relativePath +
- (configuration.splitindex?
- DirectoryManager.getPath("index-files") +
- fileseparator: "") +
- (configuration.splitindex?
- "index-1.html" : "index-all.html"), "",
- configuration.getText("doclet.Index"), true, "NavBarFont1");
- navCellEnd();
- }
/**
* Get link for generated class index.
@@ -1200,27 +733,6 @@
}
/**
- * Print help file link. If user has provided a help file, then generate a
- * link to the user given file, which is already copied to current or
- * destination directory.
- */
- protected void navLinkHelp() {
- String helpfilenm = configuration.helpfile;
- if (helpfilenm.equals("")) {
- helpfilenm = "help-doc.html";
- } else {
- int lastsep;
- if ((lastsep = helpfilenm.lastIndexOf(File.separatorChar)) != -1) {
- helpfilenm = helpfilenm.substring(lastsep + 1);
- }
- }
- navCellStart();
- printHyperLink(relativePath + helpfilenm, "",
- configuration.getText("doclet.Help"), true, "NavBarFont1");
- navCellEnd();
- }
-
- /**
* Get help file link. If user has provided a help file, then generate a
* link to the user given file, which is already copied to current or
* destination directory.
@@ -1244,87 +756,6 @@
}
/**
- * Print the word "Detail" in the navigation bar. No link is available.
- */
- protected void navDetail() {
- printText("doclet.Detail");
- }
-
- /**
- * Print the word "Summary" in the navigation bar. No link is available.
- */
- protected void navSummary() {
- printText("doclet.Summary");
- }
-
- /**
- * Print the Html table tag for the index summary tables. The table tag
- * printed is
- * {@code <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%"> }
- */
- public void tableIndexSummary() {
- table(1, "100%", 3, 0);
- }
-
- /**
- * Print the Html table tag for the index summary tables.
- *
- * @param summary the summary for the table tag summary attribute.
- */
- public void tableIndexSummary(String summary) {
- table(1, "100%", 3, 0, summary);
- }
-
- /**
- * Same as {@link #tableIndexSummary()}.
- */
- public void tableIndexDetail() {
- table(1, "100%", 3, 0);
- }
-
- /**
- * Print Html tag for table elements. The tag printed is
- * <TD ALIGN="right" VALIGN="top" WIDTH="1%">.
- */
- public void tdIndex() {
- print("<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\">");
- }
-
- /**
- * Print table caption.
- */
- public void tableCaptionStart() {
- captionStyle("TableCaption");
- }
-
- /**
- * Print table sub-caption.
- */
- public void tableSubCaptionStart() {
- captionStyle("TableSubCaption");
- }
-
- /**
- * Print table caption end tags.
- */
- public void tableCaptionEnd() {
- captionEnd();
- }
-
- /**
- * Print summary table header.
- */
- public void summaryTableHeader(String[] header, String scope) {
- tr();
- for ( int i=0; i < header.length; i++ ) {
- thScopeNoWrap("TableHeader", scope);
- print(header[i]);
- thEnd();
- }
- trEnd();
- }
-
- /**
* Get summary table header.
*
* @param header the header for the table
@@ -1407,7 +838,7 @@
/**
* Returns a package name label.
*
- * @param parsedName the package name
+ * @param packageName the package name
* @return the package name content
*/
public Content getPackageLabel(String packageName) {
@@ -1453,144 +884,6 @@
}
/**
- * Prine table header information about color, column span and the font.
- *
- * @param color Background color.
- * @param span Column span.
- */
- public void tableHeaderStart(String color, int span) {
- trBgcolorStyle(color, "TableHeadingColor");
- thAlignColspan("left", span);
- font("+2");
- }
-
- /**
- * Print table header for the inherited members summary tables. Print the
- * background color information.
- *
- * @param color Background color.
- */
- public void tableInheritedHeaderStart(String color) {
- trBgcolorStyle(color, "TableSubHeadingColor");
- thAlign("left");
- }
-
- /**
- * Print "Use" table header. Print the background color and the column span.
- *
- * @param color Background color.
- */
- public void tableUseInfoHeaderStart(String color) {
- trBgcolorStyle(color, "TableSubHeadingColor");
- thAlignColspan("left", 2);
- }
-
- /**
- * Print table header with the background color with default column span 2.
- *
- * @param color Background color.
- */
- public void tableHeaderStart(String color) {
- tableHeaderStart(color, 2);
- }
-
- /**
- * Print table header with the column span, with the default color #CCCCFF.
- *
- * @param span Column span.
- */
- public void tableHeaderStart(int span) {
- tableHeaderStart("#CCCCFF", span);
- }
-
- /**
- * Print table header with default column span 2 and default color #CCCCFF.
- */
- public void tableHeaderStart() {
- tableHeaderStart(2);
- }
-
- /**
- * Print table header end tags for font, column and row.
- */
- public void tableHeaderEnd() {
- fontEnd();
- thEnd();
- trEnd();
- }
-
- /**
- * Print table header end tags in inherited tables for column and row.
- */
- public void tableInheritedHeaderEnd() {
- thEnd();
- trEnd();
- }
-
- /**
- * Print the summary table row cell attribute width.
- *
- * @param width Width of the table cell.
- */
- public void summaryRow(int width) {
- if (width != 0) {
- tdWidth(width + "%");
- } else {
- td();
- }
- }
-
- /**
- * Print the summary table row cell end tag.
- */
- public void summaryRowEnd() {
- tdEnd();
- }
-
- /**
- * Print the heading in Html {@literal <H2>} format.
- *
- * @param str The Header string.
- */
- public void printIndexHeading(String str) {
- h2();
- print(str);
- h2End();
- }
-
- /**
- * Print Html tag <FRAMESET=arg>.
- *
- * @param arg Argument for the tag.
- */
- public void frameSet(String arg) {
- println("<FRAMESET " + arg + ">");
- }
-
- /**
- * Print Html closing tag </FRAMESET>.
- */
- public void frameSetEnd() {
- println("</FRAMESET>");
- }
-
- /**
- * Print Html tag <FRAME=arg>.
- *
- * @param arg Argument for the tag.
- */
- public void frame(String arg) {
- println("<FRAME " + arg + ">");
- }
-
- /**
- * Print Html closing tag </FRAME>.
- */
- public void frameEnd() {
- println("</FRAME>");
- }
-
- /**
* Return path to the class page for a classdoc. For example, the class
* name is "java.lang.Object" and if the current file getting generated is
* "java/io/File.html", then the path string to the class, returned is
@@ -1623,36 +916,12 @@
* @param name File name, to which path string is.
*/
protected String pathString(PackageDoc pd, String name) {
- StringBuffer buf = new StringBuffer(relativePath);
+ StringBuilder buf = new StringBuilder(relativePath);
buf.append(DirectoryManager.getPathToPackage(pd, name));
return buf.toString();
}
/**
- * Print the link to the given package.
- *
- * @param pkg the package to link to.
- * @param label the label for the link.
- * @param isStrong true if the label should be strong.
- */
- public void printPackageLink(PackageDoc pkg, String label, boolean isStrong) {
- print(getPackageLinkString(pkg, label, isStrong));
- }
-
- /**
- * Print the link to the given package.
- *
- * @param pkg the package to link to.
- * @param label the label for the link.
- * @param isStrong true if the label should be strong.
- * @param style the font of the package link label.
- */
- public void printPackageLink(PackageDoc pkg, String label, boolean isStrong,
- String style) {
- print(getPackageLinkString(pkg, label, isStrong, style));
- }
-
- /**
* Return the link to the given package.
*
* @param pkg the package to link to.
@@ -1735,21 +1004,6 @@
return (cd.isInterface())? italicsText(name): name;
}
- public void printSrcLink(ProgramElementDoc d, String label) {
- if (d == null) {
- return;
- }
- ClassDoc cd = d.containingClass();
- if (cd == null) {
- //d must be a class doc since in has no containing class.
- cd = (ClassDoc) d;
- }
- String href = relativePath + DocletConstants.SOURCE_OUTPUT_DIR_NAME
- + DirectoryManager.getDirectoryPath(cd.containingPackage())
- + cd.name() + ".html#" + SourceToHTMLConverter.getAnchorName(d);
- printHyperLink(href, "", label, true);
- }
-
/**
* Add the link to the content tree.
*
@@ -1799,13 +1053,6 @@
factory.getTypeParameterLinks(linkInfo, false)).toString();
}
- /**
- * Print the link to the given class.
- */
- public void printLink(LinkInfoImpl linkInfo) {
- print(getLink(linkInfo));
- }
-
/*************************************************************
* Return a class cross link to external class documentation.
* The name must be fully qualified to determine which package
@@ -1829,7 +1076,7 @@
while((periodIndex = packageName.lastIndexOf('.')) != -1) {
className = packageName.substring(periodIndex + 1, packageName.length()) +
(className.length() > 0 ? "." + className : "");
- String defaultLabel = code ? getCode() + className + getCodeEnd() : className;
+ String defaultLabel = code ? codeText(className) : className;
packageName = packageName.substring(0, periodIndex);
if (getCrossPackageLink(packageName) != null) {
//The package exists in external documentation, so link to the external
@@ -1937,30 +1184,6 @@
addPreQualifiedClassLink(context, cd, true, contentTree);
}
- public void printText(String key) {
- print(configuration.getText(key));
- }
-
- public void printText(String key, String a1) {
- print(configuration.getText(key, a1));
- }
-
- public void printText(String key, String a1, String a2) {
- print(configuration.getText(key, a1, a2));
- }
-
- public void strongText(String key) {
- strong(configuration.getText(key));
- }
-
- public void strongText(String key, String a1) {
- strong(configuration.getText(key, a1));
- }
-
- public void strongText(String key, String a1, String a2) {
- strong(configuration.getText(key, a1, a2));
- }
-
/**
* Get the link for the given member.
*
@@ -1974,22 +1197,6 @@
}
/**
- * Print the link for the given member.
- *
- * @param context the id of the context where the link will be printed.
- * @param classDoc the classDoc that we should link to. This is not
- * necessarily equal to doc.containingClass(). We may be
- * inheriting comments.
- * @param doc the member being linked to.
- * @param label the label for the link.
- * @param strong true if the link should be strong.
- */
- public void printDocLink(int context, ClassDoc classDoc, MemberDoc doc,
- String label, boolean strong) {
- print(getDocLink(context, classDoc, doc, label, strong));
- }
-
- /**
* Return the link for the given member.
*
* @param context the id of the context where the link will be printed.
@@ -2060,10 +1267,6 @@
}
}
- public void anchor(ExecutableMemberDoc emd) {
- anchor(getAnchor(emd));
- }
-
public String getAnchor(ExecutableMemberDoc emd) {
StringBuilder signature = new StringBuilder(emd.signature());
StringBuilder signatureParsed = new StringBuilder();
@@ -2086,66 +1289,61 @@
if (! (tagName.startsWith("@link") || tagName.equals("@see"))) {
return "";
}
- StringBuffer result = new StringBuffer();
- boolean isplaintext = tagName.toLowerCase().equals("@linkplain");
- String label = see.label();
- label = (label.length() > 0)?
- ((isplaintext) ? label :
- getCode() + label + getCodeEnd()):"";
+
String seetext = replaceDocRootDir(see.text());
//Check if @see is an href or "string"
if (seetext.startsWith("<") || seetext.startsWith("\"")) {
- result.append(seetext);
- return result.toString();
+ return seetext;
}
+ boolean plain = tagName.equalsIgnoreCase("@linkplain");
+ String label = plainOrCodeText(plain, see.label());
+
//The text from the @see tag. We will output this text when a label is not specified.
- String text = (isplaintext) ? seetext : getCode() + seetext + getCodeEnd();
+ String text = plainOrCodeText(plain, seetext);
ClassDoc refClass = see.referencedClass();
String refClassName = see.referencedClassName();
MemberDoc refMem = see.referencedMember();
String refMemName = see.referencedMemberName();
+
if (refClass == null) {
//@see is not referencing an included class
PackageDoc refPackage = see.referencedPackage();
if (refPackage != null && refPackage.isIncluded()) {
//@see is referencing an included package
- String packageName = isplaintext ? refPackage.name() :
- getCode() + refPackage.name() + getCodeEnd();
- result.append(getPackageLinkString(refPackage,
- label.length() == 0 ? packageName : label, false));
+ if (label.isEmpty())
+ label = plainOrCodeText(plain, refPackage.name());
+ return getPackageLinkString(refPackage, label, false);
} else {
//@see is not referencing an included class or package. Check for cross links.
String classCrossLink, packageCrossLink = getCrossPackageLink(refClassName);
if (packageCrossLink != null) {
//Package cross link found
- result.append(getHyperLinkString(packageCrossLink, "",
- (label.length() == 0)? text : label, false));
+ return getHyperLinkString(packageCrossLink, "",
+ (label.isEmpty() ? text : label), false);
} else if ((classCrossLink = getCrossClassLink(refClassName,
- refMemName, label, false, "", ! isplaintext)) != null) {
- //Class cross link found (possiblly to a member in the class)
- result.append(classCrossLink);
+ refMemName, label, false, "", !plain)) != null) {
+ //Class cross link found (possibly to a member in the class)
+ return classCrossLink;
} else {
//No cross link found so print warning
configuration.getDocletSpecificMsg().warning(see.position(), "doclet.see.class_or_package_not_found",
tagName, seetext);
- result.append((label.length() == 0)? text: label);
+ return (label.isEmpty() ? text: label);
}
}
} else if (refMemName == null) {
// Must be a class reference since refClass is not null and refMemName is null.
- if (label.length() == 0) {
- label = (isplaintext) ? refClass.name() : getCode() + refClass.name() + getCodeEnd();
- result.append(getLink(new LinkInfoImpl(refClass, label)));
- } else {
- result.append(getLink(new LinkInfoImpl(refClass, label)));
+ if (label.isEmpty()) {
+ label = plainOrCodeText(plain, refClass.name());
}
+ return getLink(new LinkInfoImpl(refClass, label));
} else if (refMem == null) {
// Must be a member reference since refClass is not null and refMemName is not null.
// However, refMem is null, so this referenced member does not exist.
- result.append((label.length() == 0)? text: label);
+ return (label.isEmpty() ? text: label);
} else {
// Must be a member reference since refClass is not null and refMemName is not null.
// refMem is not null, so this @see tag must be referencing a valid member.
@@ -2177,17 +1375,16 @@
refMemName += ((ExecutableMemberDoc)refMem).signature();
}
}
- text = (isplaintext) ?
- refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd();
- result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
- refMem, (label.length() == 0)? text: label, false));
+ text = plainOrCodeText(plain, Util.escapeHtmlChars(refMemName));
+
+ return getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
+ refMem, (label.isEmpty() ? text: label), false);
}
- return result.toString();
}
- public void printInlineComment(Doc doc, Tag tag) {
- printCommentTags(doc, tag.inlineTags(), false, false);
+ private String plainOrCodeText(boolean plain, String text) {
+ return (plain || text.isEmpty()) ? text : codeText(text);
}
/**
@@ -2201,10 +1398,6 @@
addCommentTags(doc, tag.inlineTags(), false, false, htmltree);
}
- public void printInlineDeprecatedComment(Doc doc, Tag tag) {
- printCommentTags(doc, tag.inlineTags(), true, false);
- }
-
/**
* Add the inline deprecated comment.
*
@@ -2216,10 +1409,6 @@
addCommentTags(doc, tag.inlineTags(), true, false, htmltree);
}
- public void printSummaryComment(Doc doc) {
- printSummaryComment(doc, doc.firstSentenceTags());
- }
-
/**
* Adds the summary content.
*
@@ -2230,10 +1419,6 @@
addSummaryComment(doc, doc.firstSentenceTags(), htmltree);
}
- public void printSummaryComment(Doc doc, Tag[] firstSentenceTags) {
- printCommentTags(doc, firstSentenceTags, false, true);
- }
-
/**
* Adds the summary content.
*
@@ -2245,23 +1430,10 @@
addCommentTags(doc, firstSentenceTags, false, true, htmltree);
}
- public void printSummaryDeprecatedComment(Doc doc) {
- printCommentTags(doc, doc.firstSentenceTags(), true, true);
- }
-
- public void printSummaryDeprecatedComment(Doc doc, Tag tag) {
- printCommentTags(doc, tag.firstSentenceTags(), true, true);
- }
-
public void addSummaryDeprecatedComment(Doc doc, Tag tag, Content htmltree) {
addCommentTags(doc, tag.firstSentenceTags(), true, true, htmltree);
}
- public void printInlineComment(Doc doc) {
- printCommentTags(doc, doc.inlineTags(), false, false);
- p();
- }
-
/**
* Adds the inline comment.
*
@@ -2272,27 +1444,6 @@
addCommentTags(doc, doc.inlineTags(), false, false, htmltree);
}
- public void printInlineDeprecatedComment(Doc doc) {
- printCommentTags(doc, doc.inlineTags(), true, false);
- }
-
- private void printCommentTags(Doc doc, Tag[] tags, boolean depr, boolean first) {
- if(configuration.nocomment){
- return;
- }
- if (depr) {
- italic();
- }
- String result = commentTagsToString(null, doc, tags, first);
- print(result);
- if (depr) {
- italicEnd();
- }
- if (tags.length == 0) {
- space();
- }
- }
-
/**
* Adds the comment tags.
*
@@ -2385,7 +1536,7 @@
text = removeNonInlineHtmlTags(text);
}
StringTokenizer lines = new StringTokenizer(text, "\r\n", true);
- StringBuffer textBuff = new StringBuffer();
+ StringBuilder textBuff = new StringBuilder();
while (lines.hasMoreTokens()) {
StringBuilder line = new StringBuilder(lines.nextToken());
Util.replaceTabs(configuration.sourcetab, line);
@@ -2454,7 +1605,7 @@
//Redirect all relative links.
int end, begin = text.toLowerCase().indexOf("<a");
if(begin >= 0){
- StringBuffer textBuff = new StringBuffer(text);
+ StringBuilder textBuff = new StringBuilder(text);
while(begin >=0){
if (textBuff.length() > begin + 2 && ! Character.isWhitespace(textBuff.charAt(begin+2))) {
@@ -2557,22 +1708,6 @@
}
}
- public void printStyleSheetProperties() {
- String filename = configuration.stylesheetfile;
- if (filename.length() > 0) {
- File stylefile = new File(filename);
- String parent = stylefile.getParent();
- filename = (parent == null)?
- filename:
- filename.substring(parent.length() + 1);
- } else {
- filename = "stylesheet.css";
- }
- filename = relativePath + filename;
- link("REL =\"stylesheet\" TYPE=\"text/css\" HREF=\"" +
- filename + "\" " + "TITLE=\"Style\"");
- }
-
/**
* Returns a link to the stylesheet file.
*
@@ -2604,15 +1739,6 @@
}
/**
- * Write the annotatation types for the given packageDoc.
- *
- * @param packageDoc the package to write annotations for.
- */
- public void writeAnnotationInfo(PackageDoc packageDoc) {
- writeAnnotationInfo(packageDoc, packageDoc.annotations());
- }
-
- /**
* Adds the annotatation types for the given packageDoc.
*
* @param packageDoc the package to write annotations for.
@@ -2624,18 +1750,9 @@
}
/**
- * Write the annotatation types for the given doc.
- *
- * @param doc the doc to write annotations for.
- */
- public void writeAnnotationInfo(ProgramElementDoc doc) {
- writeAnnotationInfo(doc, doc.annotations());
- }
-
- /**
* Adds the annotatation types for the given doc.
*
- * @param packageDoc the package to write annotations for
+ * @param doc the package to write annotations for
* @param htmltree the content tree to which the annotation types will be added
*/
public void addAnnotationInfo(ProgramElementDoc doc, Content htmltree) {
@@ -2643,17 +1760,6 @@
}
/**
- * Write the annotatation types for the given doc and parameter.
- *
- * @param indent the number of spaced to indent the parameters.
- * @param doc the doc to write annotations for.
- * @param param the parameter to write annotations for.
- */
- public boolean writeAnnotationInfo(int indent, Doc doc, Parameter param) {
- return writeAnnotationInfo(indent, doc, param.annotations(), false);
- }
-
- /**
* Add the annotatation types for the given doc and parameter.
*
* @param indent the number of spaces to indent the parameters.
@@ -2667,16 +1773,6 @@
}
/**
- * Write the annotatation types for the given doc.
- *
- * @param doc the doc to write annotations for.
- * @param descList the array of {@link AnnotationDesc}.
- */
- private void writeAnnotationInfo(Doc doc, AnnotationDesc[] descList) {
- writeAnnotationInfo(0, doc, descList, true);
- }
-
- /**
* Adds the annotatation types for the given doc.
*
* @param doc the doc to write annotations for.
@@ -2690,26 +1786,6 @@
}
/**
- * Write the annotatation types for the given doc.
- *
- * @param indent the number of extra spaces to indent the annotations.
- * @param doc the doc to write annotations for.
- * @param descList the array of {@link AnnotationDesc}.
- */
- private boolean writeAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak) {
- List<String> annotations = getAnnotations(indent, descList, lineBreak);
- if (annotations.size() == 0) {
- return false;
- }
- fontNoNewLine("-1");
- for (Iterator<String> iter = annotations.iterator(); iter.hasNext();) {
- print(iter.next());
- }
- fontEnd();
- return true;
- }
-
- /**
* Adds the annotatation types for the given doc.
*
* @param indent the number of extra spaces to indent the annotations.
@@ -2744,13 +1820,13 @@
*/
private List<String> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak) {
List<String> results = new ArrayList<String>();
- StringBuffer annotation;
+ StringBuilder annotation;
for (int i = 0; i < descList.length; i++) {
AnnotationTypeDoc annotationDoc = descList[i].annotationType();
if (! Util.isDocumentedAnnotation(annotationDoc)){
continue;
}
- annotation = new StringBuffer();
+ annotation = new StringBuilder();
LinkInfoImpl linkInfo = new LinkInfoImpl(
LinkInfoImpl.CONTEXT_ANNOTATION, annotationDoc);
linkInfo.label = "@" + annotationDoc.name();
@@ -2815,9 +1891,9 @@
List<String> list = getAnnotations(0,
new AnnotationDesc[]{(AnnotationDesc) annotationValue.value()},
false);
- StringBuffer buf = new StringBuffer();
- for (Iterator<String> iter = list.iterator(); iter.hasNext(); ) {
- buf.append(iter.next());
+ StringBuilder buf = new StringBuilder();
+ for (String s: list) {
+ buf.append(s);
}
return buf.toString();
} else if (annotationValue.value() instanceof MemberDoc) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
index 8f32789..b735b01 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -28,15 +28,20 @@
import java.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Generate serialized form for serializable fields.
* Documentation denoted by the tags <code>serial</code> and
* <code>serialField</code> is processed.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Joe Fialli
* @author Bhavesh Patel (Modified)
*/
@@ -55,18 +60,6 @@
return Arrays.asList(cd.serializableFields());
}
- protected void printTypeLinkNoDimension(Type type) {
- ClassDoc cd = type.asClassDoc();
- //Linking to package private classes in serialized for causes
- //broken links. Don't link to them.
- if (type.isPrimitive() || cd.isPackagePrivate()) {
- print(type.typeName());
- } else {
- writer.printLink(new LinkInfoImpl(
- LinkInfoImpl.CONTEXT_SERIAL_MEMBER, type));
- }
- }
-
/**
* Return the header for serializable fields section.
*
@@ -121,10 +114,10 @@
/**
* Add the member header.
*
- * @param fieldsType the class document to be listed
- * @param fieldTypeStr the string for the filed type to be documented
+ * @param fieldType the class document to be listed
+ * @param fieldTypeStr the string for the field type to be documented
* @param fieldDimensions the dimensions of the field string to be added
- * @param firldName name of the field to be added
+ * @param fieldName name of the field to be added
* @param contentTree the content tree to which the member header will be added
*/
public void addMemberHeader(ClassDoc fieldType, String fieldTypeStr,
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
index 6ce0120..2b5bdcf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -26,14 +26,19 @@
package com.sun.tools.doclets.formats.html;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Generate serialized form for Serializable/Externalizable methods.
* Documentation denoted by the <code>serialData</code> tag is processed.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Joe Fialli
* @author Bhavesh Patel (Modified)
*/
@@ -161,14 +166,4 @@
method.containingClass().qualifiedName(), method.name());
}
}
-
- protected void printTypeLinkNoDimension(Type type) {
- ClassDoc cd = type.asClassDoc();
- if (type.isPrimitive() || cd.isPackagePrivate()) {
- print(type.typeName());
- } else {
- writer.printLink(new LinkInfoImpl(
- LinkInfoImpl.CONTEXT_SERIAL_MEMBER,type));
- }
- }
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
index 3e4b968..dac765d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,14 +25,19 @@
package com.sun.tools.doclets.formats.html;
-import com.sun.tools.doclets.internal.toolkit.util.links.*;
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.doclets.internal.toolkit.util.links.*;
/**
* A factory that returns a link given the information about it.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
@@ -66,7 +71,7 @@
classLinkInfo.type != null &&
!classDoc.qualifiedTypeName().equals(classLinkInfo.type.qualifiedTypeName())) :
"";
- StringBuffer label = new StringBuffer(
+ StringBuilder label = new StringBuilder(
classLinkInfo.getClassLinkLabel(m_writer.configuration));
classLinkInfo.displayLength += label.length();
Configuration configuration = ConfigurationImpl.getInstance();
@@ -155,7 +160,6 @@
* "../../java/lang/Object.html"
*
* @param linkInfo the information about the link.
- * @param fileName the file name, to which path string is.
*/
private String pathString(LinkInfoImpl linkInfo) {
if (linkInfo.context == LinkInfoImpl.PACKAGE_FRAME) {
@@ -163,7 +167,7 @@
//with 1.4.2 output.
return linkInfo.classDoc.name() + ".html";
}
- StringBuffer buf = new StringBuffer(m_writer.relativePath);
+ StringBuilder buf = new StringBuilder(m_writer.relativePath);
buf.append(DirectoryManager.getPathToPackage(
linkInfo.classDoc.containingPackage(),
linkInfo.classDoc.name() + ".html"));
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
index c9a176c..ef5f38f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,6 +30,12 @@
import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.util.links.*;
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
public class LinkInfoImpl extends LinkInfo {
/**
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
index 788fd68..b417197 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,6 +30,11 @@
/**
* Stores output of a link.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
@@ -38,13 +43,13 @@
/**
* The output of the link.
*/
- public StringBuffer output;
+ public StringBuilder output;
/**
* Construct a new LinkOutputImpl.
*/
public LinkOutputImpl() {
- output = new StringBuffer();
+ output = new StringBuilder();
}
/**
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
index 8759155..467859d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,6 +35,11 @@
/**
* Writes method documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Jamie Ho (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
index dda91ce..ec9a50f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -36,6 +36,11 @@
/**
* Writes nested class documentation in HTML format.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Jamie Ho (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
index 27414e0..6c9f377 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,16 +27,22 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class to generate file for each package contents in the left-hand bottom
* frame. This will list all the Class Kinds in the package. A click on any
* class-kind will update the right-hand frame with the clicked class-kind page.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
index 3ac4b98..2928983 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -26,16 +26,22 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Generate the package index for the left-hand frame in the generated output.
* A click on the package name in this frame will update the page in the bottom
* left hand frame with the listing of contents of the clicked package.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
index 7b9be91..b1400f4 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -27,16 +27,22 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Generate the package index page "overview-summary.html" for the right-hand
* frame. A click on the package name on this page will update the same frame
* with the "pacakge-summary.html" file for the clicked package.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
@@ -228,7 +234,7 @@
* Adds the lower navigation bar and the bottom text
* (from the -bottom option) at the bottom of page.
*
- * @param the documentation tree to which the navigation bar footer will be added
+ * @param body the documentation tree to which the navigation bar footer will be added
*/
protected void addNavigationBarFooter(Content body) {
addNavLinks(false, body);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
index 7996655..5895015 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -28,14 +28,19 @@
import java.io.*;
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class to generate Tree page for a package. The name of the file generated is
* "package-tree.html" and it is generated in the respective package directory.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
index 579aee2..1bf61a5 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,14 +27,20 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate package usage information.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert G. Field
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
index bc35318..c91bf4d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -27,16 +27,22 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* Class to generate file for each package contents in the right-hand
* frame. This will list all the Class Kinds in the package. A click on any
* class-kind will update the frame with the clicked class-kind page.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
@@ -248,7 +254,7 @@
/**
* {@inheritDoc}
*/
- public void printDocument(Content contentTree) {
+ public void printDocument(Content contentTree) throws IOException {
printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageDoc),
true, contentTree);
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
index 6d39f0a..f7cb4fe 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -29,14 +29,20 @@
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException;
/**
* Generate the Serialized Form Information Page.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public class SerializedFormWriterImpl extends SubWriterHolderWriter
- implements com.sun.tools.doclets.internal.toolkit.SerializedFormWriter {
+ implements SerializedFormWriter {
private static final String FILE_NAME = "serialized-form.html";
@@ -49,23 +55,6 @@
}
/**
- * Writes the given header.
- *
- * @param header the header to write.
- */
- public void writeHeader(String header) {
- printHtmlHeader(header, null, true);
- printTop();
- navLinks(true);
- hr();
- center();
- h1();
- print(header);
- h1End();
- centerEnd();
- }
-
- /**
* Get the given header.
*
* @param header the header to write
@@ -225,20 +214,10 @@
/**
* {@inheritDoc}
*/
- public void printDocument(Content serializedTree) {
+ public void printDocument(Content serializedTree) throws IOException {
printHtmlDocument(null, true, serializedTree);
}
- private void tableHeader() {
- tableIndexSummary();
- trBgcolorStyle("#CCCCFF", "TableSubHeadingColor");
- }
-
- private void tableFooter() {
- fontEnd();
- thEnd(); trEnd(); tableEnd();
- }
-
/**
* Return an instance of a SerialFieldWriter.
*
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
index 6bbcae6..a0ce80f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -26,15 +26,21 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate only one index file for all the Member Names with Indexing in
* Unicode Order. The name of the generated file is "index-all.html" and it is
* generated in current or the destination directory.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see java.lang.Character
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
index 5fd7f88..c560bb8 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -35,9 +35,10 @@
/**
* Converts Java Source Code to HTML.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
index 9d60873..e6249f2 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -26,15 +26,21 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate Separate Index Files for all the member names with Indexing in
* Unicode Order. This will create "index-files" directory in the current or
* destination directory and will generate separate file for each unicode index.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see java.lang.Character
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
index 6790b73..424c55d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -26,10 +26,11 @@
package com.sun.tools.doclets.formats.html;
import java.io.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.*;
/**
* This abstract class exists to provide functionality needed in the
@@ -39,6 +40,11 @@
* can not be used effectively to change formatting. The concrete
* class subclass of this class can be subclassed to change formatting.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see AbstractMemberWriter
* @see ClassWriterImpl
*
@@ -60,18 +66,6 @@
super(configuration, path, filename, relpath);
}
- public void printTypeSummaryHeader() {
- tdIndex();
- font("-1");
- code();
- }
-
- public void printTypeSummaryFooter() {
- codeEnd();
- fontEnd();
- tdEnd();
- }
-
/**
* Add the summary header.
*
@@ -99,14 +93,6 @@
return table;
}
- public void printTableHeadingBackground(String str) {
- tableIndexDetail();
- tableHeaderStart("#CCCCFF", 1);
- strong(str);
- tableHeaderEnd();
- tableEnd();
- }
-
/**
* Add the inherited summary header.
*
@@ -120,19 +106,6 @@
mw.addInheritedSummaryLabel(cd, inheritedTree);
}
- public void printSummaryFooter(AbstractMemberWriter mw, ClassDoc cd) {
- tableEnd();
- space();
- }
-
- public void printInheritedSummaryFooter(AbstractMemberWriter mw, ClassDoc cd) {
- codeEnd();
- summaryRowEnd();
- trEnd();
- tableEnd();
- space();
- }
-
/**
* Add the index comment.
*
@@ -143,24 +116,6 @@
addIndexComment(member, member.firstSentenceTags(), contentTree);
}
- protected void printIndexComment(Doc member, Tag[] firstSentenceTags) {
- Tag[] deprs = member.tags("deprecated");
- if (Util.isDeprecated((ProgramElementDoc) member)) {
- strongText("doclet.Deprecated");
- space();
- if (deprs.length > 0) {
- printInlineDeprecatedComment(member, deprs[0]);
- }
- return;
- } else {
- ClassDoc cd = ((ProgramElementDoc)member).containingClass();
- if (cd != null && Util.isDeprecated(cd)) {
- strongText("doclet.Deprecated"); space();
- }
- }
- printSummaryComment(member, firstSentenceTags);
- }
-
/**
* Add the index comment.
*
@@ -217,18 +172,6 @@
addSummaryLinkComment(mw, member, member.firstSentenceTags(), contentTree);
}
- public void printSummaryLinkComment(AbstractMemberWriter mw,
- ProgramElementDoc member,
- Tag[] firstSentenceTags) {
- codeEnd();
- println();
- br();
- printNbsps();
- printIndexComment(member, firstSentenceTags);
- summaryRowEnd();
- trEnd();
- }
-
/**
* Add the summary link comment.
*
@@ -259,13 +202,6 @@
mw.addInheritedSummaryLink(cd, member, linksTree);
}
- public void printMemberHeader() {
- hr();
- }
-
- public void printMemberFooter() {
- }
-
/**
* Get the document content header tree
*
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
index 9fb3bcd..0dfb467 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,13 +30,18 @@
/**
* The output for HTML taglets.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.5
* @author Jamie Ho
*/
public class TagletOutputImpl implements TagletOutput {
- private StringBuffer output;
+ private StringBuilder output;
public TagletOutputImpl(String o) {
setOutput(o);
@@ -46,7 +51,7 @@
* {@inheritDoc}
*/
public void setOutput (Object o) {
- output = new StringBuffer(o == null ? "" : (String) o);
+ output = new StringBuilder(o == null ? "" : (String) o);
}
/**
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
index f0b4978..92478e2 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -34,6 +34,11 @@
/**
* The taglet writer that writes HTML.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.5
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -69,7 +74,7 @@
* {@inheritDoc}
*/
public TagletOutput deprecatedTagOutput(Doc doc) {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
Tag[] deprs = doc.tags("deprecated");
if (doc instanceof ClassDoc) {
if (Util.isDeprecated((ProgramElementDoc) doc)) {
@@ -120,9 +125,9 @@
* {@inheritDoc}
*/
public TagletOutput getParamHeader(String header) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("<dt>");
- result.append("<span class=\"strong\">" + header + "</span></dt>");
+ result.append("<span class=\"strong\">").append(header).append("</span></dt>");
return new TagletOutputImpl(result.toString());
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
index e116fe4..7dab45c 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -28,9 +28,9 @@
import java.io.*;
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Generate Class Hierarchy page for all the Classes in this run. Use
@@ -38,6 +38,11 @@
* the generated file is "overview-tree.html" and it is generated in the
* current or the destination directory.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
index 99c0fb0..573abe0 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,13 +25,18 @@
package com.sun.tools.doclets.formats.html;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The factory that returns HTML writers.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
index 86fea13..533c9b7 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,15 +25,23 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating a comment for HTML pages of javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
-public class Comment extends Content{
+public class Comment extends Content {
private String commentText;
@@ -80,11 +88,13 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- if (!endsWithNewLine(contentBuilder))
- contentBuilder.append(DocletConstants.NL);
- contentBuilder.append("<!-- ");
- contentBuilder.append(commentText);
- contentBuilder.append(" -->" + DocletConstants.NL);
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ if (!atNewline)
+ out.write(DocletConstants.NL);
+ out.write("<!-- ");
+ out.write(commentText);
+ out.write(" -->" + DocletConstants.NL);
+ return true;
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
index 03265d2..e923333 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,12 +25,20 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating document type for HTML pages of javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class DocType extends Content{
@@ -107,7 +115,9 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- contentBuilder.append(docType);
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ out.write(docType);
+ return true; // guaranteed by constructor
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
index 9689553..62b0f60 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -28,6 +28,11 @@
/**
* Enum representing HTML tag attributes.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public enum HtmlAttr {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
index c85927e..8b4b400 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -30,6 +30,11 @@
/**
* Stores constants for Html Doclet.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class HtmlConstants {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
index 979c72b..4af650d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,6 +29,7 @@
import java.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.ConfigurationImpl;
import com.sun.tools.doclets.internal.toolkit.*;
@@ -38,6 +39,11 @@
* are used by the Sub-Classes in the package com.sun.tools.doclets.standard
* and com.sun.tools.doclets.oneone.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Atul M Dambalkar
* @author Robert Field
@@ -77,48 +83,6 @@
public abstract Configuration configuration();
/**
- * Print Html Hyper Link.
- *
- * @param link String name of the file.
- * @param where Position of the link in the file. Character '#' is not
- * needed.
- * @param label Tag for the link.
- * @param strong Boolean that sets label to strong.
- */
- public void printHyperLink(String link, String where,
- String label, boolean strong) {
- print(getHyperLinkString(link, where, label, strong, "", "", ""));
- }
-
- /**
- * Print Html Hyper Link.
- *
- * @param link String name of the file.
- * @param where Position of the link in the file. Character '#' is not
- * needed.
- * @param label Tag for the link.
- */
- public void printHyperLink(String link, String where, String label) {
- printHyperLink(link, where, label, false);
- }
-
- /**
- * Print Html Hyper Link.
- *
- * @param link String name of the file.
- * @param where Position of the link in the file. Character '#' is not
- * needed.
- * @param label Tag for the link.
- * @param strong Boolean that sets label to strong.
- * @param stylename String style of text defined in style sheet.
- */
- public void printHyperLink(String link, String where,
- String label, boolean strong,
- String stylename) {
- print(getHyperLinkString(link, where, label, strong, stylename, "", ""));
- }
-
- /**
* Return Html Hyper Link string.
*
* @param link String name of the file.
@@ -180,7 +144,7 @@
public String getHyperLinkString(String link, String where,
String label, boolean strong,
String stylename, String title, String target) {
- StringBuffer retlink = new StringBuffer();
+ StringBuilder retlink = new StringBuilder();
retlink.append("<a href=\"");
retlink.append(link);
if (where != null && where.length() != 0) {
@@ -189,10 +153,10 @@
}
retlink.append("\"");
if (title != null && title.length() != 0) {
- retlink.append(" title=\"" + title + "\"");
+ retlink.append(" title=\"").append(title).append("\"");
}
if (target != null && target.length() != 0) {
- retlink.append(" target=\"" + target + "\"");
+ retlink.append(" target=\"").append(target).append("\"");
}
retlink.append(">");
if (stylename != null && stylename.length() != 0) {
@@ -263,15 +227,6 @@
}
/**
- * Print the name of the package, this class is in.
- *
- * @param cd ClassDoc.
- */
- public void printPkgName(ClassDoc cd) {
- print(getPkgName(cd));
- }
-
- /**
* Get the name of the package, this class is in.
*
* @param cd ClassDoc.
@@ -285,27 +240,6 @@
return "";
}
- /**
- * Keep track of member details list. Print the definition list start tag
- * if it is not printed yet.
- */
- public void printMemberDetailsListStartTag () {
- if (!getMemberDetailsListPrinted()) {
- dl();
- memberDetailsListPrinted = true;
- }
- }
-
- /**
- * Print the definition list end tag if the list start tag was printed.
- */
- public void printMemberDetailsListEndTag () {
- if (getMemberDetailsListPrinted()) {
- dlEnd();
- memberDetailsListPrinted = false;
- }
- }
-
public boolean getMemberDetailsListPrinted() {
return memberDetailsListPrinted;
}
@@ -319,12 +253,12 @@
* @param frameset the frameset to be added to the HTML document
*/
public void printFramesetDocument(String title, boolean noTimeStamp,
- Content frameset) {
+ Content frameset) throws IOException {
Content htmlDocType = DocType.Frameset();
Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
Content head = new HtmlTree(HtmlTag.HEAD);
if (! noTimeStamp) {
- Content headComment = new Comment("Generated by javadoc on " + today());
+ Content headComment = new Comment(getGeneratedByString());
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
@@ -339,7 +273,7 @@
head, frameset);
Content htmlDocument = new HtmlDocument(htmlDocType,
htmlComment, htmlTree);
- print(htmlDocument.toString());
+ write(htmlDocument);
}
/**
@@ -356,46 +290,9 @@
return space;
}
- /**
- * Print the closing </body> and </html> tags.
- */
- public void printBodyHtmlEnd() {
- println();
- bodyEnd();
- htmlEnd();
- }
-
- /**
- * Calls {@link #printBodyHtmlEnd()} method.
- */
- public void printFooter() {
- printBodyHtmlEnd();
- }
-
- /**
- * Print closing </html> tag.
- */
- public void printFrameFooter() {
- htmlEnd();
- }
-
- /**
- * Print ten non-breaking spaces("&nbsp;").
- */
- public void printNbsps() {
- print(" ");
- }
-
- /**
- * Get the day and date information for today, depending upon user option.
- *
- * @return String Today.
- * @see java.util.Calendar
- * @see java.util.GregorianCalendar
- * @see java.util.TimeZone
- */
- public String today() {
+ protected String getGeneratedByString() {
Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
- return calendar.getTime().toString();
+ Date today = calendar.getTime();
+ return "Generated by javadoc ("+ ConfigurationImpl.BUILD_DATE + ") on " + today;
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
index 458c174..b62fe75 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,13 +25,21 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
import java.util.*;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating an HTML document for javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class HtmlDocument extends Content {
@@ -69,7 +77,7 @@
*
* @param htmlContent html content to be added
*/
- public void addContent(Content htmlContent) {
+ public final void addContent(Content htmlContent) {
if (htmlContent.isValid())
docContent.add(htmlContent);
}
@@ -96,8 +104,9 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
+ public boolean write(Writer out, boolean atNewline) throws IOException {
for (Content c : docContent)
- c.write(contentBuilder);
+ atNewline = c.write(out, atNewline);
+ return atNewline;
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
index 8d53c46..61bb800 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -28,6 +28,11 @@
/**
* Enum representing HTML styles. The name map to values in the CSS file.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public enum HtmlStyle {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
index 6a58bb0..a4ee63d 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -28,6 +28,11 @@
/**
* Enum representing HTML tags.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public enum HtmlTag {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
index ba6d623..99543d1 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,13 +25,21 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
import java.util.*;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating HTML tree for javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class HtmlTree extends Content {
@@ -423,9 +431,9 @@
/**
* Generates a META tag with the http-equiv, content and charset attributes.
*
- * @param http-equiv http equiv attribute for the META tag
+ * @param httpEquiv http equiv attribute for the META tag
* @param content type of content
- * @param charset character set used
+ * @param charSet character set used
* @return an HtmlTree object for the META tag
*/
public static HtmlTree META(String httpEquiv, String content, String charSet) {
@@ -751,35 +759,41 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- if (!isInline() && !endsWithNewLine(contentBuilder))
- contentBuilder.append(DocletConstants.NL);
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ if (!isInline() && !atNewline)
+ out.write(DocletConstants.NL);
String tagString = htmlTag.toString();
- contentBuilder.append("<");
- contentBuilder.append(tagString);
+ out.write("<");
+ out.write(tagString);
Iterator<HtmlAttr> iterator = attrs.keySet().iterator();
HtmlAttr key;
String value = "";
while (iterator.hasNext()) {
key = iterator.next();
value = attrs.get(key);
- contentBuilder.append(" ");
- contentBuilder.append(key.toString());
+ out.write(" ");
+ out.write(key.toString());
if (!value.isEmpty()) {
- contentBuilder.append("=\"");
- contentBuilder.append(value);
- contentBuilder.append("\"");
+ out.write("=\"");
+ out.write(value);
+ out.write("\"");
}
}
- contentBuilder.append(">");
+ out.write(">");
+ boolean nl = false;
for (Content c : content)
- c.write(contentBuilder);
+ nl = c.write(out, nl);
if (htmlTag.endTagRequired()) {
- contentBuilder.append("</");
- contentBuilder.append(tagString);
- contentBuilder.append(">");
+ out.write("</");
+ out.write(tagString);
+ out.write(">");
}
- if (!isInline())
- contentBuilder.append(DocletConstants.NL);
+ if (!isInline()) {
+ out.write(DocletConstants.NL);
+ return true;
+ } else {
+ return false;
+ }
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
index 166f9ef..64ea876 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -32,14 +32,19 @@
/**
* Class for the Html format code generation.
- * Initilizes PrintWriter with FileWriter, to enable print
+ * Initializes PrintWriter with FileWriter, to enable print
* related methods to generate the code to the named File through FileWriter.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Atul M Dambalkar
* @author Bhavesh Patel (Modified)
*/
-public class HtmlWriter extends PrintWriter {
+public class HtmlWriter {
/**
* Name of the file, to which this writer is writing to.
@@ -148,6 +153,8 @@
public final Content descfrmInterfaceLabel;
+ private final Writer writer;
+
/**
* Constructor.
*
@@ -158,13 +165,13 @@
* @param docencoding Encoding to be used for this file.
* @exception IOException Exception raised by the FileWriter is passed on
* to next level.
- * @exception UnSupportedEncodingException Exception raised by the
+ * @exception UnsupportedEncodingException Exception raised by the
* OutputStreamWriter is passed on to next level.
*/
public HtmlWriter(Configuration configuration,
String path, String filename, String docencoding)
throws IOException, UnsupportedEncodingException {
- super(Util.genWriter(configuration, path, filename, docencoding));
+ writer = Util.genWriter(configuration, path, filename, docencoding);
this.configuration = configuration;
htmlFilename = filename;
this.memberDetailsListPrinted = false;
@@ -213,6 +220,14 @@
descfrmInterfaceLabel = getResource("doclet.Description_From_Interface");
}
+ public void write(Content c) throws IOException {
+ c.write(writer, true);
+ }
+
+ public void close() throws IOException {
+ writer.close();
+ }
+
/**
* Get the configuration string as a content.
*
@@ -247,38 +262,6 @@
}
/**
- * Print <HTML> tag. Add a newline character at the end.
- */
- public void html() {
- println("<HTML lang=\"" + configuration.getLocale().getLanguage() + "\">");
- }
-
- /**
- * Print </HTML> tag. Add a newline character at the end.
- */
- public void htmlEnd() {
- println("</HTML>");
- }
-
- /**
- * Print the script code to be embeded before the </HEAD> tag.
- */
- protected void printWinTitleScript(String winTitle){
- if(winTitle != null && winTitle.length() > 0) {
- script();
- println("function windowTitle()");
- println("{");
- println(" if (location.href.indexOf('is-external=true') == -1) {");
- println(" parent.document.title=\"" + winTitle + "\";");
- println(" }");
- println("}");
- scriptEnd();
- noScript();
- noScriptEnd();
- }
- }
-
- /**
* Returns an HtmlTree for the SCRIPT tag.
*
* @return an HtmlTree for the SCRIPT tag
@@ -321,64 +304,6 @@
}
/**
- * Print the Javascript <SCRIPT> start tag with its type
- * attribute.
- */
- public void script() {
- println("<SCRIPT type=\"text/javascript\">");
- }
-
- /**
- * Print the Javascript </SCRIPT> end tag.
- */
- public void scriptEnd() {
- println("</SCRIPT>");
- }
-
- /**
- * Print the Javascript <NOSCRIPT> start tag.
- */
- public void noScript() {
- println("<NOSCRIPT>");
- }
-
- /**
- * Print the Javascript </NOSCRIPT> end tag.
- */
- public void noScriptEnd() {
- println("</NOSCRIPT>");
- }
-
- /**
- * Return the Javascript call to be embedded in the <BODY> tag.
- * Return nothing if winTitle is empty.
- * @return the Javascript call to be embedded in the <BODY> tag.
- */
- protected String getWindowTitleOnload(){
- if(winTitle != null && winTitle.length() > 0) {
- return " onload=\"windowTitle();\"";
- } else {
- return "";
- }
- }
-
- /**
- * Print <BODY BGCOLOR="bgcolor">, including JavaScript
- * "onload" call to load windowtitle script. This script shows the name
- * of the document in the window title bar when frames are on.
- *
- * @param bgcolor Background color.
- * @param includeScript boolean set true if printing windowtitle script
- */
- public void body(String bgcolor, boolean includeScript) {
- print("<BODY BGCOLOR=\"" + bgcolor + "\"");
- if (includeScript) {
- print(getWindowTitleOnload());
- }
- println(">");
- }
-
- /**
* Returns an HtmlTree for the BODY tag.
*
* @param includeScript set true if printing windowtitle script
@@ -401,31 +326,6 @@
}
/**
- * Print </BODY> tag. Add a newline character at the end.
- */
- public void bodyEnd() {
- println("</BODY>");
- }
-
- /**
- * Print <TITLE> tag. Add a newline character at the end.
- */
- public void title() {
- println("<TITLE>");
- }
-
- /**
- * Print <TITLE> tag. Add a newline character at the end.
- *
- * @param winTitle The title of this document.
- */
- public void title(String winTitle) {
- // Set window title string which is later printed
- this.winTitle = winTitle;
- title();
- }
-
- /**
* Returns an HtmlTree for the TITLE tag.
*
* @return an HtmlTree for the TITLE tag
@@ -436,295 +336,6 @@
}
/**
- * Print </TITLE> tag. Add a newline character at the end.
- */
- public void titleEnd() {
- println("</TITLE>");
- }
-
- /**
- * Print <UL> tag. Add a newline character at the end.
- */
- public void ul() {
- println("<UL>");
- }
-
- /**
- * Print </UL> tag. Add a newline character at the end.
- */
- public void ulEnd() {
- println("</UL>");
- }
-
- /**
- * Print <LI> tag.
- */
- public void li() {
- print("<LI>");
- }
-
- /**
- * Print <LI TYPE="type"> tag.
- *
- * @param type Type string.
- */
- public void li(String type) {
- print("<LI TYPE=\"" + type + "\">");
- }
-
- /**
- * Print <H1> tag. Add a newline character at the end.
- */
- public void h1() {
- println("<H1>");
- }
-
- /**
- * Print </H1> tag. Add a newline character at the end.
- */
- public void h1End() {
- println("</H1>");
- }
-
- /**
- * Print text with <H1> tag. Also adds </H1> tag. Add a newline character
- * at the end of the text.
- *
- * @param text Text to be printed with <H1> format.
- */
- public void h1(String text) {
- h1();
- println(text);
- h1End();
- }
-
- /**
- * Print <H2> tag. Add a newline character at the end.
- */
- public void h2() {
- println("<H2>");
- }
-
- /**
- * Print text with <H2> tag. Also adds </H2> tag. Add a newline character
- * at the end of the text.
- *
- * @param text Text to be printed with <H2> format.
- */
- public void h2(String text) {
- h2();
- println(text);
- h2End();
- }
-
- /**
- * Print </H2> tag. Add a newline character at the end.
- */
- public void h2End() {
- println("</H2>");
- }
-
- /**
- * Print <H3> tag. Add a newline character at the end.
- */
- public void h3() {
- println("<H3>");
- }
-
- /**
- * Print text with <H3> tag. Also adds </H3> tag. Add a newline character
- * at the end of the text.
- *
- * @param text Text to be printed with <H3> format.
- */
- public void h3(String text) {
- h3();
- println(text);
- h3End();
- }
-
- /**
- * Print </H3> tag. Add a newline character at the end.
- */
- public void h3End() {
- println("</H3>");
- }
-
- /**
- * Print <H4> tag. Add a newline character at the end.
- */
- public void h4() {
- println("<H4>");
- }
-
- /**
- * Print </H4> tag. Add a newline character at the end.
- */
- public void h4End() {
- println("</H4>");
- }
-
- /**
- * Print text with <H4> tag. Also adds </H4> tag. Add a newline character
- * at the end of the text.
- *
- * @param text Text to be printed with <H4> format.
- */
- public void h4(String text) {
- h4();
- println(text);
- h4End();
- }
-
- /**
- * Print <H5> tag. Add a newline character at the end.
- */
- public void h5() {
- println("<H5>");
- }
-
- /**
- * Print </H5> tag. Add a newline character at the end.
- */
- public void h5End() {
- println("</H5>");
- }
-
- /**
- * Print HTML <IMG SRC="imggif" WIDTH="width" HEIGHT="height" ALT="imgname>
- * tag. It prepends the "images" directory name to the "imggif". This
- * method is used for oneone format generation. Add a newline character
- * at the end.
- *
- * @param imggif Image GIF file.
- * @param imgname Image name.
- * @param width Width of the image.
- * @param height Height of the image.
- */
- public void img(String imggif, String imgname, int width, int height) {
- println("<IMG SRC=\"images/" + imggif + ".gif\""
- + " WIDTH=\"" + width + "\" HEIGHT=\"" + height
- + "\" ALT=\"" + imgname + "\">");
- }
-
- /**
- * Print <MENU> tag. Add a newline character at the end.
- */
- public void menu() {
- println("<MENU>");
- }
-
- /**
- * Print </MENU> tag. Add a newline character at the end.
- */
- public void menuEnd() {
- println("</MENU>");
- }
-
- /**
- * Print <PRE> tag. Add a newline character at the end.
- */
- public void pre() {
- println("<PRE>");
- }
-
- /**
- * Print <PRE> tag without adding new line character at th eend.
- */
- public void preNoNewLine() {
- print("<PRE>");
- }
-
- /**
- * Print </PRE> tag. Add a newline character at the end.
- */
- public void preEnd() {
- println("</PRE>");
- }
-
- /**
- * Print <HR> tag. Add a newline character at the end.
- */
- public void hr() {
- println("<HR>");
- }
-
- /**
- * Print <HR SIZE="size" WIDTH="widthpercent%"> tag. Add a newline
- * character at the end.
- *
- * @param size Size of the ruler.
- * @param widthPercent Percentage Width of the ruler
- */
- public void hr(int size, int widthPercent) {
- println("<HR SIZE=\"" + size + "\" WIDTH=\"" + widthPercent + "%\">");
- }
-
- /**
- * Print <HR SIZE="size" NOSHADE> tag. Add a newline character at the end.
- *
- * @param size Size of the ruler.
- * @param noshade noshade string.
- */
- public void hr(int size, String noshade) {
- println("<HR SIZE=\"" + size + "\" NOSHADE>");
- }
-
- /**
- * Get the "<STRONG>" string.
- *
- * @return String Return String "<STRONG>";
- */
- public String getStrong() {
- return "<STRONG>";
- }
-
- /**
- * Get the "</STRONG>" string.
- *
- * @return String Return String "</STRONG>";
- */
- public String getStrongEnd() {
- return "</STRONG>";
- }
-
- /**
- * Print <STRONG> tag.
- */
- public void strong() {
- print("<STRONG>");
- }
-
- /**
- * Print </STRONG> tag.
- */
- public void strongEnd() {
- print("</STRONG>");
- }
-
- /**
- * Print text passed, in strong format using <STRONG> and </STRONG> tags.
- *
- * @param text String to be printed in between <STRONG> and </STRONG> tags.
- */
- public void strong(String text) {
- strong();
- print(text);
- strongEnd();
- }
-
- /**
- * Print text passed, in Italics using <I> and </I> tags.
- *
- * @param text String to be printed in between <I> and </I> tags.
- */
- public void italics(String text) {
- print("<I>");
- print(text);
- println("</I>");
- }
-
- /**
* Return, text passed, with Italics <i> and </i> tags, surrounding it.
* So if the text passed is "Hi", then string returned will be "<i>Hi</i>".
*
@@ -739,690 +350,16 @@
}
/**
- * Print "&nbsp;", non-breaking space.
- */
- public void space() {
- print(" ");
- }
-
- /**
* Return "&nbsp;", non-breaking space.
*/
public Content getSpace() {
return RawHtml.nbsp;
}
- /**
- * Print <DL> tag. Add a newline character at the end.
- */
- public void dl() {
- println("<DL>");
- }
-
- /**
- * Print </DL> tag. Add a newline character at the end.
- */
- public void dlEnd() {
- println("</DL>");
- }
-
- /**
- * Print <DT> tag.
- */
- public void dt() {
- print("<DT>");
- }
-
- /**
- * Print </DT> tag.
- */
- public void dtEnd() {
- print("</DT>");
- }
-
- /**
- * Print <DD> tag.
- */
- public void dd() {
- print("<DD>");
- }
-
- /**
- * Print </DD> tag. Add a newline character at the end.
- */
- public void ddEnd() {
- println("</DD>");
- }
-
- /**
- * Print <SUP> tag. Add a newline character at the end.
- */
- public void sup() {
- println("<SUP>");
- }
-
- /**
- * Print </SUP> tag. Add a newline character at the end.
- */
- public void supEnd() {
- println("</SUP>");
- }
-
- /**
- * Print <FONT SIZE="size"> tag. Add a newline character at the end.
- *
- * @param size String size.
- */
- public void font(String size) {
- println("<FONT SIZE=\"" + size + "\">");
- }
-
- /**
- * Print <FONT SIZE="size"> tag.
- *
- * @param size String size.
- */
- public void fontNoNewLine(String size) {
- print("<FONT SIZE=\"" + size + "\">");
- }
-
- /**
- * Print <FONT CLASS="stylename"> tag. Add a newline character at the end.
- *
- * @param stylename String stylename.
- */
- public void fontStyle(String stylename) {
- print("<FONT CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print <FONT SIZE="size" CLASS="stylename"> tag. Add a newline character
- * at the end.
- *
- * @param size String size.
- * @param stylename String stylename.
- */
- public void fontSizeStyle(String size, String stylename) {
- println("<FONT size=\"" + size + "\" CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print </FONT> tag.
- */
- public void fontEnd() {
- print("</FONT>");
- }
-
- /**
- * Get the "<FONT COLOR="color">" string.
- *
- * @param color String color.
- * @return String Return String "<FONT COLOR="color">".
- */
- public String getFontColor(String color) {
- return "<FONT COLOR=\"" + color + "\">";
- }
-
- /**
- * Get the "</FONT>" string.
- *
- * @return String Return String "</FONT>";
- */
- public String getFontEnd() {
- return "</FONT>";
- }
-
- /**
- * Print <CENTER> tag. Add a newline character at the end.
- */
- public void center() {
- println("<CENTER>");
- }
-
- /**
- * Print </CENTER> tag. Add a newline character at the end.
- */
- public void centerEnd() {
- println("</CENTER>");
- }
-
- /**
- * Print anchor <A NAME="name"> tag.
- *
- * @param name Name String.
- */
- public void aName(String name) {
- print("<A NAME=\"" + name + "\">");
- }
-
- /**
- * Print </A> tag.
- */
- public void aEnd() {
- print("</A>");
- }
-
- /**
- * Print <I> tag.
- */
- public void italic() {
- print("<I>");
- }
-
- /**
- * Print </I> tag.
- */
- public void italicEnd() {
- print("</I>");
- }
-
- /**
- * Print contents within anchor <A NAME="name"> tags.
- *
- * @param name String name.
- * @param content String contents.
- */
- public void anchor(String name, String content) {
- aName(name);
- print(content);
- aEnd();
- }
-
- /**
- * Print anchor <A NAME="name"> and </A>tags. Print comment string
- * "<!-- -->" within those tags.
- *
- * @param name String name.
- */
- public void anchor(String name) {
- anchor(name, "<!-- -->");
- }
-
- /**
- * Print newline and then print <P> tag. Add a newline character at the
- * end.
- */
- public void p() {
- println();
- println("<P>");
- }
-
- /**
- * Print newline and then print </P> tag. Add a newline character at the
- * end.
- */
- public void pEnd() {
- println();
- println("</P>");
- }
-
- /**
- * Print newline and then print <BR> tag. Add a newline character at the
- * end.
- */
- public void br() {
- println();
- println("<BR>");
- }
-
- /**
- * Print <ADDRESS> tag. Add a newline character at the end.
- */
- public void address() {
- println("<ADDRESS>");
- }
-
- /**
- * Print </ADDRESS> tag. Add a newline character at the end.
- */
- public void addressEnd() {
- println("</ADDRESS>");
- }
-
- /**
- * Print <HEAD> tag. Add a newline character at the end.
- */
- public void head() {
- println("<HEAD>");
- }
-
- /**
- * Print </HEAD> tag. Add a newline character at the end.
- */
- public void headEnd() {
- println("</HEAD>");
- }
-
- /**
- * Print <CODE> tag.
- */
- public void code() {
- print("<CODE>");
- }
-
- /**
- * Print </CODE> tag.
- */
- public void codeEnd() {
- print("</CODE>");
- }
-
- /**
- * Print <EM> tag. Add a newline character at the end.
- */
- public void em() {
- println("<EM>");
- }
-
- /**
- * Print </EM> tag. Add a newline character at the end.
- */
- public void emEnd() {
- println("</EM>");
- }
-
- /**
- * Print HTML <TABLE BORDER="border" WIDTH="width"
- * CELLPADDING="cellpadding" CELLSPACING="cellspacing"> tag.
- *
- * @param border Border size.
- * @param width Width of the table.
- * @param cellpadding Cellpadding for the table cells.
- * @param cellspacing Cellspacing for the table cells.
- */
- public void table(int border, String width, int cellpadding,
- int cellspacing) {
- println(DocletConstants.NL +
- "<TABLE BORDER=\"" + border +
- "\" WIDTH=\"" + width +
- "\" CELLPADDING=\"" + cellpadding +
- "\" CELLSPACING=\"" + cellspacing +
- "\" SUMMARY=\"\">");
- }
-
- /**
- * Print HTML <TABLE BORDER="border" WIDTH="width"
- * CELLPADDING="cellpadding" CELLSPACING="cellspacing" SUMMARY="summary"> tag.
- *
- * @param border Border size.
- * @param width Width of the table.
- * @param cellpadding Cellpadding for the table cells.
- * @param cellspacing Cellspacing for the table cells.
- * @param summary Table summary.
- */
- public void table(int border, String width, int cellpadding,
- int cellspacing, String summary) {
- println(DocletConstants.NL +
- "<TABLE BORDER=\"" + border +
- "\" WIDTH=\"" + width +
- "\" CELLPADDING=\"" + cellpadding +
- "\" CELLSPACING=\"" + cellspacing +
- "\" SUMMARY=\"" + summary + "\">");
- }
-
- /**
- * Print HTML <TABLE BORDER="border" CELLPADDING="cellpadding"
- * CELLSPACING="cellspacing"> tag.
- *
- * @param border Border size.
- * @param cellpadding Cellpadding for the table cells.
- * @param cellspacing Cellspacing for the table cells.
- */
- public void table(int border, int cellpadding, int cellspacing) {
- println(DocletConstants.NL +
- "<TABLE BORDER=\"" + border +
- "\" CELLPADDING=\"" + cellpadding +
- "\" CELLSPACING=\"" + cellspacing +
- "\" SUMMARY=\"\">");
- }
-
- /**
- * Print HTML <TABLE BORDER="border" CELLPADDING="cellpadding"
- * CELLSPACING="cellspacing" SUMMARY="summary"> tag.
- *
- * @param border Border size.
- * @param cellpadding Cellpadding for the table cells.
- * @param cellspacing Cellspacing for the table cells.
- * @param summary Table summary.
- */
- public void table(int border, int cellpadding, int cellspacing, String summary) {
- println(DocletConstants.NL +
- "<TABLE BORDER=\"" + border +
- "\" CELLPADDING=\"" + cellpadding +
- "\" CELLSPACING=\"" + cellspacing +
- "\" SUMMARY=\"" + summary + "\">");
- }
-
- /**
- * Print HTML <TABLE BORDER="border" WIDTH="width">
- *
- * @param border Border size.
- * @param width Width of the table.
- */
- public void table(int border, String width) {
- println(DocletConstants.NL +
- "<TABLE BORDER=\"" + border +
- "\" WIDTH=\"" + width +
- "\" SUMMARY=\"\">");
- }
-
- /**
- * Print the HTML table tag with border size 0 and width 100%.
- */
- public void table() {
- table(0, "100%");
- }
-
- /**
- * Print </TABLE> tag. Add a newline character at the end.
- */
- public void tableEnd() {
- println("</TABLE>");
- }
-
- /**
- * Print <TR> tag. Add a newline character at the end.
- */
- public void tr() {
- println("<TR>");
- }
-
- /**
- * Print </TR> tag. Add a newline character at the end.
- */
- public void trEnd() {
- println("</TR>");
- }
-
- /**
- * Print <TD> tag.
- */
- public void td() {
- print("<TD>");
- }
-
- /**
- * Print <TD NOWRAP> tag.
- */
- public void tdNowrap() {
- print("<TD NOWRAP>");
- }
-
- /**
- * Print <TD WIDTH="width"> tag.
- *
- * @param width String width.
- */
- public void tdWidth(String width) {
- print("<TD WIDTH=\"" + width + "\">");
- }
-
- /**
- * Print </TD> tag. Add a newline character at the end.
- */
- public void tdEnd() {
- println("</TD>");
- }
-
- /**
- * Print <LINK str> tag.
- *
- * @param str String.
- */
- public void link(String str) {
- println("<LINK " + str + ">");
- }
-
- /**
- * Print "<!-- " comment start string.
- */
- public void commentStart() {
- print("<!-- ");
- }
-
- /**
- * Print "-->" comment end string. Add a newline character at the end.
- */
- public void commentEnd() {
- println("-->");
- }
-
- /**
- * Print <CAPTION CLASS="stylename"> tag. Adds a newline character
- * at the end.
- *
- * @param stylename style to be applied.
- */
- public void captionStyle(String stylename) {
- println("<CAPTION CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print </CAPTION> tag. Add a newline character at the end.
- */
- public void captionEnd() {
- println("</CAPTION>");
- }
-
- /**
- * Print <TR BGCOLOR="color" CLASS="stylename"> tag. Adds a newline character
- * at the end.
- *
- * @param color String color.
- * @param stylename String stylename.
- */
- public void trBgcolorStyle(String color, String stylename) {
- println("<TR BGCOLOR=\"" + color + "\" CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print <TR BGCOLOR="color"> tag. Adds a newline character at the end.
- *
- * @param color String color.
- */
- public void trBgcolor(String color) {
- println("<TR BGCOLOR=\"" + color + "\">");
- }
-
- /**
- * Print <TR ALIGN="align" VALIGN="valign"> tag. Adds a newline character
- * at the end.
- *
- * @param align String align.
- * @param valign String valign.
- */
- public void trAlignVAlign(String align, String valign) {
- println("<TR ALIGN=\"" + align + "\" VALIGN=\"" + valign + "\">");
- }
-
- /**
- * Print <TH ALIGN="align"> tag.
- *
- * @param align the align attribute.
- */
- public void thAlign(String align) {
- print("<TH ALIGN=\"" + align + "\">");
- }
-
- /**
- * Print <TH CLASS="stylename" SCOPE="scope" NOWRAP> tag.
- *
- * @param stylename style to be applied.
- * @param scope the scope attribute.
- */
- public void thScopeNoWrap(String stylename, String scope) {
- print("<TH CLASS=\"" + stylename + "\" SCOPE=\"" + scope + "\" NOWRAP>");
- }
-
/*
* Returns a header for Modifier and Type column of a table.
*/
public String getModifierTypeHeader() {
return modifierTypeHeader;
}
-
- /**
- * Print <TH align="align" COLSPAN=i> tag.
- *
- * @param align the align attribute.
- * @param i integer.
- */
- public void thAlignColspan(String align, int i) {
- print("<TH ALIGN=\"" + align + "\" COLSPAN=\"" + i + "\">");
- }
-
- /**
- * Print <TH align="align" NOWRAP> tag.
- *
- * @param align the align attribute.
- */
- public void thAlignNowrap(String align) {
- print("<TH ALIGN=\"" + align + "\" NOWRAP>");
- }
-
- /**
- * Print </TH> tag. Add a newline character at the end.
- */
- public void thEnd() {
- println("</TH>");
- }
-
- /**
- * Print <TD COLSPAN=i> tag.
- *
- * @param i integer.
- */
- public void tdColspan(int i) {
- print("<TD COLSPAN=" + i + ">");
- }
-
- /**
- * Print <TD BGCOLOR="color" CLASS="stylename"> tag.
- *
- * @param color String color.
- * @param stylename String stylename.
- */
- public void tdBgcolorStyle(String color, String stylename) {
- print("<TD BGCOLOR=\"" + color + "\" CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print <TD COLSPAN=i BGCOLOR="color" CLASS="stylename"> tag.
- *
- * @param i integer.
- * @param color String color.
- * @param stylename String stylename.
- */
- public void tdColspanBgcolorStyle(int i, String color, String stylename) {
- print("<TD COLSPAN=" + i + " BGCOLOR=\"" + color + "\" CLASS=\"" +
- stylename + "\">");
- }
-
- /**
- * Print <TD ALIGN="align"> tag. Adds a newline character
- * at the end.
- *
- * @param align String align.
- */
- public void tdAlign(String align) {
- print("<TD ALIGN=\"" + align + "\">");
- }
-
- /**
- * Print <TD ALIGN="align" CLASS="stylename"> tag.
- *
- * @param align String align.
- * @param stylename String stylename.
- */
- public void tdVAlignClass(String align, String stylename) {
- print("<TD VALIGN=\"" + align + "\" CLASS=\"" + stylename + "\">");
- }
-
- /**
- * Print <TD VALIGN="valign"> tag.
- *
- * @param valign String valign.
- */
- public void tdVAlign(String valign) {
- print("<TD VALIGN=\"" + valign + "\">");
- }
-
- /**
- * Print <TD ALIGN="align" VALIGN="valign"> tag.
- *
- * @param align String align.
- * @param valign String valign.
- */
- public void tdAlignVAlign(String align, String valign) {
- print("<TD ALIGN=\"" + align + "\" VALIGN=\"" + valign + "\">");
- }
-
- /**
- * Print <TD ALIGN="align" ROWSPAN=rowspan> tag.
- *
- * @param align String align.
- * @param rowspan integer rowspan.
- */
- public void tdAlignRowspan(String align, int rowspan) {
- print("<TD ALIGN=\"" + align + "\" ROWSPAN=" + rowspan + ">");
- }
-
- /**
- * Print <TD ALIGN="align" VALIGN="valign" ROWSPAN=rowspan> tag.
- *
- * @param align String align.
- * @param valign String valign.
- * @param rowspan integer rowspan.
- */
- public void tdAlignVAlignRowspan(String align, String valign,
- int rowspan) {
- print("<TD ALIGN=\"" + align + "\" VALIGN=\"" + valign
- + "\" ROWSPAN=" + rowspan + ">");
- }
-
- /**
- * Print <BLOCKQUOTE> tag. Add a newline character at the end.
- */
- public void blockquote() {
- println("<BLOCKQUOTE>");
- }
-
- /**
- * Print </BLOCKQUOTE> tag. Add a newline character at the end.
- */
- public void blockquoteEnd() {
- println("</BLOCKQUOTE>");
- }
-
- /**
- * Get the "<code>" string.
- *
- * @return String Return String "<code>";
- */
- public String getCode() {
- return "<code>";
- }
-
- /**
- * Get the "</code>" string.
- *
- * @return String Return String "</code>";
- */
- public String getCodeEnd() {
- return "</code>";
- }
-
- /**
- * Print <NOFRAMES> tag. Add a newline character at the end.
- */
- public void noFrames() {
- println("<NOFRAMES>");
- }
-
- /**
- * Print </NOFRAMES> tag. Add a newline character at the end.
- */
- public void noFramesEnd() {
- println("</NOFRAMES>");
- }
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
index 56c2396..8ad3c40 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,12 +25,20 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating raw HTML content to be added to HTML pages of javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class RawHtml extends Content{
@@ -82,7 +90,16 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- contentBuilder.append(rawHtmlContent);
+ public String toString() {
+ return rawHtmlContent;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ out.write(rawHtmlContent);
+ return rawHtmlContent.endsWith(DocletConstants.NL);
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
index 2bf4437..adddb32 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,12 +25,20 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating string content for HTML tags of javadoc output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public class StringContent extends Content{
@@ -93,7 +101,10 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- contentBuilder.append(stringContent);
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ String s = stringContent.toString();
+ out.write(s);
+ return s.endsWith(DocletConstants.NL);
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
index 39f3af8..7f38f38 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,18 +25,19 @@
package com.sun.tools.doclets.internal.toolkit;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.builders.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.util.StringTokenizer;
/**
* An abstract implementation of a Doclet.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
index 64f4b34..18ada19 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,9 +30,10 @@
/**
* The interface for writing annotation type optional member output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
index fb83c2a..28a18f9 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,9 +31,11 @@
/**
* The interface for writing annotation type required member output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
index 9ef63b5..b65740e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -32,9 +32,10 @@
/**
* The interface for writing annotation type output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -152,7 +153,7 @@
*
* @param contentTree content tree that will be printed as a document
*/
- public void printDocument(Content contentTree);
+ public void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
index c5bfb13..f5904b3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -32,9 +32,10 @@
/**
* The interface for writing class output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -179,7 +180,7 @@
*
* @param contentTree content tree that will be printed as a document
*/
- public void printDocument(Content contentTree);
+ public void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
index e3d15eb..d3cf97c 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
@@ -25,12 +25,13 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.*;
+import java.util.*;
+
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
/**
* Configure the output based on the options. Doclets should sub-class
@@ -38,9 +39,10 @@
* all user options which are supported by the 1.1 doclet and the standard
* doclet.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Robert Field.
* @author Atul Dambalkar.
@@ -463,7 +465,7 @@
tagletManager.addNewSimpleCustomTag(tagName, null, "");
} else {
//Create a simple tag with the heading that has the same name as the tag.
- StringBuffer heading = new StringBuffer(tagName + ":");
+ StringBuilder heading = new StringBuilder(tagName + ":");
heading.setCharAt(0, Character.toUpperCase(tagName.charAt(0)));
tagletManager.addNewSimpleCustomTag(tagName, heading.toString(), "a");
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
index a2eab1b..1318a13 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit;
-import java.util.*;
import java.io.*;
+import java.util.*;
+
import com.sun.javadoc.*;
/**
* The interface for writing constants summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -137,6 +139,6 @@
*
* @param contentTree content tree which should be printed
*/
- public abstract void printDocument(Content contentTree);
+ public abstract void printDocument(Content contentTree) throws IOException;
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
index 8ad4824..f784b4a 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,9 +31,10 @@
/**
* The interface for writing constructor output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
index a7bdf96..836f7cf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,11 +25,20 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* A class to create content for javadoc output pages.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Bhavesh Patel
*/
public abstract class Content {
@@ -39,10 +48,16 @@
*
* @return string representation of the content
*/
+ @Override
public String toString() {
- StringBuilder contentBuilder = new StringBuilder();
- write(contentBuilder);
- return contentBuilder.toString();
+ StringWriter out = new StringWriter();
+ try {
+ write(out, true);
+ } catch (IOException e) {
+ // cannot happen from StringWriter
+ throw new DocletAbortException();
+ }
+ return out.toString();
}
/**
@@ -60,10 +75,10 @@
public abstract void addContent(String stringContent);
/**
- * Writes content to a StringBuilder.
+ * Writes content to a writer.
*
*/
- public abstract void write(StringBuilder contentBuilder);
+ public abstract boolean write(Writer writer, boolean atNewline) throws IOException ;
/**
* Returns true if the content is empty.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
index 8b14267..987c52f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,9 +31,10 @@
/**
* The interface for writing enum constant output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -56,7 +57,7 @@
* Get the enum constants documentation tree header.
*
* @param enumConstant the enum constant being documented
- * @param enumConstantDetailsTree the content tree representing enum constant details
+ * @param enumConstantsDetailsTree the content tree representing enum constant details
* @return content tree for the enum constant documentation header
*/
public Content getEnumConstantsTreeHeader(FieldDoc enumConstant,
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
index c17ac26..554f199 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,9 +31,10 @@
/**
* The interface for writing field output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
index 76baf59..53e0b5b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -32,9 +32,10 @@
/**
* The interface for writing member summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
index 1864bf9..ce4b90e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,9 +31,10 @@
/**
* The interface for writing method output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
index a5a023a..4aea909 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,9 +30,10 @@
/**
* The interface for writing class output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
index eb8bf7b..0013351 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,15 +25,17 @@
package com.sun.tools.doclets.internal.toolkit;
-import com.sun.javadoc.*;
import java.io.*;
+import com.sun.javadoc.*;
+
/**
* The interface for writing package summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -113,7 +115,7 @@
*
* @param contentTree the content tree that will be printed
*/
- public abstract void printDocument(Content contentTree);
+ public abstract void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
index 84454ac..89add8a 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -32,9 +32,10 @@
/**
* The interface for writing serialized form output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
@@ -150,7 +151,7 @@
*
* @param serializedTree the content tree that will be printed
*/
- public abstract void printDocument(Content serializedTree);
+ public abstract void printDocument(Content serializedTree) throws IOException;
/**
* Write the serialized form for a given field.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
index 252a54c..6c2fb5b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* The interface for a factory creates writers.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
index c016775..ef7b0d9 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,12 +25,13 @@
package com.sun.tools.doclets.internal.toolkit.builders;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
+
/**
* The superclass for all builders. A builder is a class that provides
* the structure and content of API documentation. A builder is completely
@@ -41,9 +42,10 @@
* do is implement the ConstantsSummaryWriter interface and pass it to the
* builder using a WriterFactory.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
index 6a4be60..b7454d9 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,16 +27,16 @@
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* The superclass for all member builders. Member builders are only executed
* within Class Builders. They essentially build sub-components. For example,
* method documentation is a sub-component of class documentation.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
index a92ea56..dbb7e4a 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the summary for a given annotation type.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -177,7 +179,7 @@
* @param annotationInfoTree the content tree to which the documentation will be added
*/
public void buildAnnotationTypeSignature(XMLNode node, Content annotationInfoTree) {
- StringBuffer modifiers = new StringBuffer(
+ StringBuilder modifiers = new StringBuilder(
annotationTypeDoc.modifiers() + " ");
writer.addAnnotationTypeSignature(Util.replaceText(
modifiers.toString(), "interface", "@interface"), annotationInfoTree);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
index b0abbc3..edcfbe2 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for optional annotation type members.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
index ec9c4f2..733eac3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for required annotation type members.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
index e35be11..71fb5a3 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,16 +25,17 @@
package com.sun.tools.doclets.internal.toolkit.builders;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The factory for constructing builders.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
index d050cab..9f5d095 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the summary for a given class.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -280,18 +282,18 @@
* @param classInfoTree the content tree to which the documentation will be added
*/
public void buildClassSignature(XMLNode node, Content classInfoTree) {
- StringBuffer modifiers = new StringBuffer(classDoc.modifiers() + " ");
+ StringBuilder modifiers = new StringBuilder(classDoc.modifiers() + " ");
if (isEnum) {
modifiers.append("enum ");
int index;
if ((index = modifiers.indexOf("abstract")) >= 0) {
- modifiers.delete(index, index + (new String("abstract")).length());
- modifiers = new StringBuffer(
+ modifiers.delete(index, index + "abstract".length());
+ modifiers = new StringBuilder(
Util.replaceText(modifiers.toString(), " ", " "));
}
if ((index = modifiers.indexOf("final")) >= 0) {
- modifiers.delete(index, index + (new String("final")).length());
- modifiers = new StringBuffer(
+ modifiers.delete(index, index + "final".length());
+ modifiers = new StringBuilder(
Util.replaceText(modifiers.toString(), " ", " "));
}
//} else if (classDoc.isAnnotationType()) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
index bded1e8..6de9f78 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the Constants Summary Page.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -345,7 +347,6 @@
/**
* Return the list of visible constant fields for the given classdoc.
- * @param cd the classdoc to examine.
* @return the list of visible constant fields for the given classdoc.
*/
protected List<FieldDoc> members() {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
index 68efe8c..20f9308 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a constructor.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
index 868297b..36f5d39 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a enum constants.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
index 0416ba9..4f05027 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a field.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
index 3445d96..f6e2f33 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -24,18 +24,26 @@
*/
package com.sun.tools.doclets.internal.toolkit.builders;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import java.io.*;
import java.util.*;
+
+import javax.xml.parsers.*;
+
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
-import javax.xml.parsers.*;
+
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Parse the XML that specified the order of operation for the builders. This
* Parser uses SAX parsing.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
* @see SAXParser
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
index 8ad4c58..2d81a4c 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the member summary.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -165,7 +167,6 @@
* This information can be used for doclet specific documentation
* generation.
*
- * @param classDoc the {@link ClassDoc} we want to check.
* @param type the type of members to return.
* @return a list of methods that will be documented.
* @see VisibleMemberMap
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
index 0a28d89..ed93335 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
index 3f4494a..b6dcab6 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.io.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the summary for a given package.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
index 013120b..66e8478 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the serialized form.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
index 4b414da..ae335b9 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -32,6 +32,11 @@
/**
* Simple class to represent the attribute and elements of an XML node.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class XMLNode {
XMLNode(XMLNode parent, String qname) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
index a3b53f3..ce15461 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -29,9 +29,10 @@
* An abstract class for that implements the {@link Taglet} interface
* for tags in <code>ExecutableMembers</code>.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
index 2dff841..24383b8 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -28,9 +28,10 @@
/**
* An abstract inline taglet that outputs HTML.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
index c0c6bff..e83ac83 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,15 +25,15 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.javadoc.*;
/**
* An abstract class for that implements the {@link Taglet} interface.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
index 444771b..4fec565 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -40,6 +40,11 @@
* displays as:
* <blockquote> The type {@code List<P>} </blockquote>
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
index b2035b3..fc7fc24 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,9 +30,10 @@
/**
* A taglet that represents the @deprecated tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
index f895b67..8998f26 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -32,9 +32,10 @@
* used to get the relative path to the document's root output
* directory.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @author Doug Kramer
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
index 554756b..e737f9c 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -33,9 +33,10 @@
* be used with a method. It is used to inherit documentation from overriden
* and implemented methods.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
index 20a265d..89518e8 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,6 +31,11 @@
* A taglet should implement this interface if it supports the inheritDoc
* tag or is automatically inherited if it is missing.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
index b8cfa6f..2955406 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -36,9 +36,10 @@
* This taglet is able to wrap most most legacy taglets because
* the standard doclet is the only known doclet to use legacy taglets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @since 1.5
* @author Jamie Ho
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
index 7a465e3..75cc3cf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -38,6 +38,11 @@
* displays as:
* <blockquote> {@literal a<B>c} </blockquote>
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
@@ -79,7 +84,7 @@
* Replace occurrences of the following characters: < > &
*/
protected static String textToString(String text) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < text.length(); i++) {
char c = text.charAt(i);
switch (c) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
index 449bc1f..ad4bf8b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* A taglet that represents the @param tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
@@ -182,7 +184,7 @@
* Given an array of <code>ParamTag</code>s,return its string representation.
* Try to inherit the param tags that are missing.
*
- * @param doc the doc that holds the param tags.
+ * @param holder the doc that holds the param tags.
* @param writer the TagletWriter that will write this tag.
* @param formalParameters The array of parmeters (from type or executable
* member) to check.
@@ -255,7 +257,7 @@
* been documented.
* @param rankMap a {@link java.util.Map} which holds ordering
* information about the parameters.
- * @param nameMap a {@link java.util.Map} which holds a mapping
+ * @param rankMap a {@link java.util.Map} which holds a mapping
* of a rank of a parameter to its name. This is
* used to ensure that the right name is used
* when parameter documentation is inherited.
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
index f5e90c8..9d98a96 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* A taglet that represents the @return tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
index bca2707..4e3e810 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* A taglet that represents the @see tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
index 3051503..4b21cbd 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -30,9 +30,10 @@
/**
* A simple single argument custom tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
index 70cee39..040c9ea 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
@@ -25,20 +25,21 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
import java.io.*;
import java.lang.reflect.*;
import java.net.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
+
/**
* Manages the<code>Taglet</code>s used by doclets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
@@ -448,7 +449,7 @@
//This known tag is excluded.
return;
}
- StringBuffer combined_locations = new StringBuffer();
+ StringBuilder combined_locations = new StringBuilder();
for (int i = 0; i < locations.length; i++) {
if (i > 0) {
combined_locations.append(", ");
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java
index e0dabc2..c7bbef4 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,6 +30,11 @@
* different doclets work with different formats of output. A single taglet can
* work with any doclet that provides an implementation of taglet output.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
index b26845c..2e594db 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,13 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The interface for the taglet writer.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.5
* @author Jamie Ho
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
index d25618a..7b8b365 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* A taglet that represents the @throws tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
index e07bc15..90794bf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,10 +25,11 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* An inline Taglet representing the value tag. This tag should only be used with
@@ -39,9 +40,10 @@
* is retrieved for the field that the inline tag appears on. The name is specifed
* in the following format: [fully qualified class name]#[constant field name].
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
@@ -107,7 +109,7 @@
* @param config the current configuration of the doclet.
* @param tag the value tag.
* @param name the name of the field to search for. The name should be in
- * <qualified class name>#<field name> format. If the class name is omitted,
+ * {@code <qualified class name>#<field name>} format. If the class name is omitted,
* it is assumed that the field is in the current class.
*
* @return the corresponding FieldDoc. If the name is null or empty string,
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
index 529d4fc..9e83edf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,9 +36,10 @@
* those classes so that we can retrieve all of the classes from a particular
* package later.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.4
@@ -184,7 +185,7 @@
/**
* Return all of the classes specified on the command-line that
* belong to the given package.
- * @param packageDoc the package to return the classes for.
+ * @param pkgDoc the package to return the classes for.
*/
public ClassDoc[] allClasses(PackageDoc pkgDoc) {
return pkgDoc.isIncluded() ?
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
index 5da917e..39f9adf 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Build Class Hierarchy for all the Classes. This class builds the Class
* Tree and the Interface Tree separately.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @see java.util.HashMap
* @see java.util.List
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
index 017ed72..a7eb4f6 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,15 +25,17 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.javadoc.*;
import java.util.*;
+import com.sun.javadoc.*;
+
/**
* Map all class uses for a given class.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @since 1.2
* @author Robert G. Field
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java
index d74c08e..5c88214 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -30,9 +30,10 @@
/**
* Find a commented method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
*/
public class CommentedMethodFinder extends MethodFinder {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
index 5c64a8f..8f8a096 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,13 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.javadoc.*;
import java.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
* Build list of all the deprecated packages, classes, constructors, fields and methods.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Atul M Dambalkar
*/
public class DeprecatedAPIListBuilder {
@@ -145,7 +151,7 @@
/**
* Return the list of deprecated Doc objects of a given type.
*
- * @param the constant representing the type of list being returned.
+ * @param type the constant representing the type of list being returned.
*/
public List<Doc> getList(int type) {
return deprecatedLists.get(type);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java
index fd50d8f..a91a1b7 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -119,7 +119,7 @@
if (packageName == null || packageName.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < packageName.length(); i++) {
char ch = packageName.charAt(i);
if (ch == '.') {
@@ -151,7 +151,7 @@
if (name == null || name.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < name.length(); i++) {
char ch = name.charAt(i);
if (ch == '.') {
@@ -181,7 +181,7 @@
* @see #getPath(String)
*/
public static String getRelativePath(String from, String to) {
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
pathstr.append(getRelativePath(from));
pathstr.append(getPath(to));
pathstr.append(URL_FILE_SEPARATOR);
@@ -222,7 +222,7 @@
if (from == null || from.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < from.length(); i++) {
char ch = from.charAt(i);
if (ch == '.') {
@@ -293,7 +293,7 @@
* @param filename File name to be appended to the path of the package.
*/
public static String getPathToPackage(PackageDoc pd, String filename) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String pathstr = createPathString(pd);
if (pathstr.length() > 0) {
buf.append(pathstr);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
index b23e5db..a0e4015 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,13 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import java.util.*;
/**
* Search for the requested documentation. Inherit documentation if necessary.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
index c93d5bc..6261cae 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,6 +25,12 @@
package com.sun.tools.doclets.internal.toolkit.util;
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
public class DocletAbortException extends RuntimeException {
private static final long serialVersionUID = -9131058909576418984L;
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
index f962080..8f0fd4c 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -29,9 +29,10 @@
* Stores all constants for a Doclet. Extend this class if you have doclet
* specific constants to add.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
index 32a4a0d..5c1cf1b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,13 +25,13 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-import com.sun.javadoc.*;
-import java.util.Map;
-import java.util.HashMap;
import java.io.*;
import java.net.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Process and manage "-link" and "-linkoffline" to external packages. The
@@ -40,9 +40,10 @@
* documented) file in the current or the destination directory, while
* generating the documentation.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
* @author Robert Field
@@ -91,7 +92,7 @@
* If the same package name is found in the map, then the first mapped
* Item object or offline location will be retained.
*
- * @param packagename Package name found in the "package-list" file.
+ * @param packageName Package name found in the "package-list" file.
* @param path URL or Directory path from where the "package-list"
* file is picked.
* @param relative True if path is URL, false if directory path.
@@ -179,7 +180,7 @@
/**
* Get the Extern Item object associated with this package name.
*
- * @param pkgname Package name.
+ * @param pkgName Package name.
*/
private Item findPackageItem(String pkgName) {
if (packageToItemMap == null) {
@@ -276,7 +277,7 @@
boolean relative)
throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(input));
- StringBuffer strbuf = new StringBuffer();
+ StringBuilder strbuf = new StringBuilder();
try {
int c;
while ((c = in.read()) >= 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
index 5893f30..be5284e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,10 +25,11 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Process and manage grouping of packages, as specified by "-group" option on
* the command line.
@@ -48,9 +49,10 @@
* will put the package java.lang in the group "Lang" and not in group "Core".
* </p>
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
index 3783442..c2bfc13 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
-import java.util.*;
/**
* For a given class method, build an array of interface methods which it
* implements.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
index 7e62722..e695821 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,19 +25,21 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Build the mapping of each Unicode character with it's member lists
* containing members names starting with it. Also build a list for all the
* Unicode characters which start a member name. Member name is
* classkind or field or method or constructor name.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @since 1.2
* @see java.lang.Character
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
index 7e264c8..d761cfe 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -24,18 +24,20 @@
*/
package com.sun.tools.doclets.internal.toolkit.util;
+import java.text.MessageFormat;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
-import java.util.*;
-import java.text.MessageFormat;
/**
* Retrieve and format messages stored in a resource.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @since 1.2
* @author Atul M Dambalkar
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
index e9fd61e..2f81425 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -25,19 +25,21 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Provides methods for creating an array of class, method and
* field names to be included as meta keywords in the HTML header
* of class pages. These keywords improve search results
* on browsers that look for keywords.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Doug Kramer
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java
index a19e8c1..68e0827 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -33,9 +33,10 @@
* superclasses and interfaces(subsequently super-interfaces also)
* recursively.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public abstract class MethodFinder {
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
index a32f048..4586dee 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.io.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Write out the package index.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @see com.sun.javadoc.PackageDoc
* @author Atul M Dambalkar
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java
index e4c7fbc..2854b49 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -30,9 +30,10 @@
/**
* Find a tagged method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
index a9e2aa0..074718f 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,9 +30,10 @@
* A tag that holds nothing but plain text. This is useful for passing
* text to methods that only accept inline tags as a parameter.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Jamie Ho
* @since 1.5
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
index 25b8db9..c01ac3e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -34,9 +34,10 @@
/**
* Utilities Class for Doclets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
* @author Jamie Ho
@@ -366,7 +367,13 @@
while((n = in.read(buf))>0) out.write(buf,0,n);
} else {
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+ BufferedWriter writer;
+ if (configuration.docencoding == null) {
+ writer = new BufferedWriter(new OutputStreamWriter(out));
+ } else {
+ writer = new BufferedWriter(new OutputStreamWriter(out,
+ configuration.docencoding));
+ }
try {
String line;
while ((line = reader.readLine()) != null) {
@@ -643,9 +650,9 @@
fos = new FileOutputStream(filename);
}
if (docencoding == null) {
- return new OutputStreamWriter(fos);
+ return new BufferedWriter(new OutputStreamWriter(fos));
} else {
- return new OutputStreamWriter(fos, docencoding);
+ return new BufferedWriter(new OutputStreamWriter(fos, docencoding));
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
index 4d88a7e..e8004c1 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -25,9 +25,10 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import java.util.*;
/**
* A data structure that encapsulates the visible members of a particular
@@ -36,9 +37,10 @@
* or method) and the leaf of the class tree. The data structure will map
* all visible members in the leaf and classes above the leaf in the tree.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @author Atul M Dambalkar
* @author Jamie Ho (rewrite)
@@ -125,7 +127,7 @@
* Return the package private members inherited by the class. Only return
* if parent is package private and not documented.
*
- * @param configuation the current configuration of the doclet.
+ * @param configuration the current configuration of the doclet.
* @return the package private members inherited by the class.
*/
private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
@@ -148,7 +150,7 @@
* end of the list members that are inherited by inaccessible parents. We
* document these members in the child because the parent is not documented.
*
- * @param configuation the current configuration of the doclet.
+ * @param configuration the current configuration of the doclet.
*/
public List<ProgramElementDoc> getLeafClassMembers(Configuration configuration) {
List<ProgramElementDoc> result = getMembersFor(classdoc);
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
index 37855ae..e9539a4 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,6 +30,11 @@
/**
* A factory that constructs links from given link information.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
index 4e3517d..53acdd5 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,6 +31,11 @@
/**
* Encapsulates information about a link.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
index 156a009..cb58ae4 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -28,6 +28,11 @@
/**
* Stores output of a link.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Jamie Ho
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java b/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
index 01838e9..e485804 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
@@ -26,6 +26,7 @@
package com.sun.tools.javac.api;
import java.io.IOException;
+import java.util.Collection;
import java.util.Locale;
import javax.annotation.processing.Processor;
@@ -43,7 +44,6 @@
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.util.Context;
-import java.util.Collection;
/**
* Provides basic functionality for implementations of JavacTask.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
index 18aafee..fab0ada 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -138,7 +138,7 @@
/**
* Configure the set of diagnostic parts that should be displayed
* by the formatter.
- * @param options options to set
+ * @param visibleParts the parts to be set
*/
public void setVisible(Set<DiagnosticPart> visibleParts);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
index 0be82fb..0a7a461 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -66,7 +66,7 @@
* Constructor used by service provider mechanism. The recommended way to
* obtain an instance of this class is by using {@link #create} or the
* service provider mechanism.
- * @see javax.tools.JavaCompilerTool
+ * @see javax.tools.JavaCompiler
* @see javax.tools.ToolProvider
* @see #create
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
index c446e0a..174b3ff 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -60,8 +60,8 @@
import com.sun.tools.javac.comp.MemberEnter;
import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.model.JavacElements;
-import com.sun.tools.javac.tree.EndPosTable;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.tree.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.TreeCopier;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
index 41d9874..2472834 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -31,8 +31,9 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.tools.JavaFileObject.Kind;
+
import javax.tools.*;
+import javax.tools.JavaFileObject.Kind;
/**
* Wraps all calls to a given file manager. Subclasses of this class
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java b/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java
index 486e9b6..84d9108 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java
@@ -26,18 +26,18 @@
package com.sun.tools.javac.code;
import java.util.Map;
+
import javax.tools.JavaFileObject;
import com.sun.tools.javac.comp.Annotate;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
+import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Pair;
-
import static com.sun.tools.javac.code.Kinds.PCK;
-import com.sun.tools.javac.util.*;
/**
* Container for all annotations (attributes in javac) on a Symbol.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java b/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
index 3d8f00e..022681b 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -30,8 +30,8 @@
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.ListBuffer;
/**
*
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
index f9dfc13..d160157 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
@@ -25,10 +25,11 @@
package com.sun.tools.javac.code;
-import java.util.EnumSet;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
+
import javax.lang.model.element.Modifier;
/** Access flags and other modifiers for Java classes and members.
@@ -66,6 +67,7 @@
if ((mask&NATIVE) != 0) flags.add(Flag.NATIVE);
if ((mask&INTERFACE) != 0) flags.add(Flag.INTERFACE);
if ((mask&ABSTRACT) != 0) flags.add(Flag.ABSTRACT);
+ if ((mask&DEFAULT) != 0) flags.add(Flag.DEFAULT);
if ((mask&STRICTFP) != 0) flags.add(Flag.STRICTFP);
if ((mask&BRIDGE) != 0) flags.add(Flag.BRIDGE);
if ((mask&SYNTHETIC) != 0) flags.add(Flag.SYNTHETIC);
@@ -251,6 +253,11 @@
*/
public static final long CLASH = 1L<<42;
+ /**
+ * Flag that marks either a default method or an interface containing default methods
+ */
+ public static final long DEFAULT = 1L<<43;
+
/** Modifier masks.
*/
public static final int
@@ -266,7 +273,10 @@
MethodFlags = AccessFlags | ABSTRACT | STATIC | NATIVE |
SYNCHRONIZED | FINAL | STRICTFP;
public static final long
- LocalVarFlags = FINAL | PARAMETER;
+ ExtendedStandardFlags = (long)StandardFlags | DEFAULT,
+ InterfaceDefaultMethodMask = ABSTRACT | PUBLIC | STRICTFP | SYNCHRONIZED | DEFAULT,
+ LocalVarFlags = FINAL | PARAMETER;
+
public static Set<Modifier> asModifierSet(long flags) {
Set<Modifier> modifiers = modifierSets.get(flags);
@@ -319,6 +329,7 @@
NATIVE("native"),
INTERFACE("interface"),
ABSTRACT("abstract"),
+ DEFAULT("default"),
STRICTFP("strictfp"),
BRIDGE("bridge"),
SYNTHETIC("synthetic"),
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
index 9495ddf..dc0d52f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -31,9 +31,8 @@
import com.sun.source.tree.MemberReferenceTree;
import com.sun.tools.javac.api.Formattable;
import com.sun.tools.javac.api.Messages;
-
-import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.TypeTags.*;
/** Internal symbol kinds, which distinguish between elements of
* different subclasses of Symbol. Symbol kinds are organized so they can be
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
index 644955c..5d7e430 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -28,18 +28,13 @@
import java.util.Locale;
import com.sun.tools.javac.api.Messages;
-import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.Pretty;
-import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
-
-import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.TypeTags.*;
/**
* A combined type/symbol visitor for generating non-trivial localized string
@@ -129,7 +124,7 @@
/**
* Get a localized string represenation for a given type.
*
- * @param ts type to be displayed
+ * @param t type to be displayed
* @param locale the locale in which the string is to be rendered
* @return localized string representation
*/
@@ -140,7 +135,7 @@
/**
* Get a localized string represenation for a given symbol.
*
- * @param ts symbol to be displayed
+ * @param s symbol to be displayed
* @param locale the locale in which the string is to be rendered
* @return localized string representation
*/
@@ -187,7 +182,7 @@
@Override
public String visitClassType(ClassType t, Locale locale) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (t.getEnclosingType().tag == CLASS && t.tsym.owner.kind == Kinds.TYP) {
buf.append(visit(t.getEnclosingType(), locale));
buf.append(".");
@@ -215,7 +210,7 @@
@Override
public String visitWildcardType(WildcardType t, Locale locale) {
- StringBuffer s = new StringBuffer();
+ StringBuilder s = new StringBuilder();
s.append(t.kind);
if (t.kind != UNBOUND) {
s.append(visit(t.type, locale));
@@ -253,7 +248,7 @@
protected String className(ClassType t, boolean longform, Locale locale) {
Symbol sym = t.tsym;
if (sym.name.length() == 0 && (sym.flags() & COMPOUND) != 0) {
- StringBuffer s = new StringBuffer(visit(t.supertype_field, locale));
+ StringBuilder s = new StringBuilder(visit(t.supertype_field, locale));
for (List<Type> is = t.interfaces_field; is.nonEmpty(); is = is.tail) {
s.append("&");
s.append(visit(is.head, locale));
@@ -292,7 +287,7 @@
if (!varArgs) {
return visitTypes(args, locale);
} else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
while (args.tail.nonEmpty()) {
buf.append(visit(args.head, locale));
args = args.tail;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
index db96649..e8153da 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -25,9 +25,10 @@
package com.sun.tools.javac.code;
-import com.sun.tools.javac.util.*;
import java.util.Iterator;
+import com.sun.tools.javac.util.*;
+
/** A scope represents an area of visibility in a Java program. The
* Scope class is a container for symbols which provides
* efficient access to symbols given their names. Scopes are implemented
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
index f83823a..04a59ce 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
@@ -26,12 +26,12 @@
package com.sun.tools.javac.code;
import java.util.*;
+
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import com.sun.tools.javac.util.*;
import com.sun.tools.javac.jvm.Target;
-
+import com.sun.tools.javac.util.*;
import static com.sun.tools.javac.main.Option.*;
/** The source language version accepted.
@@ -203,6 +203,9 @@
public boolean allowMethodReferences() {
return compareTo(JDK1_8) >= 0;
}
+ public boolean allowDefaultMethods() {
+ return compareTo(JDK1_8) >= 0;
+ }
public boolean allowEffectivelyFinalInInnerClasses() {
return compareTo(JDK1_8) >= 0;
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
index 010d441..328cfcf 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -27,11 +27,10 @@
import java.util.Set;
import java.util.concurrent.Callable;
+
import javax.lang.model.element.*;
import javax.tools.JavaFileObject;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
@@ -39,7 +38,8 @@
import com.sun.tools.javac.jvm.*;
import com.sun.tools.javac.model.*;
import com.sun.tools.javac.tree.JCTree;
-
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Name;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
index c09d31e..29ce859 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -26,17 +26,17 @@
package com.sun.tools.javac.code;
import java.util.*;
-import javax.lang.model.type.TypeVisitor;
-import javax.lang.model.element.ElementVisitor;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
+import javax.lang.model.element.ElementVisitor;
+import javax.lang.model.type.TypeVisitor;
+
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.jvm.*;
-
-import static com.sun.tools.javac.jvm.ByteCodes.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.jvm.ByteCodes.*;
/** A class that defines all predefined constants and operators
* as well as special classes such as java.lang.Object, which need
@@ -301,7 +301,7 @@
}
/** Enter a class into symbol table.
- * @param The name of the class.
+ * @param s The name of the class.
*/
private Type enterClass(String s) {
return reader.enterClass(names.fromString(s)).type;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java b/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
index 6c24287..573f627 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,11 +25,11 @@
package com.sun.tools.javac.code;
-import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
-
import java.util.EnumSet;
import java.util.Set;
+import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
+
/**
* Describes the type of program element an extended annotation (or extended
* compound attribute) targets.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
index eefbf90..362bb42 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
@@ -26,10 +26,6 @@
package com.sun.tools.javac.code;
import java.util.Collections;
-
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.*;
-
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.Map;
@@ -37,6 +33,8 @@
import javax.lang.model.type.*;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.util.*;
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java
index d46286a..aecf93b 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -106,7 +106,7 @@
*/
public static final int DEFERRED = FORALL+1;
- /** The tag of the bottom type <null>.
+ /** The tag of the bottom type {@code <null>}.
*/
public static final int BOT = DEFERRED+1;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
index 0cb2b07..9bc13e5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -28,21 +28,19 @@
import java.lang.ref.SoftReference;
import java.util.*;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
-
-import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javac.code.Attribute.RetentionPolicy;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Type.UndetVar.InferenceBound;
import com.sun.tools.javac.comp.Check;
-
+import com.sun.tools.javac.jvm.ClassReader;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.code.BoundKind.*;
+import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Scope.*;
+import static com.sun.tools.javac.code.Symbol.*;
import static com.sun.tools.javac.code.Type.*;
import static com.sun.tools.javac.code.TypeTags.*;
-import static com.sun.tools.javac.code.Symbol.*;
-import static com.sun.tools.javac.code.Flags.*;
-import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.util.ListBuffer.lb;
/**
@@ -1429,8 +1427,8 @@
* conservative in that it is allowed to say that two types are
* not disjoint, even though they actually are.
*
- * The type C<X> is castable to C<Y> exactly if X and Y are not
- * disjoint.
+ * The type {@code C<X>} is castable to {@code C<Y>} exactly if
+ * {@code X} and {@code Y} are not disjoint.
*/
public boolean disjointType(Type t, Type s) {
return disjointType.visit(t, s);
@@ -1525,7 +1523,7 @@
* something of type `t' can be a subtype of `s'? This is
* different from the question "is `t' not a subtype of `s'?"
* when type variables are involved: Integer is not a subtype of T
- * where <T extends Number> but it is not true that Integer cannot
+ * where {@code <T extends Number>} but it is not true that Integer cannot
* possibly be a subtype of T.
*/
public boolean notSoftSubtype(Type t, Type s) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index e112973..1274431 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -25,34 +25,32 @@
package com.sun.tools.javac.comp;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
-import com.sun.tools.javac.comp.Infer.InferenceContext;
-import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
-import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-import com.sun.tools.javac.util.List;
+import java.util.*;
+import java.util.Set;
-import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.code.Lint.LintCategory;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.comp.Check.CheckContext;
+import javax.lang.model.element.ElementKind;
+import javax.tools.JavaFileObject;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.TreeVisitor;
import com.sun.source.util.SimpleTreeVisitor;
-
-import java.util.*;
-import java.util.Set;
-import javax.lang.model.element.ElementKind;
-import javax.tools.JavaFileObject;
-
+import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type.*;
+import com.sun.tools.javac.comp.Check.CheckContext;
+import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
+import com.sun.tools.javac.comp.Infer.InferenceContext;
+import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
+import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Flags.ANNOTATION;
import static com.sun.tools.javac.code.Flags.BLOCK;
@@ -742,7 +740,7 @@
* @param env The env for the const value
* @param initializer The initializer for the const value
* @param type The expected type, or null
- * @see VarSymbol#setlazyConstValue
+ * @see VarSymbol#setLazyConstValue
*/
public Object attribLazyConstantValue(Env<AttrContext> env,
JCTree.JCExpression initializer,
@@ -875,6 +873,7 @@
public void visitMethodDef(JCMethodDecl tree) {
MethodSymbol m = tree.sym;
+ boolean isDefaultMethod = (m.flags() & DEFAULT) != 0;
Lint lint = env.info.lint.augment(m.annotations, m.flags());
Lint prevLint = chk.setLint(lint);
@@ -954,8 +953,8 @@
// Empty bodies are only allowed for
// abstract, native, or interface methods, or for methods
// in a retrofit signature class.
- if ((owner.flags() & INTERFACE) == 0 &&
- (tree.mods.flags & (ABSTRACT | NATIVE)) == 0 &&
+ if (isDefaultMethod || ((owner.flags() & INTERFACE) == 0 &&
+ (tree.mods.flags & (ABSTRACT | NATIVE)) == 0) &&
!relax)
log.error(tree.pos(), "missing.meth.body.or.decl.abstract");
if (tree.defaultValue != null) {
@@ -963,7 +962,7 @@
log.error(tree.pos(),
"default.allowed.in.intf.annotation.member");
}
- } else if ((owner.flags() & INTERFACE) != 0) {
+ } else if ((owner.flags() & INTERFACE) != 0 && !isDefaultMethod) {
log.error(tree.body.pos(), "intf.meth.cant.have.body");
} else if ((tree.mods.flags & ABSTRACT) != 0) {
log.error(tree.pos(), "abstract.meth.cant.have.body");
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index 8765148..d167929 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -230,7 +230,6 @@
/** Warn about unsafe vararg method decl.
* @param pos Position to be used for error reporting.
- * @param sym The deprecated symbol.
*/
void warnUnsafeVararg(DiagnosticPosition pos, String key, Object... args) {
if (lint.isEnabled(LintCategory.VARARGS) && allowSimplifiedVarargs)
@@ -397,7 +396,7 @@
**************************************************************************/
/** Return name of local class.
- * This is of the form <enclClass> $ n <classname>
+ * This is of the form {@code <enclClass> $ n <classname> }
* where
* enclClass is the flat name of the enclosing class,
* classname is the simple name of the local class
@@ -600,11 +599,10 @@
/** Check that a type is within some bounds.
*
- * Used in TypeApply to verify that, e.g., X in V<X> is a valid
+ * Used in TypeApply to verify that, e.g., X in {@code V<X>} is a valid
* type argument.
- * @param pos Position to be used for error reporting.
* @param a The type that should be bounded by bs.
- * @param bs The bound.
+ * @param bound The bound.
*/
private boolean checkExtends(Type a, Type bound) {
if (a.isUnbound()) {
@@ -1123,8 +1121,14 @@
mask = PRIVATE;
} else
mask = ConstructorFlags;
- } else if ((sym.owner.flags_field & INTERFACE) != 0)
- mask = implicit = InterfaceMethodFlags;
+ } else if ((sym.owner.flags_field & INTERFACE) != 0) {
+ if ((flags & DEFAULT) != 0) {
+ mask = InterfaceDefaultMethodMask;
+ implicit = PUBLIC;
+ } else {
+ mask = implicit = InterfaceMethodFlags;
+ }
+ }
else {
mask = MethodFlags;
}
@@ -1171,7 +1175,7 @@
default:
throw new AssertionError();
}
- long illegal = flags & StandardFlags & ~mask;
+ long illegal = flags & ExtendedStandardFlags & ~mask;
if (illegal != 0) {
if ((illegal & INTERFACE) != 0) {
log.error(pos, "intf.not.allowed.here");
@@ -1187,7 +1191,7 @@
// in the presence of inner classes. Should it be deleted here?
checkDisjoint(pos, flags,
ABSTRACT,
- PRIVATE | STATIC))
+ PRIVATE | STATIC | DEFAULT))
&&
checkDisjoint(pos, flags,
ABSTRACT | INTERFACE,
@@ -1211,7 +1215,7 @@
STRICTFP))) {
// skip
}
- return flags & (mask | ~StandardFlags) | implicit;
+ return flags & (mask | ~ExtendedStandardFlags) | implicit;
}
@@ -1262,8 +1266,10 @@
* their bounds. This must be done in a second phase after type attributon
* since a class might have a subclass as type parameter bound. E.g:
*
+ * <pre>{@code
* class B<A extends C> { ... }
* class C extends B<C> { ... }
+ * }</pre>
*
* and we can't make sure that the bound is already attributed because
* of possible cycles.
@@ -2574,7 +2580,7 @@
* 'pos'.
*
* @param s The (annotation)type declaration annotated with a @ContainedBy
- * @param containerAnno the @ContainedBy on 's'
+ * @param containedBy the @ContainedBy on 's'
* @param pos where to report errors
*/
public void validateContainedBy(TypeSymbol s, Attribute.Compound containedBy, DiagnosticPosition pos) {
@@ -3181,7 +3187,6 @@
* @param pos Position for error reporting.
* @param sym The symbol.
* @param s The scope
- * @param staticImport Whether or not this was a static import
*/
boolean checkUniqueStaticImport(DiagnosticPosition pos, Symbol sym, Scope s) {
return checkUniqueImport(pos, sym, s, true);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
index 7405ca1..2b6d0d7 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
@@ -46,7 +46,6 @@
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.tree.JCTree.Tag.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
/**
* This is an helper class that is used to perform deferred type-analysis.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
index 55e2e71..e616097 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -148,7 +148,7 @@
* exception to this [no pun intended] is that checked exceptions that
* are known to be caught or declared to be caught in the enclosing
* method are not recorded in the queue, but instead are recorded in a
- * global variable "Set<Type> thrown" that records the type of all
+ * global variable "{@code Set<Type> thrown}" that records the type of all
* exceptions that can be thrown.
*
* <p>Other minor issues the treatment of members of other classes
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
index 548bb9d..bfd3c4e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -41,7 +41,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import static com.sun.tools.javac.code.TypeTags.*;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
index 57604cb..120c429 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -671,7 +671,7 @@
};
/** Look up a synthetic name in a given scope.
- * @param scope The scope.
+ * @param s The scope.
* @param name The name.
*/
private Symbol lookupSynthetic(Name name, Scope s) {
@@ -747,7 +747,7 @@
* This numbering scheme is used by the backend to decide whether
* to issue an invokevirtual or invokespecial call.
*
- * @see Gen.visitSelect(Select tree)
+ * @see Gen#visitSelect(JCFieldAccess tree)
*/
private static final int
DEREFcode = 0,
@@ -1945,7 +1945,7 @@
* @param sig The signature of type T.
*/
private Name cacheName(String sig) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (sig.startsWith("[")) {
buf = buf.append("array");
while (sig.startsWith("[")) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index a57f3ba..85397fc 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -128,8 +128,7 @@
/** Import all classes of a class or package on demand.
* @param pos Position to be used for error reporting.
* @param tsym The class or package the members of which are imported.
- * @param toScope The (import) scope in which imported classes
- * are entered.
+ * @param env The env in which the imported classes will be entered.
*/
private void importAll(int pos,
final TypeSymbol tsym,
@@ -150,8 +149,7 @@
/** Import all static members of a class or package on demand.
* @param pos Position to be used for error reporting.
* @param tsym The class or package the members of which are imported.
- * @param toScope The (import) scope in which imported classes
- * are entered.
+ * @param env The env in which the imported classes will be entered.
*/
private void importStaticAll(int pos,
final TypeSymbol tsym,
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
index e3afbb7..36f3a25 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -27,8 +27,6 @@
import java.util.*;
-import javax.lang.model.element.ElementKind;
-
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.tree.*;
@@ -134,17 +132,21 @@
* Then, coerce to some given target type unless target type is null.
* This operation is used in situations like the following:
*
+ * <pre>{@code
* class Cell<A> { A value; }
* ...
* Cell<Integer> cell;
* Integer x = cell.value;
+ * }</pre>
*
* Since the erasure of Cell.value is Object, but the type
* of cell.value in the assignment is Integer, we need to
* adjust the original type of cell.value to Object, and insert
* a cast to Integer. That is, the last assignment becomes:
*
+ * <pre>{@code
* Integer x = (Integer)cell.value;
+ * }</pre>
*
* @param tree The expression tree whose type might need adjustment.
* @param erasedType The expression's type after erasure.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index 7877456..87bbfbc 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -805,8 +805,8 @@
}
/**
- * Enforces the specification of a "relative" URI as used in
- * {@linkplain #getFileForInput(Location,String,URI)
+ * Enforces the specification of a "relative" name as used in
+ * {@linkplain #getFileForInput(Location,String,String)
* getFileForInput}. This method must follow the rules defined in
* that method, do not make any changes without consulting the
* specification.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
index 1e29f91..6e0472c 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
@@ -53,13 +53,14 @@
import com.sun.tools.javac.util.Options;
import javax.tools.JavaFileManager;
+import javax.tools.StandardJavaFileManager;
import static javax.tools.StandardLocation.*;
import static com.sun.tools.javac.main.Option.*;
/** This class converts command line arguments, environment variables
* and system properties (in File.pathSeparator-separated String form)
* into a boot class path, user class path, and source path (in
- * Collection<String> form).
+ * {@code Collection<String>} form).
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -342,11 +343,11 @@
}
}
- /** @see JavaFileManager#handleOption. */
+ /** @see JavaFileManager#handleOption */
abstract boolean handleOption(Option option, String value);
- /** @see JavaFileManager#getLocation. */
+ /** @see StandardJavaFileManager#getLocation */
abstract Collection<File> getLocation();
- /** @see JavaFileManager#setLocation. */
+ /** @see StandardJavaFileManager#setLocation */
abstract void setLocation(Iterable<? extends File> files) throws IOException;
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
index 1ca860e..dbb9f68 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
@@ -38,7 +38,6 @@
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,7 +59,7 @@
* the command line.)
*
* Location where to look for/generate optimized zip index files can be
- * provided using "-XDcachezipindexdir=<directory>". If this flag is not
+ * provided using "{@code -XDcachezipindexdir=<directory>}". If this flag is not
* provided, the default location is the value of the "java.io.tmpdir" system
* property.
*
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
index 9a59e0d..9f99fb6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -446,7 +446,7 @@
* Normalizing class-members.
*************************************************************************/
- /** Distribute member initializer code into constructors and <clinit>
+ /** Distribute member initializer code into constructors and {@code <clinit>}
* method.
* @param defs The list of class member declarations.
* @param c The enclosing class.
@@ -689,7 +689,7 @@
* should be emitted, if so, put a new entry into CRTable
* and call method to generate bytecode.
* If not, just call method to generate bytecode.
- * @see #genStat(Tree, Env)
+ * @see #genStat(JCTree, Env)
*
* @param tree The tree to be visited.
* @param env The environment to use.
@@ -756,7 +756,7 @@
* should be emitted, if so, put a new entry into CRTable
* and call method to generate bytecode.
* If not, just call method to generate bytecode.
- * @see #genCond(Tree,boolean)
+ * @see #genCond(JCTree,boolean)
*
* @param tree The tree to be visited.
* @param crtFlags The CharacterRangeTable flags
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 65c16f0..150746a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -607,7 +607,7 @@
/** Parse contents of input stream.
* @param filename The name of the file from which input stream comes.
- * @param input The input stream to be parsed.
+ * @param content The characters to be parsed.
*/
protected JCCompilationUnit parse(JavaFileObject filename, CharSequence content) {
long msec = now();
@@ -755,8 +755,6 @@
/** Complete compiling a source file that has been accessed
* by the class file reader.
* @param c The class the source file of which needs to be compiled.
- * @param filename The name of the source file.
- * @param f An input stream that reads the source file.
*/
public void complete(ClassSymbol c) throws CompletionFailure {
// System.err.println("completing " + c);//DEBUG
diff --git a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
index 92e1c17..dd86ec2 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
@@ -25,9 +25,8 @@
package com.sun.tools.javac.model;
-import com.sun.tools.javac.util.*;
-import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.lang.annotation.*;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
@@ -35,12 +34,14 @@
import java.util.Map;
import sun.reflect.annotation.*;
-import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.MirroredTypeException;
import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.ArrayType;
+import com.sun.tools.javac.util.*;
/**
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
index 4aff561..762b8ed 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,13 +27,14 @@
import java.io.IOException;
import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
import java.nio.file.Path;
import javax.tools.FileObject;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
/**
- * File manager based on {@linkplain File java.nio.file.Path}.
+ * File manager based on {@link java.nio.file.Path}.
*
* Eventually, this should be moved to javax.tools.
* Also, JavaCompiler might reasonably provide a method getPathFileManager,
diff --git a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
index a46e639..357fc77 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -39,7 +39,6 @@
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.NestingKind;
import javax.tools.JavaFileObject;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 7b6ca57..f6ddfcb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -108,8 +108,7 @@
* {@code input[input.length -1]} is a white space character.
*
* @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param buf the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
index aac80c5..616f023 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -116,6 +116,8 @@
fac.options.isSet("allowLambda"); //pre-lambda guard
this.allowMethodReferences = source.allowMethodReferences() &&
fac.options.isSet("allowMethodReferences"); //pre-lambda guard
+ this.allowDefaultMethods = source.allowDefaultMethods() &&
+ fac.options.isSet("allowDefaultMethods"); //pre-lambda guard
this.keepDocComments = keepDocComments;
docComments = newDocCommentTable(keepDocComments);
this.keepLineMap = keepLineMap;
@@ -185,6 +187,10 @@
*/
boolean allowMethodReferences;
+ /** Switch: should we allow default methods in interfaces?
+ */
+ boolean allowDefaultMethods;
+
/** Switch: should we keep docComments?
*/
boolean keepDocComments;
@@ -806,7 +812,7 @@
t = odStack[0];
if (t.hasTag(JCTree.Tag.PLUS)) {
- StringBuffer buf = foldStrings(t);
+ StringBuilder buf = foldStrings(t);
if (buf != null) {
t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString()));
}
@@ -833,7 +839,7 @@
/** If tree is a concatenation of string literals, replace it
* by a single literal representing the concatenated string.
*/
- protected StringBuffer foldStrings(JCTree tree) {
+ protected StringBuilder foldStrings(JCTree tree) {
if (!allowStringFolding)
return null;
List<String> buf = List.nil();
@@ -841,8 +847,8 @@
if (tree.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) tree;
if (lit.typetag == TypeTags.CLASS) {
- StringBuffer sbuf =
- new StringBuffer((String)lit.value);
+ StringBuilder sbuf =
+ new StringBuilder((String)lit.value);
while (buf.nonEmpty()) {
sbuf.append(buf.head);
buf = buf.tail;
@@ -2311,6 +2317,7 @@
case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break;
case STRICTFP : flag = Flags.STRICTFP; break;
case MONKEYS_AT : flag = Flags.ANNOTATION; break;
+ case DEFAULT : checkDefaultMethods(); flag = Flags.DEFAULT; break;
case ERROR : flag = 0; nextToken(); break;
default: break loop;
}
@@ -3361,6 +3368,12 @@
allowMethodReferences = true;
}
}
+ void checkDefaultMethods() {
+ if (!allowDefaultMethods) {
+ log.error(token.pos, "default.methods.not.supported.in.source", source.name);
+ allowDefaultMethods = true;
+ }
+ }
/*
* a functional source tree and end position mappings
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
index 93b2e8a..20c49e6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -66,8 +66,7 @@
* {@code input[input.length -1]} is a white space character.
*
* @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param buf the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected Scanner(ScannerFactory fac, CharBuffer buf) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
index 07b8c5c..84e6792 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
@@ -77,9 +77,8 @@
* that {@code inputLength < input.length} or
* {@code input[input.length -1]} is a white space character.
*
- * @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param sf the factory which created this Scanner
+ * @param buffer the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected UnicodeReader(ScannerFactory sf, CharBuffer buffer) {
@@ -255,16 +254,16 @@
/**
* Returns a copy of a character array subset of the input buffer.
- * The returned array begins at the <code>beginIndex</code> and
- * extends to the character at index <code>endIndex - 1</code>.
- * Thus the length of the substring is <code>endIndex-beginIndex</code>.
+ * The returned array begins at the {@code beginIndex} and
+ * extends to the character at index {@code endIndex - 1}.
+ * Thus the length of the substring is {@code endIndex-beginIndex}.
* This behavior is like
- * <code>String.substring(beginIndex, endIndex)</code>.
+ * {@code String.substring(beginIndex, endIndex)}.
* Unicode escape sequences are not translated.
*
* @param beginIndex the beginning index, inclusive.
* @param endIndex the ending index, exclusive.
- * @throws IndexOutOfBounds if either offset is outside of the
+ * @throws ArrayIndexOutOfBoundsException if either offset is outside of the
* array bounds
*/
public char[] getRawCharacters(int beginIndex, int endIndex) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
index 18779a2..157f7eb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -105,7 +105,7 @@
* Only type elements <i>included</i> in this round of annotation
* processing, or declarations of members, parameters, or type
* parameters declared within those, are returned. Included type
- * elements are {@linkplain #getSpecifiedTypeElements specified
+ * elements are {@linkplain #getRootElements specified
* types} and any types nested within them.
*
* @param a annotation type being requested
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java b/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
index e3cd7ad..ea6d9a0 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -72,7 +72,7 @@
* The service class for which providers are being sought;
* used to construct error detail strings
*
- * @param url
+ * @param u
* The URL naming the configuration file to be parsed
*
* @return true if the name of a service is found
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 5140de2..f349504 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2174,6 +2174,11 @@
method references are not supported in -source {0}\n\
(use -source 8 or higher to enable method references)
+# 0: string
+compiler.err.default.methods.not.supported.in.source=\
+ default methods are not supported in -source {0}\n\
+ (use -source 8 or higher to enable default methods)
+
########################################
# Diagnostics for verbose resolution
# used by Resolve (debug only)
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
index 3494f3b..d8008d7 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -464,32 +464,29 @@
}
/**
- * Everything in one source file is kept in a TopLevel structure.
- * @param pid The tree representing the package clause.
- * @param sourcefile The source file name.
- * @param defs All definitions in this file (ClassDef, Import, and Skip)
- * @param packge The package it belongs to.
- * @param namedImportScope A scope for all named imports.
- * @param starImportScope A scope for all import-on-demands.
- * @param lineMap Line starting positions, defined only
- * if option -g is set.
- * @param docComments A hashtable that stores all documentation comments
- * indexed by the tree nodes they refer to.
- * defined only if option -s is set.
- * @param endPositions An object encapsulating ending positions of source
- * ranges indexed by the tree nodes they belong to.
- * Defined only if option -Xjcov is set.
+ * Everything in one source file is kept in a {@linkplain JCCompilationUnit} structure.
*/
public static class JCCompilationUnit extends JCTree implements CompilationUnitTree {
public List<JCAnnotation> packageAnnotations;
+ /** The tree representing the package clause. */
public JCExpression pid;
+ /** All definitions in this file (ClassDef, Import, and Skip) */
public List<JCTree> defs;
+ /* The source file name. */
public JavaFileObject sourcefile;
+ /** The package to which this compilation unit belongs. */
public PackageSymbol packge;
+ /** A scope for all named imports. */
public ImportScope namedImportScope;
+ /** A scope for all import-on-demands. */
public StarImportScope starImportScope;
+ /** Line starting positions, defined only if option -g is set. */
public Position.LineMap lineMap = null;
+ /** A table that stores all documentation comments indexed by the tree
+ * nodes they refer to. defined only if option -s is set. */
public DocCommentTable docComments = null;
+ /* An object encapsulating ending positions of source ranges indexed by
+ * the tree nodes they belong to. Defined only if option -Xjcov is set. */
public EndPosTable endPositions = null;
protected JCCompilationUnit(List<JCAnnotation> packageAnnotations,
JCExpression pid,
@@ -550,10 +547,10 @@
/**
* An import clause.
- * @param qualid The imported class(es).
*/
public static class JCImport extends JCTree implements ImportTree {
public boolean staticImport;
+ /** The imported class(es). */
public JCTree qualid;
protected JCImport(JCTree qualid, boolean importStatic) {
this.qualid = qualid;
@@ -605,21 +602,21 @@
/**
* A class definition.
- * @param modifiers the modifiers
- * @param name the name of the class
- * @param typarams formal class parameters
- * @param extending the classes this class extends
- * @param implementing the interfaces implemented by this class
- * @param defs all variables and methods defined in this class
- * @param sym the symbol
*/
public static class JCClassDecl extends JCStatement implements ClassTree {
+ /** the modifiers */
public JCModifiers mods;
+ /** the name of the class */
public Name name;
+ /** formal class parameters */
public List<JCTypeParameter> typarams;
+ /** the classes this class extends */
public JCExpression extending;
+ /** the interfaces implemented by this class */
public List<JCExpression> implementing;
+ /** all variables and methods defined in this class */
public List<JCTree> defs;
+ /** the symbol */
public ClassSymbol sym;
protected JCClassDecl(JCModifiers mods,
Name name,
@@ -676,24 +673,25 @@
/**
* A method definition.
- * @param modifiers method modifiers
- * @param name method name
- * @param restype type of method return value
- * @param typarams type parameters
- * @param params value parameters
- * @param thrown exceptions thrown by this method
- * @param stats statements in the method
- * @param sym method symbol
*/
public static class JCMethodDecl extends JCTree implements MethodTree {
+ /** method modifiers */
public JCModifiers mods;
+ /** method name */
public Name name;
+ /** type of method return value */
public JCExpression restype;
+ /** type parameters */
public List<JCTypeParameter> typarams;
+ /** value parameters */
public List<JCVariableDecl> params;
+ /** exceptions thrown by this method */
public List<JCExpression> thrown;
+ /** statements in the method */
public JCBlock body;
- public JCExpression defaultValue; // for annotation types
+ /** default value, for annotation types */
+ public JCExpression defaultValue;
+ /** method symbol */
public MethodSymbol sym;
protected JCMethodDecl(JCModifiers mods,
Name name,
@@ -748,17 +746,17 @@
/**
* A variable definition.
- * @param modifiers variable modifiers
- * @param name variable name
- * @param vartype type of the variable
- * @param init variables initial value
- * @param sym symbol
*/
public static class JCVariableDecl extends JCStatement implements VariableTree {
+ /** variable modifiers */
public JCModifiers mods;
+ /** variable name */
public Name name;
+ /** type of the variable */
public JCExpression vartype;
+ /** variable's initial value */
public JCExpression init;
+ /** symbol */
public VarSymbol sym;
protected JCVariableDecl(JCModifiers mods,
Name name,
@@ -815,11 +813,11 @@
/**
* A statement block.
- * @param stats statements
- * @param flags flags
*/
public static class JCBlock extends JCStatement implements BlockTree {
+ /** flags */
public long flags;
+ /** statements */
public List<JCStatement> stats;
/** Position of closing brace, optional. */
public int endpos = Position.NOPOS;
@@ -1206,9 +1204,9 @@
/**
* an expression statement
- * @param expr expression structure
*/
public static class JCExpressionStatement extends JCStatement implements ExpressionStatementTree {
+ /** expression structure */
public JCExpression expr;
protected JCExpressionStatement(JCExpression expr)
{
@@ -1776,13 +1774,13 @@
/**
* Selects through packages and classes
- * @param selected selected Tree hierarchie
- * @param selector name of field to select thru
- * @param sym symbol of the selected class
*/
public static class JCFieldAccess extends JCExpression implements MemberSelectTree {
+ /** selected Tree hierarchy */
public JCExpression selected;
+ /** name of field to select thru */
public Name name;
+ /** symbol of the selected class */
public Symbol sym;
protected JCFieldAccess(JCExpression selected, Name name, Symbol sym) {
this.selected = selected;
@@ -1885,11 +1883,11 @@
/**
* An identifier
- * @param idname the name
- * @param sym the symbol
*/
public static class JCIdent extends JCExpression implements IdentifierTree {
+ /** the name */
public Name name;
+ /** the symbol */
public Symbol sym;
protected JCIdent(Name name, Symbol sym) {
this.name = name;
@@ -1912,10 +1910,10 @@
/**
* A constant value given literally.
- * @param value value representation
*/
public static class JCLiteral extends JCExpression implements LiteralTree {
public int typetag;
+ /** value representation */
public Object value;
protected JCLiteral(int typetag, Object value) {
this.typetag = typetag;
@@ -1978,10 +1976,10 @@
/**
* Identifies a basic type.
- * @param tag the basic type id
* @see TypeTags
*/
public static class JCPrimitiveTypeTree extends JCExpression implements PrimitiveTypeTree {
+ /** the basic type id */
public int typetag;
protected JCPrimitiveTypeTree(int typetag) {
this.typetag = typetag;
@@ -2105,11 +2103,11 @@
/**
* A formal class parameter.
- * @param name name
- * @param bounds bounds
*/
public static class JCTypeParameter extends JCTree implements TypeParameterTree {
+ /** name */
public Name name;
+ /** bounds */
public List<JCExpression> bounds;
protected JCTypeParameter(Name name, List<JCExpression> bounds) {
this.name = name;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
index 04f4d47..c501f7a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -26,12 +26,10 @@
package com.sun.tools.javac.tree;
import java.io.*;
-import java.util.*;
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.parser.Tokens.Comment;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List;
@@ -250,7 +248,7 @@
public void printFlags(long flags) throws IOException {
if ((flags & SYNTHETIC) != 0) print("/*synthetic*/ ");
print(TreeInfo.flagNames(flags));
- if ((flags & StandardFlags) != 0) print(" ");
+ if ((flags & ExtendedStandardFlags) != 0) print(" ");
if ((flags & ANNOTATION) != 0) print("@");
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 120bf2a..3111b6a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -790,8 +790,8 @@
* pre: flags != 0
*/
public static long firstFlag(long flags) {
- int flag = 1;
- while ((flag & StandardFlags) != 0 && (flag & flags) == 0)
+ long flag = 1;
+ while ((flag & flags & ExtendedStandardFlags) == 0)
flag = flag << 1;
return flag;
}
@@ -799,7 +799,7 @@
/** Return flags as a string, separated by " ".
*/
public static String flagNames(long flags) {
- return Flags.toString(flags & StandardFlags).trim();
+ return Flags.toString(flags & ExtendedStandardFlags).trim();
}
/** Operator precedences values.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
index cec43bd..06e6e46 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -484,7 +484,7 @@
/**
* Tells whether the caret display is active or not.
*
- * @param caretEnabled if true the caret is enabled
+ * @return true if the caret is enabled
*/
public boolean isCaretEnabled() {
return caretEnabled;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
index ca25a5b..07f244a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -132,7 +132,6 @@
/** Report a warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
- * @param pos The source position at which to report the warning.
* @param key The key for the localized warning message.
* @param args Fields of the warning message.
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
index cec4b95..7b12009 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -69,7 +69,7 @@
/**
* Create a basic formatter based on the supplied options.
*
- * @param opts list of command-line options
+ * @param options list of command-line options
* @param msgs JavacMessages object used for i18n
*/
public BasicDiagnosticFormatter(Options options, JavacMessages msgs) {
@@ -329,7 +329,7 @@
* Set the indentation level for various element of a given diagnostic -
* this might lead to more readable diagnostics
*
- * @param indentationKind kind of indentation to be set
+ * @param diagPart
* @param nSpaces amount of spaces for the specified diagnostic part
*/
public void setIndentation(DiagnosticPart diagPart, int nSpaces) {
@@ -384,7 +384,7 @@
/**
* Get a metachar string for a specific format
*
- * @param sourcePos a positioning value for source line
+ * @param kind the format kind for which to get the metachar string
*/
public String getFormat(BasicFormatKind kind) {
return availableFormats.get(kind);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java b/langtools/src/share/classes/com/sun/tools/javac/util/Context.java
index 91a4e63..9302663 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Context.java
@@ -44,7 +44,7 @@
* instance method that is overridden in extended components. A base
* phase supporting extension would look something like this:
*
- * <p><pre>
+ * <p><pre>{@code
* public class Phase {
* protected static final Context.Key<Phase> phaseKey =
* new Context.Key<Phase>();
@@ -62,7 +62,7 @@
* // other intitialization follows...
* }
* }
- * </pre>
+ * }</pre>
*
* <p>In the compiler, we simply use Phase.instance(context) to get
* the reference to the phase. But in extensions of the compiler, we
@@ -70,7 +70,7 @@
* and this must be done before any reference to the phase is accessed
* using Phase.instance(). An extended phase might be declared thus:
*
- * <p><pre>
+ * <p><pre>{@code
* public class NewPhase extends Phase {
* protected NewPhase(Context context) {
* super(context);
@@ -83,7 +83,7 @@
* });
* }
* }
- * </pre>
+ * }</pre>
*
* <p>And is registered early in the extended compiler like this
*
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java b/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
index 0c9f254..b2253aa 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -260,7 +260,7 @@
while (i < len) {
char ch = s.charAt(i);
if (ch > 255) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(s.substring(0, i));
while (i < len) {
ch = s.charAt(i);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
index d8c94de..7f1bad3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
@@ -28,12 +28,10 @@
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.nio.CharBuffer;
-import java.util.Map;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.tree.EndPosTable;
-import com.sun.tools.javac.tree.JCTree;
import static com.sun.tools.javac.util.LayoutCharacters.*;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
index 770ee0b..17ce231 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
@@ -27,7 +27,6 @@
import java.util.EnumSet;
import java.util.Locale;
-import java.util.Map;
import java.util.Set;
import javax.tools.Diagnostic;
@@ -214,7 +213,6 @@
* Create a new diagnostic of the given kind, which is not mandatory and which has
* no lint category.
* @param kind The diagnostic kind
- * @param ls The lint category, if applicable, or null
* @param source The source of the compilation unit, if any, in which to report the message.
* @param pos The source position at which to report the message.
* @param key The key for the localized message.
@@ -229,7 +227,7 @@
* Create a new diagnostic of the given kind.
* @param kind The diagnostic kind
* @param lc The lint category, if applicable, or null
- * @param isMandatory is diagnostic mandatory?
+ * @param flags The set of flags for the diagnostic
* @param source The source of the compilation unit, if any, in which to report the message.
* @param pos The source position at which to report the message.
* @param key The key for the localized message.
@@ -364,7 +362,7 @@
/**
* Create a diagnostic object.
- * @param fomatter the formatter to use for the diagnostic
+ * @param formatter the formatter to use for the diagnostic
* @param dt the type of diagnostic
* @param lc the lint category for the diagnostic
* @param source the name of the source file, or null if none.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/List.java b/langtools/src/share/classes/com/sun/tools/javac/util/List.java
index e256c37..72e36c8 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/List.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/List.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -287,7 +287,7 @@
if (isEmpty()) {
return "";
} else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(head);
for (List<A> l = tail; l.nonEmpty(); l = l.tail) {
buf.append(sep);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Position.java b/langtools/src/share/classes/com/sun/tools/javac/util/Position.java
index 2714671..f5fc39f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Position.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Position.java
@@ -80,11 +80,11 @@
/** Encode line and column numbers in an integer as:
* {@code line-number << LINESHIFT + column-number }.
- * {@link Position.NOPOS} represents an undefined position.
+ * {@link Position#NOPOS} represents an undefined position.
*
* @param line number of line (first is 1)
* @param col number of character on line (first is 1)
- * @return an encoded position or {@link Position.NOPOS}
+ * @return an encoded position or {@link Position#NOPOS}
* if the line or column number is too big to
* represent in the encoded format
* @throws IllegalArgumentException if line or col is less than 1
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
index b4f373d..00e0b1f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -52,7 +52,7 @@
/**
* Create a formatter based on the supplied options.
- * @param msgs
+ * @param options
*/
public RawDiagnosticFormatter(Options options) {
super(null, new SimpleConfiguration(options,
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
index deaf6a1..e589bfa 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Type;
@@ -36,6 +35,11 @@
* defaults for the methods in <code>Type</code> (and a couple from
* <code>ProgramElementDoc</code>).
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
index 8e8f70c..7cfbf52 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Attribute;
@@ -40,6 +39,11 @@
* Sure it ought to be called "Annotation", but that clashes with
* java.lang.annotation.Annotation.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
index 3c2efa3..35ce0db 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,7 +27,6 @@
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.*;
@@ -39,6 +38,11 @@
/**
* Represents an annotation type.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
index e5632dc..4c3fad6 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,17 +27,18 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Position;
/**
* Represents an element of an annotation type.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
index 82014ca..6a8818c 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Attribute;
@@ -36,6 +35,11 @@
/**
* Represents a value of an annotation type element.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
index a5fed4b..efaf4a4 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -38,8 +38,6 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
@@ -76,6 +74,11 @@
* referred to using Type (which can be converted to ClassDocImpl,
* if possible).
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see Type
*
* @since 1.2
@@ -846,7 +849,7 @@
* Note that this is not necessarily what the compiler would do!
*
* @param methodName the unqualified name to search for.
- * @param paramTypeArray the array of Strings for method parameter types.
+ * @param paramTypes the array of Strings for method parameter types.
* @return the first MethodDocImpl which matches, null if not found.
*/
public MethodDocImpl findMethod(String methodName, String[] paramTypes) {
@@ -973,7 +976,7 @@
* Find constructor in this class.
*
* @param constrName the unqualified name to search for.
- * @param paramTypeArray the array of Strings for constructor parameters.
+ * @param paramTypes the array of Strings for constructor parameters.
* @return the first ConstructorDocImpl which matches, null if not found.
*/
public ConstructorDoc findConstructor(String constrName,
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java b/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
index 2c27e8b4..59236f3 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
@@ -33,6 +33,11 @@
* It allows users to get first sentence of this comment, get
* comment for different tags...
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Atul M Dambalkar
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
index 980bd8b..e1f4678 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,6 +35,11 @@
/**
* Represents a constructor of a java class.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
index 5887c50..5cd4306 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -46,6 +46,11 @@
* run and not the compiler info that could be GC'ed
* or ported.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.4
* @author Robert Field
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
index 0936194..f263123 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
@@ -26,16 +26,16 @@
package com.sun.tools.javadoc;
import java.io.DataInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.text.CollationKey;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import javax.tools.FileObject;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.util.Position;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* abstract base class of all Doc classes. Doc item's are representations
@@ -43,6 +43,11 @@
* comments and have been processed by this run of javadoc. All Doc items
* are unique, that is, they are == comparable.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Robert Field
* @author Atul M Dambalkar
@@ -262,7 +267,7 @@
* <p>
* Included so that Doc item are java.lang.Comparable.
*
- * @param o the <code>Object</code> to be compared.
+ * @param obj the {@code Object} to be compared.
* @return a negative integer, zero, or a positive integer as this Object
* is less than, equal to, or greater than the given Object.
* @exception ClassCastException the specified Object's type prevents it
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
index 6ac6a1e..0f8ba32 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,14 +25,18 @@
package com.sun.tools.javadoc;
-import java.util.Locale;
-import java.util.HashSet;
-import java.text.Collator;
import java.text.BreakIterator;
+import java.text.Collator;
+import java.util.Locale;
/**
* This class holds the information about locales.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.4
* @author Robert Field
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
index d9b2e69..308b903 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,22 +25,26 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
-
-import static com.sun.javadoc.LanguageVersion.*;
-
-import com.sun.tools.javac.util.List;
-
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
+import com.sun.javadoc.*;
+import com.sun.tools.javac.util.List;
+import static com.sun.javadoc.LanguageVersion.*;
+
/**
* Class creates, controls and invokes doclets.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter (rewrite)
*/
public class DocletInvoker {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
index e024cc0..600eeb2 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -41,6 +41,11 @@
/**
* Represents a method or constructor of a java class.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
index c11c84b..c76dd7a 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
@@ -29,8 +29,6 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.VarSymbol;
@@ -43,6 +41,11 @@
/**
* Represents a field in a java class.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see MemberDocImpl
*
* @since 1.2
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
index 67fa61d..df52725 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -33,6 +33,12 @@
import com.sun.tools.javac.util.Context;
/** Javadoc uses an extended class reader that records package.html entries
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter
*/
public class JavadocClassReader extends ClassReader {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
index f2c2884..d914eef 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import javax.tools.JavaFileObject;
import com.sun.tools.javac.code.Kinds;
@@ -40,6 +39,12 @@
/**
* Javadoc's own enter phase does a few things above and beyond that
* done by javac.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter
*/
public class JavadocEnter extends Enter {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
index 4e1d31f..e29ae00 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
@@ -37,6 +37,12 @@
/**
* Javadoc's own memberEnter phase does a few things above and beyond that
* done by javac.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter
*/
public class JavadocMemberEnter extends MemberEnter {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
index 6d69172..cbeaf69 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -31,6 +31,12 @@
/**
* Javadoc's own todo queue doesn't queue its inputs, as javadoc
* doesn't perform attribution of method bodies or semantic checking.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter
*/
public class JavadocTodo extends Todo {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
index 81bcdbd..4bc1493 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -54,6 +54,12 @@
* component in a larger software system. It provides operations to
* construct a new javadoc processor, and to run it on a set of source
* files.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Neal Gafter
*/
public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
@@ -386,7 +392,7 @@
/**
* Return true if given file name is a valid class name
* (including "package-info").
- * @param clazzname the name of the class to check.
+ * @param s the name of the class to check.
* @return true if given class name is a valid class name
* and false otherwise.
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Main.java b/langtools/src/share/classes/com/sun/tools/javadoc/Main.java
index 086e13d..dfc21b2 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Main.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Main.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -31,6 +31,11 @@
* Provides external entry points (tool and programmatic)
* for the javadoc program.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.4
*/
public class Main {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
index 8dcd375..88da9c0 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -37,6 +37,11 @@
* method, constructor and field members. Class members of a class
* (nested classes) are represented instead by ClassDocImpl.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see MethodDocImpl
* @see FieldDocImpl
* @see ClassDocImpl
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java b/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
index 5994e76..64fa6db 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,16 +25,14 @@
package com.sun.tools.javadoc;
-import java.io.PrintWriter;
+import java.io.PrintWriter; // Access to 'javac' output streams
import java.text.MessageFormat;
-import java.util.ResourceBundle;
import java.util.MissingResourceException;
+import java.util.ResourceBundle;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.util.Context;
-
-import com.sun.tools.javac.util.Log; // Access to 'javac' output streams
+import com.sun.tools.javac.util.Log;
/**
* Utility for integrating with javadoc tools and for localization.
@@ -43,6 +41,11 @@
* <br>
* Also provides implementation for DocErrorReporter.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see java.util.ResourceBundle
* @see java.text.MessageFormat
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
index 72ed86d..f90b164 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,8 +25,9 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
+import java.lang.reflect.Modifier;
+import com.sun.javadoc.*;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type;
@@ -34,11 +35,14 @@
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.util.Position;
-import java.lang.reflect.Modifier;
-
/**
* Represents a method of a java class.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java b/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
index 5e96372..40a9040 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -32,7 +32,13 @@
* Filtering is done by returning boolean values.
* Classes, methods and fields can be filtered, or filtering
* can be done directly on modifier bits.
- * @see com.sun.tools.javac.code.Flags;
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
+ * @see com.sun.tools.javac.code.Flags
* @author Robert Field
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
index 4c7e472..9a07225 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,12 +25,12 @@
package com.sun.tools.javadoc;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
import javax.tools.FileObject;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -47,6 +47,11 @@
* about the package, the package's comment and tags, and the
* classes in the package.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
index 60809bb..8033405 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -33,6 +33,11 @@
* Represents an @param documentation tag.
* Parses and stores the name and comment parts of the parameter tag.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
*
*/
@@ -101,8 +106,8 @@
* TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
*
* @return TagImpl[] Array of tags with inline SeeTagImpls.
- * @see TagImpl#inlineTagImpls()
- * @see ThrowsTagImpl#inlineTagImpls()
+ * @see TagImpl#inlineTags()
+ * @see ThrowsTagImpl#inlineTags()
*/
@Override
public Tag[] inlineTags() {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
index 9ac19a1..524a5ea 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,12 +29,16 @@
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.code.Type;
/**
* ParameterImpl information.
* This includes a parameter type and parameter name.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Scott Seligman (generics, annotations)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
index 838994f..1974ec1 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -38,6 +38,11 @@
* Implementation of <code>ParameterizedType</code>, which
* represents an invocation of a generic class or interface.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java b/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
index be61228..15679a7 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -27,13 +27,12 @@
import com.sun.javadoc.*;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.code.Type.ClassType;
-
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
class PrimitiveType implements com.sun.javadoc.Type {
private final String name;
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
index e6cd0e8..cdd4a44 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,26 +25,27 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
-
-import com.sun.tools.javac.code.Attribute;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-
-import com.sun.tools.javac.tree.JCTree;
-
-import com.sun.tools.javac.util.Position;
-
import java.lang.reflect.Modifier;
import java.text.CollationKey;
+import com.sun.javadoc.*;
+import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.util.Position;
+
/**
* Represents a java program element: class, interface, field,
* constructor, or method.
* This is an abstract class dealing with information common to
* these elements.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @see MemberDocImpl
* @see ClassDocImpl
*
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
index 5f107fa..d6eba2e 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -40,7 +40,12 @@
/**
* This class holds the information from one run of javadoc.
* Particularly the packages, classes and options specified
- * by the user..
+ * by the user.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*
* @since 1.2
* @author Robert Field
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
index f758b16..4994fe6 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,14 +25,18 @@
package com.sun.tools.javadoc;
-import com.sun.tools.javac.util.*;
-
import com.sun.javadoc.*;
+import com.sun.tools.javac.util.*;
/**
* Represents a see also documentation tag.
* The @see tag can be plain text, or reference a class or member.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Atul M Dambalkar
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
index c429ba7..e89866d 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -41,6 +41,11 @@
* This tag is only allowed in the javadoc for the special member
* serialPersistentFields.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Joe Fialli
* @author Neal Gafter
*
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java b/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
index e8b147f..559be36 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -26,15 +26,14 @@
package com.sun.tools.javadoc;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.code.Symbol.VarSymbol;
import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Names;
/**
@@ -59,6 +58,11 @@
* b. For Externalizable, data layout is described by 2(b).
* </pre>
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Joe Fialli
* @author Neal Gafter (rewrite but not too proud)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
index d20b579..89106de 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -34,6 +34,11 @@
/**
* A source position: filename, line number, and column number.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since J2SE1.4
* @author Neal M Gafter
* @author Michael Van De Vanter (position representation changed to char offsets)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
index 66514f4..67f5e4c 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,28 +25,30 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.StringTokenizer;
+import com.sun.javadoc.*;
import com.sun.tools.javac.main.CommandLine;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-
-import java.util.StringTokenizer;
-
import static com.sun.tools.javac.code.Flags.*;
/**
* Main program of Javadoc.
* Previously named "Main".
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
index 10a2764..a106bb6 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -34,6 +34,11 @@
* special processing are handled by subclasses (ParamTagImpl, SeeTagImpl,
* and ThrowsTagImpl
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Neal M Gafter
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
index f63ffec..6da454f 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -33,6 +33,11 @@
* The exception name my be the name of a type variable.
* Note: @exception is a backwards compatible synonymy for @throws.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @see ExecutableMemberDocImpl#throwsTags()
@@ -108,8 +113,8 @@
* TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
*
* @return TagImpl[] Array of tags with inline SeeTagImpls.
- * @see TagImpl#inlineTagImpls()
- * @see ParamTagImpl#inlineTagImpls()
+ * @see TagImpl#inlineTags()
+ * @see ParamTagImpl#inlineTags()
*/
@Override
public Tag[] inlineTags() {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
index 8f7f77c..63ada2b 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -26,18 +26,21 @@
package com.sun.tools.javadoc;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.ArrayType;
import com.sun.tools.javac.code.Type.ClassType;
import com.sun.tools.javac.code.Type.TypeVar;
-import com.sun.tools.javac.code.Type.ArrayType;
import com.sun.tools.javac.util.List;
-
import static com.sun.tools.javac.code.TypeTags.*;
-
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
public class TypeMaker {
public static com.sun.javadoc.Type getType(DocEnv env, Type t) {
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
index 55660ac..85f946c 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Kinds;
@@ -42,6 +41,11 @@
* Implementation of <code>TypeVariable</code>, which
* represents a type variable.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
index dace0e8..cf458d2 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -37,6 +36,11 @@
* Implementation of <code>WildcardType</code>, which
* represents a wildcard type.
*
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
* @author Scott Seligman
* @since 1.5
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Gen.java b/langtools/src/share/classes/com/sun/tools/javah/Gen.java
index 5682986..dc50bae 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/Gen.java
+++ b/langtools/src/share/classes/com/sun/tools/javah/Gen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -287,7 +287,7 @@
constString = value.toString();
}
if (constString != null) {
- StringBuffer s = new StringBuffer("#undef ");
+ StringBuilder s = new StringBuilder("#undef ");
s.append(cname); s.append("_"); s.append(fname); s.append(lineSep);
s.append("#define "); s.append(cname); s.append("_");
s.append(fname); s.append(" "); s.append(constString);
@@ -370,7 +370,7 @@
// c.f. MethodDoc.signature
String signature(ExecutableElement e) {
- StringBuffer sb = new StringBuffer("(");
+ StringBuilder sb = new StringBuilder("(");
String sep = "";
for (VariableElement p: e.getParameters()) {
sb.append(sep);
diff --git a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java
index ab67f8c..783648a 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java
+++ b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -647,7 +647,7 @@
%%% This may not be right, but should be called more often. */
protected final String nameToIdentifier(String name) {
int len = name.length();
- StringBuffer buf = new StringBuffer(len);
+ StringBuilder buf = new StringBuilder(len);
for (int i = 0; i < len; i++) {
char c = name.charAt(i);
if (isASCIILetterOrDigit(c))
diff --git a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java b/langtools/src/share/classes/com/sun/tools/javah/Mangle.java
index 616bb74..2cc74f5 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java
+++ b/langtools/src/share/classes/com/sun/tools/javah/Mangle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -66,7 +66,7 @@
}
public final String mangle(CharSequence name, int mtype) {
- StringBuffer result = new StringBuffer(100);
+ StringBuilder result = new StringBuilder(100);
int length = name.length();
for (int i = 0; i < length; i++) {
@@ -115,7 +115,7 @@
public String mangleMethod(ExecutableElement method, TypeElement clazz,
int mtype) throws TypeSignature.SignatureException {
- StringBuffer result = new StringBuffer(100);
+ StringBuilder result = new StringBuilder(100);
result.append("Java_");
if (mtype == Mangle.Type.METHOD_JDK_1) {
@@ -164,7 +164,7 @@
// Warning: duplicated in Gen
private String signature(ExecutableElement e) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
String sep = "(";
for (VariableElement p: e.getParameters()) {
sb.append(sep);
diff --git a/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java b/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
index 5107dd1..1f4adc0 100644
--- a/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -29,11 +29,13 @@
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.concurrent.Callable;
+import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.OptionChecker;
import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
import javax.tools.Tool;
/**
diff --git a/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java b/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
index 356fc9a..8f7a588 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -29,11 +29,13 @@
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.concurrent.Callable;
+import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.OptionChecker;
import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
import javax.tools.Tool;
/**
@@ -69,9 +71,7 @@
* @param options compiler options, {@code null} means no options
* @param classes class names (for annotation processing), {@code
* null} means no class names
- * @param compilationUnits the compilation units to compile, {@code
- * null} means no compilation units
- * @return an object representing the compilation
+ * @return a task to perform the disassembly
* @throws RuntimeException if an unrecoverable error
* occurred in a user supplied component. The
* {@linkplain Throwable#getCause() cause} will be the error in
diff --git a/langtools/src/share/classes/javax/annotation/processing/Completions.java b/langtools/src/share/classes/javax/annotation/processing/Completions.java
index 3d96204..044ae20 100644
--- a/langtools/src/share/classes/javax/annotation/processing/Completions.java
+++ b/langtools/src/share/classes/javax/annotation/processing/Completions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -25,8 +25,6 @@
package javax.annotation.processing;
-import java.util.Arrays;
-
/**
* Utility class for assembling {@link Completion} objects.
*
diff --git a/langtools/src/share/classes/javax/annotation/processing/FilerException.java b/langtools/src/share/classes/javax/annotation/processing/FilerException.java
index d33b631..30a1388 100644
--- a/langtools/src/share/classes/javax/annotation/processing/FilerException.java
+++ b/langtools/src/share/classes/javax/annotation/processing/FilerException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -26,7 +26,6 @@
package javax.annotation.processing;
import java.io.IOException;
-import javax.annotation.processing.Filer;
/**
* Indicates a {@link Filer} detected an attempt to open a file that
diff --git a/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java b/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
index 6924564..5ade776 100644
--- a/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
+++ b/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -26,12 +26,10 @@
package javax.annotation.processing;
import java.util.Map;
-import java.util.List;
import java.util.Locale;
import javax.lang.model.SourceVersion;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
-import java.io.File;
/**
* An annotation processing tool framework will {@linkplain
diff --git a/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java b/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
index 3b66bad..68b5421 100644
--- a/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
+++ b/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,10 +25,6 @@
package javax.lang.model.element;
-
-import java.util.List;
-import javax.lang.model.type.*;
-
/**
* Represents a value of an annotation type element.
* A value is of one of the following types:
diff --git a/langtools/src/share/classes/javax/lang/model/element/Element.java b/langtools/src/share/classes/javax/lang/model/element/Element.java
index 6d2743c..64fe7ea 100644
--- a/langtools/src/share/classes/javax/lang/model/element/Element.java
+++ b/langtools/src/share/classes/javax/lang/model/element/Element.java
@@ -32,7 +32,6 @@
import java.util.List;
import java.util.Set;
-import javax.lang.model.element.Modifier;
import javax.lang.model.type.*;
import javax.lang.model.util.*;
diff --git a/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java b/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
index 9d514f2..138f358 100644
--- a/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -26,7 +26,6 @@
package javax.lang.model.element;
import java.util.List;
-import javax.lang.model.util.Types;
import javax.lang.model.type.*;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java b/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
index 77451fa..cd82efd 100644
--- a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,7 +25,6 @@
package javax.lang.model.element;
-import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java b/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
index 8f01bed..fd79f04 100644
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,7 +27,6 @@
import java.io.ObjectInputStream;
import java.io.IOException;
-import java.lang.annotation.Annotation;
import javax.lang.model.element.Element;
diff --git a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java b/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
index de3e163..96209df 100644
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,7 +25,6 @@
package javax.lang.model.type;
-import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
index e36a00f..109349a 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -26,10 +26,8 @@
package javax.lang.model.util;
-import java.util.List;
import javax.lang.model.element.*;
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
index 4a5ac1c..46fa27f 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
@@ -25,10 +25,6 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
index 2129464..c7a0f7b 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,10 +25,6 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
index 0e4a343..8e1d656 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,13 +25,10 @@
package javax.lang.model.util;
-
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import static javax.lang.model.SourceVersion.*;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
index 94546db..0e5d8da 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,12 +25,9 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
index 9cf104d..b4afe11 100644
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,12 +25,9 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java b/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
index c95ff5f..5929102 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,18 +25,14 @@
package javax.lang.model.util;
-import java.lang.Iterable;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.EnumSet;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
import javax.lang.model.element.*;
-import javax.lang.model.type.*;
/**
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
index ace1515..25a68a9 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,11 +25,10 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import static javax.lang.model.SourceVersion.*;
/**
* A visitor of program elements based on their {@linkplain
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
index 5781875..e9a983b 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
@@ -26,7 +26,6 @@
package javax.lang.model.util;
import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
import javax.annotation.processing.SupportedSourceVersion;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java b/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
index 711154f..809b4dd 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java b/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
index 119b3d7..f4d84d0 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java b/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
index daea232..5bd0b91 100644
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
index eb39284..2e3cfaf 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,13 +25,9 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
-import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
/**
* A simple visitor for annotation values with default behavior
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
index a69f0fe..30823cd 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,13 +25,9 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
-import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
/**
* A simple visitor for annotation values with default behavior
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
index 2e92d8f..a0055f7 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
index ec7e92a..5d54cff 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
index db83a38..63cacd0 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,9 +25,7 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
index 6988999..fc023d8 100644
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,7 +25,6 @@
package javax.lang.model.util;
-import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
index 7adc993..9e007fe 100644
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,12 +25,10 @@
package javax.lang.model.util;
-
-import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import javax.lang.model.type.*;
+import static javax.lang.model.SourceVersion.*;
/**
* A visitor of types based on their {@linkplain TypeKind kind} with
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
index 701b525..4bbe1d6 100644
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -27,7 +27,6 @@
import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
diff --git a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
index 26ac9c1..698364f 100644
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,11 +25,10 @@
package javax.lang.model.util;
-import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
-import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
+import javax.lang.model.type.*;
+import static javax.lang.model.SourceVersion.*;
/**
* A visitor of types based on their {@linkplain TypeKind kind} with
diff --git a/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java b/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
index f875b94..9bf3405 100644
--- a/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
+++ b/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -26,7 +26,6 @@
package javax.tools;
import java.io.IOException;
-import java.net.URI;
import java.util.Iterator;
import java.util.Set;
import javax.tools.JavaFileObject.Kind;
diff --git a/langtools/src/share/classes/javax/tools/JavaFileObject.java b/langtools/src/share/classes/javax/tools/JavaFileObject.java
index 9e84b3c..ea9dd75 100644
--- a/langtools/src/share/classes/javax/tools/JavaFileObject.java
+++ b/langtools/src/share/classes/javax/tools/JavaFileObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,12 +25,6 @@
package javax.tools;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.CharBuffer;
import javax.lang.model.element.NestingKind;
import javax.lang.model.element.Modifier;
diff --git a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
index eadf1ca..e4cb010 100644
--- a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
+++ b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -84,7 +84,7 @@
// Test the proper DOCTYPE element is present:
{
- "<!-- Generated by javadoc (version",
+ "<!-- Generated by javadoc (",
TMPDEST_DIR1 + "p1" + FS + "C.html" },
};
diff --git a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
new file mode 100644
index 0000000..e11976a
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/*
+ * @test
+ * @bug 8000743
+ * @summary Run tests on -docencoding to see if the value is
+ used for stylesheet as well.
+ * @author jayashree viswanathan
+ * @library ../lib/
+ * @build JavadocTester TestDocEncoding
+ * @run main TestDocEncoding
+ */
+
+public class TestDocEncoding extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "8000743";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-docencoding", "Cp930",
+ "-sourcepath", SRC_DIR, "pkg"
+ };
+
+ private static final String[][] TEST = NO_TEST;
+
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "stylesheet.css",
+ "body {" + NL + " background-color:#ffffff;"}
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestDocEncoding tester = new TestDocEncoding();
+ run(tester, ARGS, TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
+
diff --git a/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java b/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java
new file mode 100644
index 0000000..134fda2
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+package pkg;
+
+public class Test {}
+
diff --git a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
new file mode 100644
index 0000000..162105e
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 8000418
+ * @summary Verify that files use a common Generated By string
+ * @library ../lib/
+ * @build JavadocTester TestGeneratedBy
+ * @run main TestGeneratedBy
+ */
+
+public class TestGeneratedBy extends JavadocTester {
+
+ private static final String OUTPUT_DIR = "tmp";
+
+ private static final String[] FILES = {
+ "pkg/MyClass.html",
+ "pkg/package-summary.html",
+ "pkg/package-frame.html",
+ "pkg/package-tree.html",
+ "allclasses-noframe.html",
+ "constant-values.html",
+ "allclasses-frame.html",
+ "overview-tree.html",
+ "deprecated-list.html",
+ "serialized-form.html",
+ "help-doc.html",
+ "index-all.html",
+ "index.html"
+ };
+
+ private static final String[] ARGS =
+ new String[] {
+ "-d", OUTPUT_DIR,
+ "-sourcepath", SRC_DIR,
+ "pkg"
+ };
+ private static final String BUG_ID = "8000418";
+
+ private static String[][] getTests() {
+ String version = System.getProperty("java.version");
+ String[][] tests = new String[FILES.length][];
+ for (int i = 0; i < FILES.length; i++) {
+ tests[i] = new String[] {
+ OUTPUT_DIR + FS + FILES[i],
+ "Generated by javadoc (" + version + ") on "
+ };
+ }
+ return tests;
+ }
+
+ private static String[][] getNegatedTests() {
+ String[][] tests = new String[FILES.length][];
+ for (int i = 0; i < FILES.length; i++) {
+ tests[i] = new String[] {
+ OUTPUT_DIR + FS + FILES[i],
+ "Generated by javadoc (version",
+ "Generated by javadoc on"
+ };
+ }
+ return tests;
+ }
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestGeneratedBy tester = new TestGeneratedBy();
+ int exitCode = run(tester, ARGS, getTests(), getNegatedTests());
+ tester.printSummary();
+ if (exitCode != 0) {
+ throw new Error("Error found while executing Javadoc");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
+
diff --git a/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java b/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java
new file mode 100644
index 0000000..b3b699b
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 pkg;
+
+import java.io.Serializable;
+
+public class MyClass implements Serializable {
+}
diff --git a/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java b/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java
new file mode 100644
index 0000000..973e4c6
--- /dev/null
+++ b/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 7192245
+ * @summary Automatic test for checking set of allowed modifiers on interface methods
+ */
+
+import com.sun.source.util.JavacTask;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+
+public class TestDefaultMethodsSyntax {
+
+ static int checkCount = 0;
+
+ enum VersionKind {
+ PRE_LAMBDA("7"),
+ LAMBDA("8");
+
+ String versionString;
+
+ VersionKind(String versionString) {
+ this.versionString = versionString;
+ }
+
+ List<String> getOptions() {
+ return Arrays.asList("-XDallowDefaultMethods", "-source", versionString);
+ }
+ }
+
+ enum ModifierKind {
+ NONE(""),
+ PUBLIC("public"),
+ PROTECTED("protected"),
+ PRIVATE("private"),
+ ABSTRACT("abstract"),
+ STATIC("static"),
+ NATIVE("native"),
+ SYNCHRONIZED("synchronized"),
+ FINAL("final"),
+ STRICTFP("strictfp"),
+ DEFAULT("default");
+
+ String modStr;
+
+ private ModifierKind(String modStr) {
+ this.modStr = modStr;
+ }
+
+ boolean isAllowed(EnclosingKind ek, ModifierKind otherMod) {
+ if (this == otherMod) return false;
+ switch (this) {
+ case NONE:
+ return true;
+ case ABSTRACT:
+ return otherMod != PRIVATE;
+ case NATIVE:
+ return otherMod != ABSTRACT &&
+ otherMod != STRICTFP;
+ case FINAL:
+ case STATIC:
+ case SYNCHRONIZED:
+ case STRICTFP:
+ return otherMod != ABSTRACT;
+ case PUBLIC:
+ return true;
+ case PROTECTED:
+ return ek == EnclosingKind.ABSTRACT_CLASS;
+ case DEFAULT:
+ return otherMod != ABSTRACT;
+ default:
+ return true;
+ }
+ }
+
+ static boolean intersect(ModifierKind mk, ModifierKind... mks) {
+ for (ModifierKind mk2 : mks) {
+ if (mk == mk2) return true;
+ }
+ return false;
+ }
+
+ static boolean compatible(MethodKind mk, ModifierKind mod1, ModifierKind mod2, EnclosingKind ek) {
+ if (intersect(ABSTRACT, mod1, mod2) || intersect(NATIVE, mod1, mod2)) {
+ return mk == MethodKind.NO_BODY;
+ } else if (intersect(DEFAULT, mod1, mod2)) {
+ return mk == MethodKind.BODY;
+ } else {
+ return ek == EnclosingKind.INTERFACE ?
+ mk == MethodKind.NO_BODY : mk == MethodKind.BODY;
+ }
+ }
+
+ boolean compatible(EnclosingKind ek) {
+ switch (this) {
+ case STATIC:
+ case PRIVATE:
+ case PROTECTED:
+ return ek != EnclosingKind.INTERFACE;
+ default:
+ return true;
+ }
+ }
+
+ static boolean compatible(ModifierKind m1, ModifierKind m2, EnclosingKind ek) {
+ Result res1 = allowedModifierPairs[m1.ordinal()][m2.ordinal()];
+ Result res2 = allowedModifierPairs[m2.ordinal()][m1.ordinal()];
+ if (res1 != res2) {
+ throw new AssertionError(String.format("Ill-formed table: [%s,%s] != [%s,%s]", m1, m2, m2, m1));
+ } else {
+ return res1.compatible(ek, m1, m2);
+ }
+ }
+
+ interface Result {
+ boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2);
+ }
+
+ static final Result T = new Result() {
+ @Override
+ public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) {
+ return true;
+ }
+ };
+
+ static final Result F = new Result() {
+ @Override
+ public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) {
+ return false;
+ }
+ };
+
+ static final Result C = new Result() {
+ @Override
+ public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) {
+ return ek != EnclosingKind.INTERFACE;
+ }
+ };
+
+ static final Result I = new Result() {
+ @Override
+ public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) {
+ return ek == EnclosingKind.INTERFACE;
+ }
+ };
+
+ static Result[][] allowedModifierPairs = {
+ /* NONE PUBLIC PROTECTED PRIVATE ABSTRACT STATIC NATIVE SYNCHRONIZED FINAL STRICTFP DEFAULT */
+ /* NONE */ { T , T , C , C , T , C , C , C , C , C , I },
+ /* PUBLIC */ { T , F , F , F , T , C , C , C , C , C , I },
+ /* PROTECTED */ { C , F , F , F , C , C , C , C , C , C , F },
+ /* PRIVATE */ { C , F , F , F , F , C , C , C , C , C , F },
+ /* ABSTRACT */ { T , T , C , F , F , F , F , F , F , F , F },
+ /* STATIC */ { C , C , C , C , F , F , C , C , C , C , F },
+ /* NATIVE */ { C , C , C , C , F , C , F , C , C , F , F },
+ /* SYNCHRONIZED */ { C , C , C , C , F , C , C , F , C , C , I },
+ /* FINAL */ { C , C , C , C , F , C , C , C , F , C , F },
+ /* STRICTFP */ { C , C , C , C , F , C , F , C , C , F , I },
+ /* DEFAULT */ { I , I , F , F , F , F , F , I , F , I , F }};
+ }
+
+ enum MethodKind {
+ NO_BODY("void m();"),
+ BODY("void m() { }");
+
+ String methStr;
+
+ private MethodKind(String methStr) {
+ this.methStr = methStr;
+ }
+ }
+
+ enum EnclosingKind {
+ ABSTRACT_CLASS("abstract class Test "),
+ INTERFACE("interface Test ");
+
+ String enclStr;
+
+ EnclosingKind(String enclStr) {
+ this.enclStr = enclStr;
+ }
+ }
+
+ public static void main(String... args) throws Exception {
+
+ //create default shared JavaCompiler - reused across multiple compilations
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+ for (VersionKind vk : VersionKind.values()) {
+ for (EnclosingKind ek : EnclosingKind.values()) {
+ for (MethodKind mk : MethodKind.values()) {
+ for (ModifierKind modk1 : ModifierKind.values()) {
+ for (ModifierKind modk2 : ModifierKind.values()) {
+ new TestDefaultMethodsSyntax(vk, ek, mk, modk1, modk2).run(comp, fm);
+ }
+ }
+ }
+ }
+ }
+ System.out.println("Total check executed: " + checkCount);
+ }
+
+ VersionKind vk;
+ EnclosingKind ek;
+ MethodKind mk;
+ ModifierKind modk1, modk2;
+ JavaSource source;
+ DiagnosticChecker diagChecker;
+
+ TestDefaultMethodsSyntax(VersionKind vk, EnclosingKind ek, MethodKind mk, ModifierKind modk1, ModifierKind modk2) {
+ this.vk = vk;
+ this.ek = ek;
+ this.mk = mk;
+ this.modk1 = modk1;
+ this.modk2 = modk2;
+ this.source = new JavaSource();
+ this.diagChecker = new DiagnosticChecker();
+ }
+
+ class JavaSource extends SimpleJavaFileObject {
+
+ String template = "#EK {\n" +
+ " #MOD1 #MOD2 #METH\n" +
+ "}\n";
+
+ String source;
+
+ public JavaSource() {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ source = template.replaceAll("#EK", ek.enclStr)
+ .replaceAll("#MOD1", modk1.modStr)
+ .replaceAll("#MOD2", modk2.modStr)
+ .replaceAll("#METH", mk.methStr);
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+ }
+
+ void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+ JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+ vk.getOptions(), null, Arrays.asList(source));
+ try {
+ ct.analyze();
+ } catch (Throwable ex) {
+ throw new AssertionError("Error thrown when analyzing the following source:\n" + source.getCharContent(true));
+ }
+ check();
+ }
+
+ void check() {
+ boolean errorExpected = !ModifierKind.compatible(modk1, modk2, ek);
+
+ errorExpected |= !ModifierKind.compatible(mk, modk1, modk2, ek);
+
+ errorExpected |= !modk1.compatible(ek) || !modk2.compatible(ek);
+
+ errorExpected |= ModifierKind.intersect(ModifierKind.DEFAULT, modk1, modk2) &&
+ vk == VersionKind.PRE_LAMBDA;
+
+ checkCount++;
+ if (diagChecker.errorFound != errorExpected) {
+ throw new AssertionError("Problem when compiling source:\n" + source.getCharContent(true) +
+ "\nfound error: " + diagChecker.errorFound);
+ }
+ }
+
+ static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+ boolean errorFound;
+
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+ errorFound = true;
+ }
+ }
+ }
+}
diff --git a/langtools/test/tools/javac/diags/examples/DefaultMethodNotSupported.java b/langtools/test/tools/javac/diags/examples/DefaultMethodNotSupported.java
new file mode 100644
index 0000000..6e47999
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/DefaultMethodNotSupported.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+// key: compiler.err.default.methods.not.supported.in.source
+// options: -source 7 -Xlint:-options
+
+interface DefaultMethodNotSupported {
+ default void m() { }
+}
diff --git a/make/jprt.properties b/make/jprt.properties
index 2b044f0..984c2b1 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -79,20 +79,18 @@
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+ ${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
diff --git a/test/Makefile b/test/Makefile
index f1dfe1d..9e4d509 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -58,9 +58,9 @@
jdk_io \
jdk_lang \
jdk_math \
- jdk_misc \
+ jdk_other \
jdk_net \
- jdk_nio1 jdk_nio2 jdk_nio3 \
+ jdk_nio \
jdk_security1 \
jdk_text \
jdk_util
@@ -69,12 +69,14 @@
JDK_NONDEFAULT_TEST_LIST = \
jdk_awt \
jdk_beans2 jdk_beans3 \
- jdk_management1 jdk_management2 \
+ jdk_management \
+ jdk_jmx \
jdk_security2 jdk_security3 \
jdk_rmi \
jdk_sound \
jdk_swing \
- jdk_tools1 jdk_tools2 \
+ jdk_tools \
+ jdk_jdi \
jdk_jfr
# All jdk tests
